From 1293dccf3504b0e83f406f42f55a9fc6f7990a32 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 18 Mar 2015 12:59:50 +0000 Subject: [PATCH 001/258] I2CP Multisession support and multiple destinations in one tunnel pool. Work in progress. Router-side I2CP mostly done. Client-side I2CP mostly done but undecided on how to handle listeners. Streaming stubbed out but may be wrong, may need multiple socket managers, not clear how to proceed. I2PTunnel not started. Blacklist of DSA-only dests not started. Router leaseset publishing not correct. Not clear whether to have additional tunnel pools with flags, or put the tunnel pools into the client hashmap twice. Client config contains destination, may need to move that to tunnel pool. --- .../client/streaming/I2PSocketManager.java | 23 ++ .../streaming/impl/I2PSocketManagerFull.java | 38 ++ core/java/src/net/i2p/client/I2PSession.java | 25 +- .../src/net/i2p/client/I2PSessionImpl.java | 212 +++++++++- .../src/net/i2p/client/I2PSessionImpl2.java | 32 +- .../net/i2p/client/I2PSessionMuxedImpl.java | 18 + core/java/src/net/i2p/client/SubSession.java | 299 ++++++++++++++ .../i2p/data/i2cp/CreateLeaseSetMessage.java | 5 + .../i2p/data/i2cp/DestroySessionMessage.java | 10 + .../net/i2p/data/i2cp/HostLookupMessage.java | 10 + .../net/i2p/data/i2cp/HostReplyMessage.java | 10 + .../src/net/i2p/data/i2cp/I2CPMessage.java | 17 +- .../i2p/data/i2cp/I2CPMessageException.java | 2 +- .../net/i2p/data/i2cp/I2CPMessageImpl.java | 11 + .../i2p/data/i2cp/MessagePayloadMessage.java | 10 + .../i2p/data/i2cp/MessageStatusMessage.java | 10 + .../data/i2cp/ReceiveMessageBeginMessage.java | 10 + .../data/i2cp/ReceiveMessageEndMessage.java | 10 + .../data/i2cp/ReconfigureSessionMessage.java | 10 + .../net/i2p/data/i2cp/ReportAbuseMessage.java | 10 + .../i2p/data/i2cp/RequestLeaseSetMessage.java | 10 + .../i2cp/RequestVariableLeaseSetMessage.java | 10 + .../net/i2p/data/i2cp/SendMessageMessage.java | 10 + .../i2p/data/i2cp/SessionStatusMessage.java | 10 + .../net/i2p/router/TunnelManagerFacade.java | 15 + .../net/i2p/router/TunnelPoolSettings.java | 38 +- .../router/client/ClientConnectionRunner.java | 367 ++++++++++++++---- .../net/i2p/router/client/ClientManager.java | 74 ++-- .../client/ClientManagerFacadeImpl.java | 2 +- .../client/ClientMessageEventListener.java | 102 +++-- .../i2p/router/client/CreateSessionJob.java | 21 +- .../i2p/router/client/LeaseRequestState.java | 1 + .../i2p/router/client/MessageReceivedJob.java | 27 +- .../net/i2p/router/client/ReportAbuseJob.java | 15 +- .../i2p/router/client/RequestLeaseSetJob.java | 11 +- .../dummy/DummyTunnelManagerFacade.java | 2 + .../i2p/router/tunnel/pool/TunnelPool.java | 7 + .../router/tunnel/pool/TunnelPoolManager.java | 103 ++++- 38 files changed, 1404 insertions(+), 193 deletions(-) create mode 100644 core/java/src/net/i2p/client/SubSession.java diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java index b7a5732d0..52d27889d 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java @@ -5,17 +5,20 @@ package net.i2p.client.streaming; import java.io.IOException; +import java.io.InputStream; import java.io.InterruptedIOException; import java.net.ConnectException; import java.net.NoRouteToHostException; import java.net.ServerSocket; import java.net.Socket; +import java.util.List; import java.util.Properties; import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.I2PException; import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; import net.i2p.data.Destination; @@ -34,6 +37,26 @@ public interface I2PSocketManager { */ public I2PSession getSession(); + /** + * @return a new subsession, non-null + * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session + * and different signing keys + * @param opts subsession options if any, may be null + * @since 0.9.19 + */ + public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; + + /** + * @since 0.9.19 + */ + public void removeSubsession(I2PSession session); + + /** + * @return a list of subsessions, non-null, does not include the primary session + * @since 0.9.19 + */ + public List getSubsessions(); + /** * How long should we wait for the client to .accept() a socket before * sending back a NACK/Close? diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 41396edb8..c0d25efbb 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -1,14 +1,17 @@ package net.i2p.client.streaming.impl; import java.io.IOException; +import java.io.InputStream; import java.net.ConnectException; import java.net.NoRouteToHostException; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketTimeoutException; import java.util.HashSet; +import java.util.List; import java.util.Properties; import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -37,6 +40,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final I2PAppContext _context; private final Log _log; private final I2PSession _session; + private final List _subsessions; private final I2PServerSocketFull _serverSocket; private StandardServerSocket _realServerSocket; private final ConnectionOptions _defaultOptions; @@ -80,6 +84,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { public I2PSocketManagerFull(I2PAppContext context, I2PSession session, Properties opts, String name) { _context = context; _session = session; + _subsessions = new CopyOnWriteArrayList(); _log = _context.logManager().getLog(I2PSocketManagerFull.class); _name = name + " " + (__managerId.incrementAndGet()); @@ -117,6 +122,39 @@ public class I2PSocketManagerFull implements I2PSocketManager { return _session; } +//////////// gahhh we want a socket manager, not a session + /** + * @return a new subsession, non-null + * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session + * and different signing keys + * @param opts subsession options if any, may be null + * @since 0.9.19 + */ + public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { + I2PSession rv = _session.addSubsession(privateKeyStream, opts); + _subsessions.add(rv); + return rv; + } + + /** + * Remove the subsession + * + * @since 0.9.19 + */ + public void removeSubsession(I2PSession session) { + _session.removeSubsession(session); + _subsessions.remove(session); + // ... + } + + /** + * @return a list of subsessions, non-null, does not include the primary session + * @since 0.9.19 + */ + public List getSubsessions() { + return _session.getSubsessions(); + } + public ConnectionManager getConnectionManager() { return _connectionManager; } diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java index da67e2c02..54f8540f3 100644 --- a/core/java/src/net/i2p/client/I2PSession.java +++ b/core/java/src/net/i2p/client/I2PSession.java @@ -9,6 +9,8 @@ package net.i2p.client; * */ +import java.io.InputStream; +import java.util.List; import java.util.Properties; import java.util.Set; @@ -21,7 +23,7 @@ import net.i2p.data.SigningPrivateKey; /** *

Define the standard means of sending and receiving messages on the * I2P network by using the I2CP (the client protocol). This is done over a - * bidirectional TCP socket and never sends any private keys. + * bidirectional TCP socket. * * End to end encryption in I2PSession was disabled in release 0.6. * @@ -247,6 +249,27 @@ public interface I2PSession { * */ public void destroySession() throws I2PSessionException; + + /** + * @return a new subsession, non-null + * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session + * and different signing keys + * @param opts subsession options if any, may be null + * @since 0.9.19 + */ + public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; + + /** + * @return a list of subsessions, non-null, does not include the primary session + * @since 0.9.19 + */ + public void removeSubsession(I2PSession session); + + /** + * @return a list of subsessions, non-null, does not include the primary session + * @since 0.9.19 + */ + public List getSubsessions(); /** * Actually connect the session and start receiving/sending messages diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 7fd175978..93bc2af78 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -23,6 +23,7 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; @@ -43,6 +44,7 @@ import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.data.i2cp.MessagePayloadMessage; import net.i2p.data.i2cp.SessionId; +import net.i2p.data.i2cp.SessionStatusMessage; import net.i2p.internal.I2CPMessageQueue; import net.i2p.internal.InternalClientManager; import net.i2p.internal.QueuedI2CPMessageReader; @@ -76,6 +78,15 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa /** currently granted lease set, or null */ private volatile LeaseSet _leaseSet; + // subsession stuff + // registered subsessions + private final List _subsessions; + // established subsessions + private final ConcurrentHashMap _subsessionMap; + private final Object _subsessionLock = new Object(); + private static final String MIN_SUBSESSION_VERSION = "0.9.19"; + private volatile boolean _routerSupportsSubsessions; + /** hostname of router - will be null if in RouterContext */ protected final String _hostname; /** port num to router - will be 0 if in RouterContext */ @@ -179,6 +190,9 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa TEST_LOOKUP || (routerVersion != null && routerVersion.length() > 0 && VersionComparator.comp(routerVersion, MIN_HOST_LOOKUP_VERSION) >= 0); + _routerSupportsSubsessions = _context.isRouterContext() || + (routerVersion != null && routerVersion.length() > 0 && + VersionComparator.comp(routerVersion, MIN_SUBSESSION_VERSION) >= 0); synchronized (_stateLock) { if (_state == State.OPENING) { _state = State.GOTDATE; @@ -196,18 +210,42 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa */ protected I2PSessionImpl(I2PAppContext context, Properties options, I2PClientMessageHandlerMap handlerMap) { - this(context, options, handlerMap, false); + this(context, options, handlerMap, null, false); } - + + /* + * For extension by SubSession via I2PSessionMuxedImpl and I2PSessionImpl2 + * + * @param destKeyStream stream containing the private key data, + * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} + * @param options set of options to configure the router with, if null will use System properties + * @since 0.9.19 + */ + protected I2PSessionImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { + this(primary.getContext(), options, primary.getHandlerMap(), primary.getProducer(), true); + _availabilityNotifier = new AvailabilityNotifier(); + try { + readDestination(destKeyStream); + } catch (DataFormatException dfe) { + throw new I2PSessionException("Error reading the destination key stream", dfe); + } catch (IOException ioe) { + throw new I2PSessionException("Error reading the destination key stream", ioe); + } + } + /** * Basic setup of finals * @since 0.9.7 */ private I2PSessionImpl(I2PAppContext context, Properties options, - I2PClientMessageHandlerMap handlerMap, boolean hasDest) { + I2PClientMessageHandlerMap handlerMap, + I2CPMessageProducer producer, + boolean hasDest) { _context = context; _handlerMap = handlerMap; _log = context.logManager().getLog(getClass()); + _subsessions = new CopyOnWriteArrayList(); + _subsessionMap = new ConcurrentHashMap(4); if (options == null) options = (Properties) System.getProperties().clone(); _options = loadConfig(options); @@ -215,7 +253,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa _portNum = getPort(); _fastReceive = Boolean.parseBoolean(_options.getProperty(I2PClient.PROP_FAST_RECEIVE)); if (hasDest) { - _producer = new I2CPMessageProducer(context); + _producer = producer; _availableMessages = new ConcurrentHashMap(); _myDestination = new Destination(); _privateKey = new PrivateKey(); @@ -238,10 +276,10 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @throws I2PSessionException if there is a problem loading the private keys or + * @throws I2PSessionException if there is a problem loading the private keys */ public I2PSessionImpl(I2PAppContext context, InputStream destKeyStream, Properties options) throws I2PSessionException { - this(context, options, new I2PClientMessageHandlerMap(context), true); + this(context, options, new I2PClientMessageHandlerMap(context), new I2CPMessageProducer(context), true); _availabilityNotifier = new AvailabilityNotifier(); try { readDestination(destKeyStream); @@ -251,6 +289,66 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa throw new I2PSessionException("Error reading the destination key stream", ioe); } } + + /** + * Router must be connected or was connected... for now. + * + * @return a new subsession, non-null + * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session + * and different signing keys + * @param opts subsession options if any, may be null + * @since 0.9.19 + */ + public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { + if (!_routerSupportsSubsessions) + throw new I2PSessionException("Router does not support subsessions"); + SubSession sub; + synchronized(_subsessionLock) { + if (_subsessions.size() > _subsessionMap.size()) + throw new I2PSessionException("Subsession request already pending"); + sub = new SubSession(this, privateKeyStream, opts); + for (SubSession ss : _subsessions) { + if (ss.getDecryptionKey().equals(sub.getDecryptionKey()) && + ss.getPrivateKey().equals(sub.getPrivateKey())) { + throw new I2PSessionException("Dup subsession"); + } + } + _subsessions.add(sub); + } + + synchronized (_stateLock) { + if (_state == State.OPEN) { + _producer.connect(sub); + } // else will be called in connect() + } + return sub; + } + + /** + * @since 0.9.19 + */ + public void removeSubsession(I2PSession session) { + if (!(session instanceof SubSession)) + return; + synchronized(_subsessionLock) { + _subsessions.remove(session); + SessionId id = ((SubSession) session).getSessionId(); + if (id != null) + _subsessionMap.remove(id); + /// tell the subsession + ///.... + } + } + + /** + * @return a list of subsessions, non-null, does not include the primary session + * @since 0.9.19 + */ + public List getSubsessions() { + synchronized(_subsessionLock) { + return new ArrayList(_subsessions); + } + } /** * Parse the config for anything we know about. @@ -536,6 +634,14 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa startIdleMonitor(); startVerifyUsage(); success = true; + + // now send CreateSessionMessages for all subsessions, one at a time, must wait for each response + synchronized(_subsessionLock) { + for (SubSession ss : _subsessions) { + _producer.connect(ss); + } + } + } catch (InterruptedException ie) { throw new I2PSessionException("Interrupted", ie); } catch (UnknownHostException uhe) { @@ -739,19 +845,80 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa /** * The I2CPMessageEventListener callback. * Recieve notification of some I2CP message and handle it if possible. + * + * We route the message based on message type AND session ID. + * + * The following types never contain a session ID and are not routable to + * a subsession: + * BandwidthLimitsMessage, DestReplyMessage + * + * The following types may not ontain a valid session ID + * even when intended for a subsession, so we must take special care: + * SessionStatusMessage + * * @param reader unused */ public void messageReceived(I2CPMessageReader reader, I2CPMessage message) { - I2CPMessageHandler handler = _handlerMap.getHandler(message.getType()); - if (handler == null) { - if (_log.shouldLog(Log.WARN)) - _log.warn(getPrefix() + "Unknown message or unhandleable message received: type = " - + message.getType()); + int type = message.getType(); + SessionId id = message.sessionId(); + if (id == null || id.equals(_sessionId) || + (_sessionId == null && id != null && type == SessionStatusMessage.MESSAGE_TYPE)) { + // it's for us + I2CPMessageHandler handler = _handlerMap.getHandler(type); + if (handler != null) { + if (_log.shouldLog(Log.DEBUG)) + _log.debug(getPrefix() + "Message received of type " + type + + " to be handled by " + handler.getClass().getSimpleName()); + handler.handleMessage(message, this); + } else { + if (_log.shouldLog(Log.WARN)) + _log.warn(getPrefix() + "Unknown message or unhandleable message received: type = " + + type); + } } else { - if (_log.shouldLog(Log.DEBUG)) - _log.debug(getPrefix() + "Message received of type " + message.getType() - + " to be handled by " + handler.getClass().getSimpleName()); - handler.handleMessage(message, this); + SubSession sub = _subsessionMap.get(id); + if (sub != null) { + // it's for a subsession + if (_log.shouldLog(Log.DEBUG)) + _log.debug(getPrefix() + "Message received of type " + type + + " to be handled by " + sub); + sub.messageReceived(reader, message); + } else if (id != null && type == SessionStatusMessage.MESSAGE_TYPE) { + // look for a subsession without a session + synchronized (_subsessionLock) { + for (SubSession sess : _subsessions) { + if (sess.getSessionId() == null) { + sub.messageReceived(reader, message); + id = sess.getSessionId(); + if (id != null) { + if (id.equals(_sessionId)) { + // shouldnt happen + sess.setSessionId(null); + if (_log.shouldLog(Log.WARN)) + _log.warn("Dup or our session id " + id); + } else { + SubSession old = _subsessionMap.putIfAbsent(id, sess); + if (old != null) { + // shouldnt happen + sess.setSessionId(null); + if (_log.shouldLog(Log.WARN)) + _log.warn("Dup session id " + id); + } + } + } + return; + } + if (_log.shouldLog(Log.WARN)) + _log.warn(getPrefix() + "No session " + id + " to handle message: type = " + + type); + } + } + } else { + // it's for nobody + if (_log.shouldLog(Log.WARN)) + _log.warn(getPrefix() + "No session " + id + " to handle message: type = " + + type); + } } } @@ -786,6 +953,18 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa */ I2CPMessageProducer getProducer() { return _producer; } + /** + * For Subsessions + * @since 0.9.19 + */ + I2PClientMessageHandlerMap getHandlerMap() { return _handlerMap; } + + /** + * For Subsessions + * @since 0.9.19 + */ + I2PAppContext getContext() { return _context; } + /** * Retrieve the configuration options * @return non-null, if insantiated with null options, this will be the System properties. @@ -803,7 +982,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa /** * Has the session been closed (or not yet connected)? - * False when open and during transitions. Unsynchronized. + * False when open and during transitions. */ public boolean isClosed() { synchronized (_stateLock) { @@ -892,6 +1071,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa if (_availabilityNotifier != null) _availabilityNotifier.stopNotifying(); closeSocket(); + _subsessionMap.clear(); if (_sessionListener != null) _sessionListener.disconnected(this); } diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index 9f8a5465d..21bb04737 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -50,9 +50,9 @@ class I2PSessionImpl2 extends I2PSessionImpl { private static final long REMOVE_EXPIRED_TIME = 63*1000; - /** - * for extension by SimpleSession (no dest) - */ + /** + * for extension by SimpleSession (no dest) + */ protected I2PSessionImpl2(I2PAppContext context, Properties options, I2PClientMessageHandlerMap handlerMap) { super(context, options, handlerMap); @@ -61,15 +61,17 @@ class I2PSessionImpl2 extends I2PSessionImpl { } /** + * for extension by I2PSessionMuxedImpl + * * Create a new session, reading the Destination, PrivateKey, and SigningPrivateKey * from the destKeyStream, and using the specified options to connect to the router * * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @throws I2PSessionException if there is a problem loading the private keys or + * @throws I2PSessionException if there is a problem loading the private keys */ - public I2PSessionImpl2(I2PAppContext ctx, InputStream destKeyStream, Properties options) throws I2PSessionException { + protected I2PSessionImpl2(I2PAppContext ctx, InputStream destKeyStream, Properties options) throws I2PSessionException { super(ctx, destKeyStream, options); _sendingStates = new ConcurrentHashMap(32); _sendMessageNonce = new AtomicLong(); @@ -94,6 +96,26 @@ class I2PSessionImpl2 extends I2PSessionImpl { _context.statManager().createRateStat("i2cp.tx.msgExpanded", "size before compression", "i2cp", new long[] { 30*60*1000 }); } + /* + * For extension by SubSession via I2PSessionMuxedImpl + * + * @param destKeyStream stream containing the private key data, + * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} + * @param options set of options to configure the router with, if null will use System properties + * @since 0.9.19 + */ + protected I2PSessionImpl2(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { + super(primary, destKeyStream, options); + _sendingStates = new ConcurrentHashMap(32); + _sendMessageNonce = new AtomicLong(); + _noEffort = "none".equals(getOptions().getProperty(I2PClient.PROP_RELIABILITY, "").toLowerCase(Locale.US)); + _context.statManager().createRateStat("i2cp.receiveStatusTime.1", "How long it took to get status=1 back", "i2cp", new long[] { 10*60*1000 }); + _context.statManager().createRateStat("i2cp.receiveStatusTime.4", "How long it took to get status=4 back", "i2cp", new long[] { 10*60*1000 }); + _context.statManager().createRateStat("i2cp.receiveStatusTime.5", "How long it took to get status=5 back", "i2cp", new long[] { 10*60*1000 }); + _context.statManager().createRateStat("i2cp.tx.msgCompressed", "compressed size transferred", "i2cp", new long[] { 30*60*1000 }); + _context.statManager().createRateStat("i2cp.tx.msgExpanded", "size before compression", "i2cp", new long[] { 30*60*1000 }); + } + /** * Fire up a periodic task to check for unclaimed messages * @since 0.9.14 diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java index 48ca6016e..880670a53 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java @@ -82,6 +82,24 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { // discards the one in super(), sorry about that... (no it wasn't started yet) _availabilityNotifier = new MuxedAvailabilityNotifier(); } + + /* + * For extension by SubSession + * + * @param destKeyStream stream containing the private key data, + * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} + * @param options set of options to configure the router with, if null will use System properties + * @since 0.9.19 + */ + protected I2PSessionMuxedImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { + super(primary, destKeyStream, options); + // also stored in _sessionListener but we keep it in _demultipexer + // as well so we don't have to keep casting + _demultiplexer = new I2PSessionDemultiplexer(primary.getContext()); + super.setSessionListener(_demultiplexer); + // discards the one in super(), sorry about that... (no it wasn't started yet) + _availabilityNotifier = new MuxedAvailabilityNotifier(); + } /** listen on all protocols and ports */ @Override diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java new file mode 100644 index 000000000..1e75fa409 --- /dev/null +++ b/core/java/src/net/i2p/client/SubSession.java @@ -0,0 +1,299 @@ +package net.i2p.client; + +/* + * free (adj.): unencumbered; not under the control of others + * Written by jrandom in 2003 and released into the public domain + * with no warranty of any kind, either expressed or implied. + * It probably won't make your computer catch on fire, or eat + * your children, but it might. Use at your own risk. + * + */ + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import net.i2p.I2PAppContext; +import net.i2p.data.Destination; +import net.i2p.data.Hash; +import net.i2p.data.PrivateKey; +import net.i2p.data.SigningPrivateKey; +import net.i2p.data.i2cp.I2CPMessage; +import net.i2p.data.i2cp.SessionId; + +/** + * An additional session using another session's connection. + * + * A subsession uses the same connection to the router as the primary session, + * but has a different Destination. It uses the same tunnels as the primary + * but has its own leaseset. It must use the same encryption keys as the primary + * so that garlic encryption/decryption works. + * + * The message handler map and message producer are reused from primary. + * + * Does NOT reuse the session listener ???? + * + * While the I2CP protocol, in theory, allows for fully independent sessions + * over the same I2CP connection, this is not currently supported by the router. + * + * @since 0.9.19 + */ +class SubSession extends I2PSessionMuxedImpl { + private final I2PSessionMuxedImpl _primary; + + /** + * @param primary must be a I2PSessionMuxedImpl + */ + public SubSession(I2PSession primary, InputStream destKeyStream, Properties options) throws I2PSessionException { + super((I2PSessionMuxedImpl)primary, destKeyStream, options); + _primary = (I2PSessionMuxedImpl) primary; + if (!getDecryptionKey().equals(_primary.getDecryptionKey())) + throw new I2PSessionException("encryption key mismatch"); + if (getPrivateKey().equals(_primary.getPrivateKey())) + throw new I2PSessionException("signing key must differ"); + // state management + } + + /** + * Unsupported in a subsession. + * @throws UnsupportedOperationException always + * @since 0.9.19 + */ + @Override + public I2PSession addSubsession(InputStream destKeyStream, Properties opts) throws I2PSessionException { + throw new UnsupportedOperationException(); + } + + /** + * Unsupported in a subsession. + * Does nothing. + * @since 0.9.19 + */ + @Override + public void removeSubsession(I2PSession session) {} + + /** + * Unsupported in a subsession. + * @return empty list always + * @since 0.9.19 + */ + @Override + public List getSubsessions() { + return Collections.emptyList(); + } + + /** + * Does nothing for now + */ + @Override + public void updateOptions(Properties options) {} + + /** + * Connect to the router and establish a session. This call blocks until + * a session is granted. + * + * Should be threadsafe, other threads will block until complete. + * Disconnect / destroy from another thread may be called simultaneously and + * will (should?) interrupt the connect. + * + * @throws I2PSessionException if there is a configuration error or the router is + * not reachable + */ + @Override + public void connect() throws I2PSessionException { + _primary.connect(); + } + + /** + * Has the session been closed (or not yet connected)? + * False when open and during transitions. + */ + @Override + public boolean isClosed() { + return getSessionId() == null || _primary.isClosed(); + } + + /** + * Deliver an I2CP message to the router + * May block for several seconds if the write queue to the router is full + * + * @throws I2PSessionException if the message is malformed or there is an error writing it out + */ + @Override + void sendMessage(I2CPMessage message) throws I2PSessionException { + if (isClosed()) + throw new I2PSessionException("Already closed"); + _primary.sendMessage(message); + } + + /** + * Pass off the error to the listener + * Misspelled, oh well. + * @param error non-null + */ + @Override + void propogateError(String msg, Throwable error) { + _primary.propogateError(msg, error); + if (_sessionListener != null) _sessionListener.errorOccurred(this, msg, error); + } + + /** + * Tear down the session, and do NOT reconnect. + * + * Blocks if session has not been fully started. + */ + @Override + public void destroySession() { + _primary.destroySession(); + if (_availabilityNotifier != null) + _availabilityNotifier.stopNotifying(); + if (_sessionListener != null) _sessionListener.disconnected(this); + } + + /** + * Will interrupt a connect in progress. + */ + @Override + protected void disconnect() { + _primary.disconnect(); + } + + @Override + protected boolean reconnect() { + return _primary.reconnect(); + } + + /** + * Called by the message handler + * on reception of DestReplyMessage + * + * This will never happen, as the dest reply message does not contain a session ID. + */ + @Override + void destReceived(Destination d) { + _primary.destReceived(d); + } + + /** + * Called by the message handler + * on reception of DestReplyMessage + * + * This will never happen, as the dest reply message does not contain a session ID. + * + * @param h non-null + */ + @Override + void destLookupFailed(Hash h) { + _primary.destLookupFailed(h); + } + + /** + * Called by the message handler + * on reception of HostReplyMessage + * @param d non-null + */ + void destReceived(long nonce, Destination d) { + _primary.destReceived(nonce, d); + } + + /** + * Called by the message handler + * on reception of HostReplyMessage + */ + @Override + void destLookupFailed(long nonce) { + _primary.destLookupFailed(nonce); + } + + /** + * Called by the message handler. + * This will never happen, as the bw limits message does not contain a session ID. + */ + @Override + void bwReceived(int[] i) { + _primary.bwReceived(i); + } + + /** + * Blocking. Waits a max of 10 seconds by default. + * See lookupDest with maxWait parameter to change. + * Implemented in 0.8.3 in I2PSessionImpl; + * previously was available only in I2PSimpleSession. + * Multiple outstanding lookups are now allowed. + * @return null on failure + */ + @Override + public Destination lookupDest(Hash h) throws I2PSessionException { + return _primary.lookupDest(h); + } + + /** + * Blocking. + * @param maxWait ms + * @return null on failure + */ + @Override + public Destination lookupDest(Hash h, long maxWait) throws I2PSessionException { + return _primary.lookupDest(h, maxWait); + } + + /** + * Ask the router to lookup a Destination by host name. + * Blocking. Waits a max of 10 seconds by default. + * + * This only makes sense for a b32 hostname, OR outside router context. + * Inside router context, just query the naming service. + * Outside router context, this does NOT query the context naming service. + * Do that first if you expect a local addressbook. + * + * This will log a warning for non-b32 in router context. + * + * See interface for suggested implementation. + * + * Requires router side to be 0.9.11 or higher. If the router is older, + * this will return null immediately. + */ + @Override + public Destination lookupDest(String name) throws I2PSessionException { + return _primary.lookupDest(name); + } + + /** + * Ask the router to lookup a Destination by host name. + * Blocking. See above for details. + * @param maxWait ms + * @return null on failure + */ + @Override + public Destination lookupDest(String name, long maxWait) throws I2PSessionException { + return _primary.lookupDest(name, maxWait); + } + + /** + * This may not work???????????, as the reply does not contain a session ID, so + * it won't be routed back to us? + */ + @Override + public int[] bandwidthLimits() throws I2PSessionException { + return _primary.bandwidthLimits(); + } + + @Override + protected void updateActivity() { + _primary.updateActivity(); + } + + @Override + public long lastActivity() { + return _primary.lastActivity(); + } + + @Override + public void setReduced() { + _primary.setReduced(); + } +} diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java index 6477768c5..0cbb854ff 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java @@ -38,6 +38,11 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl { return _sessionId; } + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index b67f5fa6f..4275863e1 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -32,6 +32,16 @@ public class DestroySessionMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java index 1a8fcfe86..c4405f90a 100644 --- a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java +++ b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java @@ -76,6 +76,16 @@ public class HostLookupMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + /** * @return 0 to 2**32 - 1 */ diff --git a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java index 37faaa276..b350f225a 100644 --- a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java +++ b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java @@ -73,6 +73,16 @@ public class HostReplyMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + /** * @return 0 to 2**32 - 1 */ diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java index 92c4f6163..58d312013 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java @@ -60,9 +60,20 @@ public interface I2CPMessage extends DataStructure { public void writeMessage(OutputStream out) throws I2CPMessageException, IOException; /** - * Return the unique identifier for this type of APIMessage, as specified in the + * Return the unique identifier for this type of message, as specified in the * network specification document under #ClientAccessLayerMessages - * @return unique identifier for this type of APIMessage + * @return unique identifier for this type of message */ public int getType(); -} \ No newline at end of file + + /** + * Return the SessionId for this type of message. + * Most but not all message types include a SessionId. + * The ones that do already define getSessionId(), but some return a SessionId and + * some return a long, so we define a new method here. + * + * @return SessionId or null if this message type does not include a SessionId + * @since 0.9.19 + */ + public SessionId sessionId(); +} diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java index 63d13b040..b2e38c21e 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageException.java @@ -12,7 +12,7 @@ package net.i2p.data.i2cp; import net.i2p.I2PException; /** - * Represent an error serializing or deserializing an APIMessage + * Represent an error serializing or deserializing a message * * @author jrandom */ diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java index 3ace5df9d..19b8d1cc3 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java @@ -127,4 +127,15 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM throw new DataFormatException("Error writing the message", ime); } } + + /** + * Return the SessionId for this type of message. + * Most but not all message types include a SessionId. + * The ones that do already define getSessionId(), but some return a SessionId and + * some return a long, so we define a new method here. + * + * @return null always. Extending classes with a SessionId must override. + * @since 0.9.19 + */ + public SessionId sessionId() { return null; } } diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index 331ee3dad..4e88f71ba 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -37,6 +37,16 @@ public class MessagePayloadMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId >= 0 ? new SessionId(_sessionId) : null; + } + /** @param id 0-65535 */ public void setSessionId(long id) { _sessionId = (int) id; diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index d9122bd77..5b77ffc4c 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -193,6 +193,16 @@ public class MessageStatusMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId >= 0 ? new SessionId(_sessionId) : null; + } + /** @param id 0-65535 */ public void setSessionId(long id) { _sessionId = (int) id; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 032c1ea8b..ccb96cb60 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -36,6 +36,16 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId >= 0 ? new SessionId(_sessionId) : null; + } + /** @param id 0-65535 */ public void setSessionId(long id) { _sessionId = (int) id; diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index c405b93a3..5be2bbfeb 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -35,6 +35,16 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId >= 0 ? new SessionId(_sessionId) : null; + } + /** @param id 0-65535 */ public void setSessionId(long id) { _sessionId = (int) id; diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 01130670a..8f80f531b 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -33,6 +33,16 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java index 76311ae6e..cfdbd6cfe 100644 --- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java @@ -35,6 +35,16 @@ public class ReportAbuseMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index 1e9b2dcf6..15d9b70ec 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -45,6 +45,16 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java index 160e193dc..3edd06171 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java @@ -55,6 +55,16 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java index 67a67ffa4..e783c62c8 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -38,6 +38,16 @@ public class SendMessageMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java index 5af2a649b..122cf5d1e 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java @@ -42,6 +42,16 @@ public class SessionStatusMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.19 + */ + @Override + public SessionId sessionId() { + return _sessionId; + } + public void setSessionId(SessionId id) { _sessionId = id; } diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index 2a35d0c97..a95fbd1f1 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -146,6 +146,21 @@ public interface TunnelManagerFacade extends Service { * */ public void buildTunnels(Destination client, ClientTunnelSettings settings); + + /** + * Add another destination to the same tunnels. + * Must have same encryption key an a different signing key. + * @throws IllegalArgumentException if not + * @return success + * @since 0.9.19 + */ + public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient); + + /** + * Remove another destination to the same tunnels. + * @since 0.9.19 + */ + public void removeAlias(Destination dest); public TunnelPoolSettings getInboundSettings(); public TunnelPoolSettings getOutboundSettings(); diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java index fd718e479..3c47a7762 100644 --- a/router/java/src/net/i2p/router/TunnelPoolSettings.java +++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java @@ -1,11 +1,13 @@ package net.i2p.router; +import java.util.Set; import java.util.Locale; import java.util.Map; import java.util.Properties; import net.i2p.data.Base64; import net.i2p.data.Hash; +import net.i2p.util.ConcurrentHashSet; import net.i2p.util.NativeBigInteger; import net.i2p.util.RandomSource; import net.i2p.util.SystemVersion; @@ -31,6 +33,8 @@ public class TunnelPoolSettings { private final Properties _unknownOptions; private Hash _randomKey; private int _priority; + private final Set _aliases; + private Hash _aliasOf; /** prefix used to override the router's defaults for clients */ // unimplemented @@ -119,6 +123,10 @@ public class TunnelPoolSettings { _randomKey = generateRandomKey(); if (_isExploratory && !_isInbound) _priority = EXPLORATORY_PRIORITY; + if (!_isExploratory) + _aliases = new ConcurrentHashSet(4); + else + _aliases = null; } /** how many tunnels should be available at all times */ @@ -206,6 +214,34 @@ public class TunnelPoolSettings { /** what destination is this a client tunnel for (or null if exploratory) */ public Hash getDestination() { return _destination; } + + /** + * Other destinations that use the same tunnel (or null if exploratory) + * Modifiable, concurrent, not a copy + * @since 0.9.19 + */ + public Set getAliases() { + return _aliases; + } + + /** + * Other destination that this is an alias of (or null). + * If non-null, don't build tunnels. + * @since 0.9.19 + */ + public Hash getAliasOf() { + return _aliasOf; + } + + + /** + * Set other destination that this is an alias of (or null). + * If non-null, don't build tunnels. + * @since 0.9.19 + */ + public void setAliasOf(Hash h) { + _aliasOf = h; + } /** * random key used for peer ordering @@ -235,7 +271,7 @@ public class TunnelPoolSettings { public int getPriority() { return _priority; } public Properties getUnknownOptions() { return _unknownOptions; } - + /** * @param prefix non-null */ diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index fbfa0a560..943555643 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -16,6 +16,7 @@ import java.io.OutputStream; import java.net.Socket; import java.util.concurrent.ConcurrentHashMap; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -39,6 +40,7 @@ import net.i2p.data.i2cp.SendMessageMessage; import net.i2p.data.i2cp.SendMessageExpiresMessage; import net.i2p.data.i2cp.SessionConfig; import net.i2p.data.i2cp.SessionId; +import net.i2p.data.i2cp.SessionStatusMessage; import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; @@ -51,6 +53,9 @@ import net.i2p.util.SimpleTimer; /** * Bridge the router and the client - managing state for a client. * + * As of release 0.9.19, multiple sessions are supported on a single + * I2CP connection. These sessions share tunnels and some configuration. + * * @author jrandom */ class ClientConnectionRunner { @@ -61,21 +66,16 @@ class ClientConnectionRunner { private final Socket _socket; /** output stream of the socket that I2CP messages bound to the client should be written to */ private OutputStream _out; - /** session ID of the current client */ - private SessionId _sessionId; - /** user's config */ - private SessionConfig _config; + + private final ConcurrentHashMap _sessions; + private String _clientVersion; /** * Mapping of MessageId to Payload, storing messages for retrieval. * Unused for i2cp.fastReceive = "true" (_dontSendMSMOnRecive = true) */ private final Map _messages; - /** lease set request state, or null if there is no request pending on at the moment */ - private LeaseRequestState _leaseRequest; private int _consecutiveLeaseRequestFails; - /** currently allocated leaseSet, or null if none is allocated */ - private LeaseSet _currentLeaseSet; /** * Set of messageIds created but not yet ACCEPTED. * Unused for i2cp.messageReliability = "none" (_dontSendMSM = true) @@ -83,7 +83,7 @@ class ClientConnectionRunner { private final Set _acceptedPending; /** thingy that does stuff */ protected I2CPMessageReader _reader; - /** just for this destination */ + /** Used for all sessions, which must all have the same crypto keys */ private SessionKeyManager _sessionKeyManager; /** * This contains the last 10 MessageIds that have had their (non-ack) status @@ -91,7 +91,6 @@ class ClientConnectionRunner { */ private final List _alreadyProcessed; private ClientWriterRunner _writer; - private Hash _destHashCache; /** are we, uh, dead */ private volatile boolean _dead; /** For outbound traffic. true if i2cp.messageReliability = "none"; @since 0.8.1 */ @@ -108,11 +107,30 @@ class ClientConnectionRunner { private static final int MAX_LEASE_FAILS = 5; private static final int BUF_SIZE = 32*1024; + private static final int MAX_SESSIONS = 4; /** @since 0.9.2 */ private static final String PROP_TAGS = "crypto.tagsToSend"; private static final String PROP_THRESH = "crypto.lowTagThreshold"; + /** + * For multisession + * @since 0.9.19 + */ + private static class SessionParams { + final Destination dest; + final boolean isPrimary; + SessionId sessionId; + SessionConfig config; + LeaseRequestState leaseRequest; + LeaseSet currentLeaseSet; + + SessionParams(Destination d, boolean isPrimary) { + dest = d; + this.isPrimary = isPrimary; + } + } + /** * Create a new runner against the given socket * @@ -124,6 +142,7 @@ class ClientConnectionRunner { _socket = socket; // unused for fastReceive _messages = new ConcurrentHashMap(); + _sessions = new ConcurrentHashMap(4); _alreadyProcessed = new ArrayList(); _acceptedPending = new ConcurrentHashSet(); _messageId = new AtomicInteger(_context.random().nextInt()); @@ -166,8 +185,7 @@ class ClientConnectionRunner { public synchronized void stopRunning() { if (_dead) return; if (_context.router().isAlive() && _log.shouldLog(Log.WARN)) - _log.warn("Stop the I2CP connection! current leaseSet: " - + _currentLeaseSet, new Exception("Stop client connection")); + _log.warn("Stop the I2CP connection!", new Exception("Stop client connection")); _dead = true; // we need these keys to unpublish the leaseSet if (_reader != null) _reader.stopReading(); @@ -178,21 +196,56 @@ class ClientConnectionRunner { if (_sessionKeyManager != null) _sessionKeyManager.shutdown(); _manager.unregisterConnection(this); - if (_currentLeaseSet != null) - _context.netDb().unpublish(_currentLeaseSet); - _leaseRequest = null; + for (SessionParams sp : _sessions.values()) { + LeaseSet ls = sp.currentLeaseSet; + if (ls != null) + _context.netDb().unpublish(ls); + } synchronized (_alreadyProcessed) { _alreadyProcessed.clear(); } - //_config = null; - //_manager = null; + _sessions.clear(); } /** * Current client's config, - * will be null before session is established + * will be null if session not found + * IS subsession aware. + * @since 0.9.19 added hash param */ - public SessionConfig getConfig() { return _config; } + public SessionConfig getConfig(Hash h) { + SessionParams sp = _sessions.get(h); + if (sp == null) + return null; + return sp.config; + } + + /** + * Current client's config, + * will be null if session not found + * IS subsession aware. + * @since 0.9.19 added id param + */ + public SessionConfig getConfig(SessionId id) { + for (SessionParams sp : _sessions.values()) { + if (id.equals(sp.sessionId)) + return sp.config; + } + return null; + } + + /** + * Primary client's config, + * will be null if session not set up + * @since 0.9.19 + */ + public SessionConfig getPrimaryConfig() { + for (SessionParams sp : _sessions.values()) { + if (sp.isPrimary) + return sp.config; + } + return null; + } /** * The client version. @@ -214,41 +267,186 @@ class ClientConnectionRunner { /** current client's sessionkeymanager */ public SessionKeyManager getSessionKeyManager() { return _sessionKeyManager; } - /** currently allocated leaseSet */ - public LeaseSet getLeaseSet() { return _currentLeaseSet; } - void setLeaseSet(LeaseSet ls) { _currentLeaseSet = ls; } + /** + * Currently allocated leaseSet. + * IS subsession aware. Returns primary leaseset only. + * @return leaseSet or null if not yet set or unknown hash + * @since 0.9.19 added hash parameter + */ + public LeaseSet getLeaseSet(Hash h) { + SessionParams sp = _sessions.get(h); + if (sp == null) + return null; + return sp.currentLeaseSet; + } + + /** + * Currently allocated leaseSet. + * IS subsession aware. + */ + void setLeaseSet(LeaseSet ls) { + Hash h = ls.getDestination().calculateHash(); + SessionParams sp = _sessions.get(h); + if (sp == null) + return; + sp.currentLeaseSet = ls; + } /** * Equivalent to getConfig().getDestination().calculateHash(); * will be null before session is established + * Not subsession aware. Returns random hash from the sessions. + * Don't use if you can help it. + * + * @return primary hash or null if not yet set */ - public Hash getDestHash() { return _destHashCache; } + public Hash getDestHash() { + for (Hash h : _sessions.keySet()) { + return h; + } + return null; + } + + /** + * Return the hash for the given ID + * @return hash or null if unknown + * @since 0.9.19 + */ + public Hash getDestHash(SessionId id) { + for (Map.Entry e : _sessions.entrySet()) { + if (id.equals(e.getValue().sessionId)) + return e.getKey(); + } + return null; + } + + /** + * Return the dest for the given ID + * @return dest or null if unknown + * @since 0.9.19 + */ + public Destination getDestination(SessionId id) { + for (SessionParams sp : _sessions.values()) { + if (id.equals(sp.sessionId)) + return sp.dest; + } + return null; + } /** - * @return current client's sessionId or null if not yet set + * Subsession aware. + * + * @param h the local target + * @return current client's sessionId or null if not yet set or not a valid hash + * @since 0.9.19 */ - SessionId getSessionId() { return _sessionId; } + SessionId getSessionId(Hash h) { + SessionParams sp = _sessions.get(h); + if (sp == null) + return null; + return sp.sessionId; + } + + /** + * Subsession aware. + * + * @return all current client's sessionIds, non-null + * @since 0.9.19 + */ + List getSessionIds() { + List rv = new ArrayList(_sessions.size()); + for (SessionParams sp : _sessions.values()) { + SessionId id = sp.sessionId; + if (id != null) + rv.add(id); + } + return rv; + } + + /** + * Subsession aware. + * + * @return all current client's destinations, non-null + * @since 0.9.19 + */ + List getDestinations() { + List rv = new ArrayList(_sessions.size()); + for (SessionParams sp : _sessions.values()) { + rv.add(sp.dest); + } + return rv; + } /** * To be called only by ClientManager. * + * @param hash for the session * @throws IllegalStateException if already set + * @since 0.9.19 added hash param */ - void setSessionId(SessionId id) { - if (_sessionId != null) + void setSessionId(Hash hash, SessionId id) { + if (hash == null) throw new IllegalStateException(); - _sessionId = id; + SessionParams sp = _sessions.get(hash); + if (sp == null || sp.sessionId != null) + throw new IllegalStateException(); + sp.sessionId = id; + } + + /** + * Kill the session. Caller must kill runner if none left. + * + * @since 0.9.19 + */ + void removeSession(SessionId id) { + boolean isPrimary = false; + for (Iterator iter = _sessions.values().iterator(); iter.hasNext(); ) { + SessionParams sp = iter.next(); + if (id.equals(sp.sessionId)) { + if (_log.shouldLog(Log.INFO)) + _log.info("Destroying client session " + id); + iter.remove(); + // Tell client manger + _manager.unregisterSession(id, sp.dest); + LeaseSet ls = sp.currentLeaseSet; + if (ls != null) + _context.netDb().unpublish(ls); + isPrimary = sp.isPrimary; + } + } + if (isPrimary) { + // kill all the others also + for (SessionParams sp : _sessions.values()) { + _manager.unregisterSession(id, sp.dest); + LeaseSet ls = sp.currentLeaseSet; + if (ls != null) + _context.netDb().unpublish(ls); + } + } } - /** data for the current leaseRequest, or null if there is no active leaseSet request */ - LeaseRequestState getLeaseRequest() { return _leaseRequest; } + /** + * Data for the current leaseRequest, or null if there is no active leaseSet request. + * Not subsession aware. Returns primary ID only. + * @since 0.9.19 added hash param + */ + LeaseRequestState getLeaseRequest(Hash h) { + SessionParams sp = _sessions.get(h); + if (sp == null) + return null; + return sp.leaseRequest; + } /** @param req non-null */ public void failLeaseRequest(LeaseRequestState req) { boolean disconnect = false; + Hash h = req.getRequested().getDestination().calculateHash(); + SessionParams sp = _sessions.get(h); + if (sp == null) + return; synchronized (this) { - if (_leaseRequest == req) { - _leaseRequest = null; + if (sp.leaseRequest == req) { + sp.leaseRequest = null; disconnect = ++_consecutiveLeaseRequestFails > MAX_LEASE_FAILS; } } @@ -289,19 +487,34 @@ class ClientConnectionRunner { * @return SessionStatusMessage return code, 1 for success, != 1 for failure */ public int sessionEstablished(SessionConfig config) { - _destHashCache = config.getDestination().calculateHash(); + Destination dest = config.getDestination(); + Hash destHash = dest.calculateHash(); if (_log.shouldLog(Log.DEBUG)) - _log.debug("SessionEstablished called for destination " + _destHashCache.toBase64()); - _config = config; + _log.debug("SessionEstablished called for destination " + destHash); + if (_sessions.size() > MAX_SESSIONS) + return SessionStatusMessage.STATUS_REFUSED; + boolean isPrimary = _sessions.isEmpty(); + if (!isPrimary) { + // all encryption keys must be the same + for (SessionParams sp : _sessions.values()) { + if (!dest.getPublicKey().equals(sp.dest.getPublicKey())) + return SessionStatusMessage.STATUS_INVALID; + } + } + SessionParams sp = new SessionParams(dest, isPrimary); + sp.config = config; + SessionParams old = _sessions.putIfAbsent(destHash, sp); + if (old != null) + return SessionStatusMessage.STATUS_INVALID; // We process a few options here, but most are handled by the tunnel manager. // The ones here can't be changed later. Properties opts = config.getOptions(); - if (opts != null) { + if (isPrimary && opts != null) { _dontSendMSM = "none".equals(opts.getProperty(I2PClient.PROP_RELIABILITY, "").toLowerCase(Locale.US)); _dontSendMSMOnReceive = Boolean.parseBoolean(opts.getProperty(I2PClient.PROP_FAST_RECEIVE)); } // per-destination session key manager to prevent rather easy correlation - if (_sessionKeyManager == null) { + if (isPrimary && _sessionKeyManager == null) { int tags = TransientSessionKeyManager.DEFAULT_TAGS; int thresh = TransientSessionKeyManager.LOW_THRESHOLD; if (opts != null) { @@ -315,10 +528,8 @@ class ClientConnectionRunner { } } _sessionKeyManager = new TransientSessionKeyManager(_context, tags, thresh); - } else { - _log.error("SessionEstablished called for twice for destination " + _destHashCache.toBase64().substring(0,4)); } - return _manager.destinationEstablished(this); + return _manager.destinationEstablished(this, dest); } /** @@ -329,14 +540,21 @@ class ClientConnectionRunner { * * Do not use for status = STATUS_SEND_ACCEPTED; use ackSendMessage() for that. * + * @param dest the client * @param id the router's ID for this message * @param messageNonce the client's ID for this message * @param status see I2CP MessageStatusMessage for success/failure codes */ - void updateMessageDeliveryStatus(MessageId id, long messageNonce, int status) { + void updateMessageDeliveryStatus(Destination dest, MessageId id, long messageNonce, int status) { if (_dead || messageNonce <= 0) return; - _context.jobQueue().addJob(new MessageDeliveryStatusUpdate(id, messageNonce, status)); + SessionParams sp = _sessions.get(dest.calculateHash()); + if (sp == null) + return; + SessionId sid = sp.sessionId; + if (sid == null) + return; // sid = new SessionId(foo) ??? + _context.jobQueue().addJob(new MessageDeliveryStatusUpdate(sid, id, messageNonce, status)); } /** @@ -344,19 +562,23 @@ class ClientConnectionRunner { * updated. This takes care of all the LeaseRequestState stuff (including firing any jobs) */ void leaseSetCreated(LeaseSet ls) { - LeaseRequestState state = null; + Hash h = ls.getDestination().calculateHash(); + SessionParams sp = _sessions.get(h); + if (sp == null) + return; + LeaseRequestState state; synchronized (this) { - state = _leaseRequest; + state = sp.leaseRequest; if (state == null) { if (_log.shouldLog(Log.WARN)) _log.warn("LeaseRequest is null and we've received a new lease?! perhaps this is odd... " + ls); return; } else { state.setIsSuccessful(true); - _currentLeaseSet = ls; + setLeaseSet(ls); if (_log.shouldLog(Log.DEBUG)) _log.debug("LeaseSet created fully: " + state + " / " + ls); - _leaseRequest = null; + sp.leaseRequest = null; _consecutiveLeaseRequestFails = 0; } } @@ -425,12 +647,12 @@ class ClientConnectionRunner { if (_log.shouldLog(Log.DEBUG)) _log.debug("** Receiving message " + id.getMessageId() + " with payload of size " - + payload.getSize() + " for session " + _sessionId.getSessionId()); + + payload.getSize() + " for session " + message.getSessionId()); //long beforeDistribute = _context.clock().now(); // the following blocks as described above - SessionConfig cfg = _config; - if (cfg != null) - _manager.distributeMessage(cfg.getDestination(), dest, payload, + Destination fromDest = getDestination(message.getSessionId()); + if (fromDest != null) + _manager.distributeMessage(fromDest, dest, payload, id, message.getNonce(), expiration, flags); // else log error? //long timeToDistribute = _context.clock().now() - beforeDistribute; @@ -450,11 +672,9 @@ class ClientConnectionRunner { * @param id OUR id for the message * @param nonce HIS id for the message */ - void ackSendMessage(MessageId id, long nonce) { + void ackSendMessage(SessionId sid, MessageId id, long nonce) { if (_dontSendMSM || nonce == 0) return; - SessionId sid = _sessionId; - if (sid == null) return; if (_log.shouldLog(Log.DEBUG)) _log.debug("Acking message send [accepted]" + id + " / " + nonce + " for sessionId " + sid); @@ -476,6 +696,7 @@ class ClientConnectionRunner { /** * Asynchronously deliver the message to the current runner * + * @param fromDest generally null when from remote, non-null if from local */ void receiveMessage(Destination toDest, Destination fromDest, Payload payload) { if (_dead) return; @@ -489,9 +710,9 @@ class ClientConnectionRunner { * Send async abuse message to the client * */ - public void reportAbuse(String reason, int severity) { + public void reportAbuse(Destination dest, String reason, int severity) { if (_dead) return; - _context.jobQueue().addJob(new ReportAbuseJob(_context, this, reason, severity)); + _context.jobQueue().addJob(new ReportAbuseJob(_context, this, dest, reason, severity)); } /** @@ -524,12 +745,16 @@ class ClientConnectionRunner { // so the comparison will always work. int leases = set.getLeaseCount(); // synch so _currentLeaseSet isn't changed out from under us + LeaseSet current = null; synchronized (this) { - if (_currentLeaseSet != null && _currentLeaseSet.getLeaseCount() == leases) { + Destination dest = set.getDestination(); + if (dest != null) + current = getLeaseSet(dest.calculateHash()); + if (current != null && current.getLeaseCount() == leases) { for (int i = 0; i < leases; i++) { - if (! _currentLeaseSet.getLease(i).getTunnelId().equals(set.getLease(i).getTunnelId())) + if (! current.getLease(i).getTunnelId().equals(set.getLease(i).getTunnelId())) break; - if (! _currentLeaseSet.getLease(i).getGateway().equals(set.getLease(i).getGateway())) + if (! current.getLease(i).getGateway().equals(set.getLease(i).getGateway())) break; if (i == leases - 1) { if (_log.shouldLog(Log.INFO)) @@ -542,10 +767,14 @@ class ClientConnectionRunner { } } if (_log.shouldLog(Log.INFO)) - _log.info("Current leaseSet " + _currentLeaseSet + "\nNew leaseSet " + set); - LeaseRequestState state = null; + _log.info("Current leaseSet " + current + "\nNew leaseSet " + set); + Hash h = set.getDestination().calculateHash(); + SessionParams sp = _sessions.get(h); + if (sp == null) + return; + LeaseRequestState state; synchronized (this) { - state = _leaseRequest; + state = sp.leaseRequest; if (state != null) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Already requesting " + state); @@ -562,7 +791,7 @@ class ClientConnectionRunner { // fire onCreated? return; // already requesting } else { - _leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, _context.clock().now() + expirationTime, set); + sp.leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, _context.clock().now() + expirationTime, set); if (_log.shouldLog(Log.DEBUG)) _log.debug("New request: " + state); } @@ -693,6 +922,7 @@ class ClientConnectionRunner { private static final int MAX_REQUEUE = 60; // 30 sec. private class MessageDeliveryStatusUpdate extends JobImpl { + private final SessionId _sessId; private final MessageId _messageId; private final long _messageNonce; private final int _status; @@ -706,8 +936,9 @@ class ClientConnectionRunner { * @param messageNonce the client's ID for this message * @param status see I2CP MessageStatusMessage for success/failure codes */ - public MessageDeliveryStatusUpdate(MessageId id, long messageNonce, int status) { + public MessageDeliveryStatusUpdate(SessionId sid, MessageId id, long messageNonce, int status) { super(ClientConnectionRunner.this._context); + _sessId = sid; _messageId = id; _messageNonce = messageNonce; _status = status; @@ -723,7 +954,7 @@ class ClientConnectionRunner { MessageStatusMessage msg = new MessageStatusMessage(); msg.setMessageId(_messageId.getMessageId()); - msg.setSessionId(_sessionId.getSessionId()); + msg.setSessionId(_sessId.getSessionId()); // has to be >= 0, it is initialized to -1 msg.setNonce(_messageNonce); msg.setSize(0); @@ -734,12 +965,12 @@ class ClientConnectionRunner { // bug requeueing forever? failsafe _log.error("Abandon update for message " + _messageId + " to " + MessageStatusMessage.getStatusString(msg.getStatus()) - + " for session " + _sessionId.getSessionId()); + + " for " + _sessId); } else { if (_log.shouldLog(Log.WARN)) _log.warn("Almost send an update for message " + _messageId + " to " + MessageStatusMessage.getStatusString(msg.getStatus()) - + " for session " + _sessionId.getSessionId() + + " for " + _sessId + " before they knew the messageId! delaying .5s"); _lastTried = _context.clock().now(); requeue(REQUEUE_DELAY); @@ -774,14 +1005,14 @@ class ClientConnectionRunner { if (_log.shouldLog(Log.DEBUG)) _log.info("Updating message status for message " + _messageId + " to " + MessageStatusMessage.getStatusString(msg.getStatus()) - + " for session " + _sessionId.getSessionId() + + " for " + _sessId + " (with nonce=2), retrying after " + (_context.clock().now() - _lastTried)); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Updating message status for message " + _messageId + " to " + MessageStatusMessage.getStatusString(msg.getStatus()) - + " for session " + _sessionId.getSessionId() + " (with nonce=2)"); + + " for " + _sessId + " (with nonce=2)"); } try { diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 9a8850c9b..a875f0f32 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -51,9 +51,11 @@ class ClientManager { protected final List _listeners; // Destination --> ClientConnectionRunner // Locked for adds/removes but not lookups + // If a runner has multiple sessions it will be in here multiple times, one for each dest private final Map _runners; // Same as what's in _runners, but for fast lookup by Hash // Locked for adds/removes but not lookups + // If a runner has multiple sessions it will be in here multiple times, one for each dest private final Map _runnersByHash; // ClientConnectionRunner for clients w/out a Dest yet private final Set _pendingRunners; @@ -203,24 +205,44 @@ class ClientManager { } } + /** + * Remove all sessions for this runner. + */ public void unregisterConnection(ClientConnectionRunner runner) { - _log.warn("Unregistering (dropping) a client connection"); + if (_log.shouldLog(Log.WARN)) + _log.warn("Unregistering (dropping) a client connection"); synchronized (_pendingRunners) { _pendingRunners.remove(runner); } - if ( (runner.getConfig() != null) && (runner.getConfig().getDestination() != null) ) { - // after connection establishment - Destination dest = runner.getConfig().getDestination(); - synchronized (_runners) { - SessionId id = runner.getSessionId(); - if (id != null) - _runnerSessionIds.remove(id); + + List ids = runner.getSessionIds(); + List dests = runner.getDestinations(); + synchronized (_runners) { + for (SessionId id : ids) { + _runnerSessionIds.remove(id); + } + for (Destination dest : dests) { _runners.remove(dest); _runnersByHash.remove(dest.calculateHash()); } } } + /** + * Remove only the following session. Does not remove the runner if it has more. + * + * @since 0.9.19 + */ + public void unregisterSession(SessionId id, Destination dest) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Unregistering client session " + id); + synchronized (_runners) { + _runnerSessionIds.remove(id); + _runners.remove(dest); + _runnersByHash.remove(dest.calculateHash()); + } + } + /** * Add to the clients list. Check for a dup destination. * Side effect: Sets the session ID of the runner. @@ -228,8 +250,7 @@ class ClientManager { * * @return SessionStatusMessage return code, 1 for success, != 1 for failure */ - public int destinationEstablished(ClientConnectionRunner runner) { - Destination dest = runner.getConfig().getDestination(); + public int destinationEstablished(ClientConnectionRunner runner, Destination dest) { if (_log.shouldLog(Log.DEBUG)) _log.debug("DestinationEstablished called for destination " + dest.calculateHash().toBase64()); @@ -244,9 +265,10 @@ class ClientManager { } else { SessionId id = locked_getNextSessionId(); if (id != null) { - runner.setSessionId(id); + Hash h = dest.calculateHash(); + runner.setSessionId(h, id); _runners.put(dest, runner); - _runnersByHash.put(dest.calculateHash(), runner); + _runnersByHash.put(h, runner); rv = SessionStatusMessage.STATUS_CREATED; } else { rv = SessionStatusMessage.STATUS_REFUSED; @@ -310,8 +332,11 @@ class ClientManager { // sender went away return; } - ClientMessage msg = new ClientMessage(toDest, payload, runner.getConfig(), - runner.getConfig().getDestination(), msgId, + SessionConfig config = runner.getConfig(fromDest.calculateHash()); + if (config == null) + return; + ClientMessage msg = new ClientMessage(toDest, payload, config, + fromDest, msgId, messageNonce, expiration, flags); _ctx.clientMessagePool().add(msg, true); } @@ -347,7 +372,7 @@ class ClientManager { public void runJob() { _to.receiveMessage(_toDest, _fromDest, _payload); if (_from != null) { - _from.updateMessageDeliveryStatus(_msgId, _messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL); + _from.updateMessageDeliveryStatus(_fromDest, _msgId, _messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL); } } } @@ -410,7 +435,9 @@ class ClientManager { if (destHash == null) return true; ClientConnectionRunner runner = getRunner(destHash); if (runner == null) return true; - return !Boolean.parseBoolean(runner.getConfig().getOptions().getProperty(ClientManagerFacade.PROP_CLIENT_ONLY)); + SessionConfig config = runner.getConfig(destHash); + if (config == null) return true; + return !Boolean.parseBoolean(config.getOptions().getProperty(ClientManagerFacade.PROP_CLIENT_ONLY)); } /** @@ -437,7 +464,7 @@ class ClientManager { public SessionConfig getClientSessionConfig(Destination dest) { ClientConnectionRunner runner = getRunner(dest); if (runner != null) - return runner.getConfig(); + return runner.getConfig(dest.calculateHash()); else return null; } @@ -475,7 +502,7 @@ class ClientManager { if (_log.shouldLog(Log.DEBUG)) _log.debug("Delivering status " + status + " to " + fromDest.calculateHash() + " for message " + id); - runner.updateMessageDeliveryStatus(id, messageNonce, status); + runner.updateMessageDeliveryStatus(fromDest, id, messageNonce, status); } else { if (_log.shouldLog(Log.WARN)) _log.warn("Cannot deliver status " + status + " to " @@ -499,7 +526,7 @@ class ClientManager { if (dest != null) { ClientConnectionRunner runner = getRunner(dest); if (runner != null) { - runner.reportAbuse(reason, severity); + runner.reportAbuse(dest, reason, severity); } } else { for (Destination d : _runners.keySet()) { @@ -577,21 +604,22 @@ class ClientManager { public void runJob() { ClientConnectionRunner runner; - if (_msg.getDestination() != null) - runner = getRunner(_msg.getDestination()); + Destination dest = _msg.getDestination(); + if (dest != null) + runner = getRunner(dest); else runner = getRunner(_msg.getDestinationHash()); if (runner != null) { //_ctx.statManager().addRateData("client.receiveMessageSize", // _msg.getPayload().getSize(), 0); - runner.receiveMessage(_msg.getDestination(), null, _msg.getPayload()); + runner.receiveMessage(dest, null, _msg.getPayload()); } else { // no client connection... // we should pool these somewhere... if (_log.shouldLog(Log.WARN)) _log.warn("Message received but we don't have a connection to " - + _msg.getDestination() + "/" + _msg.getDestinationHash() + + dest + "/" + _msg.getDestinationHash() + " currently. DROPPED"); } } diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index 6168ab794..d4e476ad7 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -90,7 +90,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte for (Destination dest : _manager.getRunnerDestinations()) { ClientConnectionRunner runner = _manager.getRunner(dest); if ( (runner == null) || (runner.getIsDead())) continue; - LeaseSet ls = runner.getLeaseSet(); + LeaseSet ls = runner.getLeaseSet(dest.calculateHash()); if (ls == null) continue; // still building long howLongAgo = _context.clock().now() - ls.getEarliestLeaseDate(); diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index 382552ce6..b3f1ad1ca 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -195,12 +195,13 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi */ private void handleCreateSession(CreateSessionMessage message) { SessionConfig in = message.getSessionConfig(); + Destination dest = in.getDestination(); if (in.verifySignature()) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Signature verified correctly on create session message"); } else { // For now, we do NOT send a SessionStatusMessage - see javadoc above - int itype = in.getDestination().getCertificate().getCertificateType(); + int itype = dest.getCertificate().getCertificateType(); SigType stype = SigType.getByCode(itype); if (stype == null || !stype.isAvailable()) { _log.error("Client requested unsupported signature type " + itype); @@ -217,7 +218,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi if (!checkAuth(inProps)) return; - SessionId id = _runner.getSessionId(); + SessionId id = _runner.getSessionId(dest.calculateHash()); if (id != null) { _runner.disconnectClient("Already have session " + id); return; @@ -226,11 +227,12 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi // Copy over the whole config structure so we don't later corrupt it on // the client side if we change settings or later get a // ReconfigureSessionMessage - SessionConfig cfg = new SessionConfig(in.getDestination()); + SessionConfig cfg = new SessionConfig(dest); cfg.setSignature(in.getSignature()); Properties props = new Properties(); props.putAll(in.getOptions()); cfg.setOptions(props); + boolean isPrimary = _runner.getSessionIds().isEmpty(); int status = _runner.sessionEstablished(cfg); if (status != SessionStatusMessage.STATUS_CREATED) { // For now, we do NOT send a SessionStatusMessage - see javadoc above @@ -246,11 +248,29 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi _runner.disconnectClient(msg); return; } - sendStatusMessage(status); + sendStatusMessage(id, status); if (_log.shouldLog(Log.INFO)) - _log.info("Session " + _runner.getSessionId() + " established for " + _runner.getDestHash()); - startCreateSessionJob(); + _log.info("Session " + id + " established for " + dest.calculateHash()); + if (isPrimary) { + startCreateSessionJob(cfg); + } else { + SessionConfig pcfg = _runner.getPrimaryConfig(); + if (pcfg != null) { + /////////// + // new tunnel name etc. + ClientTunnelSettings settings = new ClientTunnelSettings(dest.calculateHash()); + // all the primary options, then the overrides from the alias + props.putAll(pcfg.getOptions()); + props.putAll(props); + settings.readFromProperties(props); + boolean ok = _context.tunnelManager().addAlias(dest, settings, pcfg.getDestination()); + if (!ok) { + _log.error("Add alias failed"); + // send status message... + } + } + } } /** @@ -296,8 +316,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi * @since 0.9.8 * */ - protected void startCreateSessionJob() { - _context.jobQueue().addJob(new CreateSessionJob(_context, _runner)); + protected void startCreateSessionJob(SessionConfig config) { + _context.jobQueue().addJob(new CreateSessionJob(_context, config)); } /** @@ -311,7 +331,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi long beforeDistribute = _context.clock().now(); MessageId id = _runner.distributeMessage(message); long timeToDistribute = _context.clock().now() - beforeDistribute; - _runner.ackSendMessage(id, message.getNonce()); + // TODO validate session id + _runner.ackSendMessage(message.getSessionId(), id, message.getNonce()); _context.statManager().addRateData("client.distributeTime", timeToDistribute); if ( (timeToDistribute > 50) && (_log.shouldLog(Log.INFO)) ) _log.info("Took too long to distribute the message (which holds up the ack): " + timeToDistribute); @@ -328,7 +349,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi _log.debug("Handling recieve begin: id = " + message.getMessageId()); MessagePayloadMessage msg = new MessagePayloadMessage(); msg.setMessageId(message.getMessageId()); - msg.setSessionId(_runner.getSessionId().getSessionId()); + // TODO validate session id + msg.setSessionId(message.getSessionId()); Payload payload = _runner.getPayload(new MessageId(message.getMessageId())); if (payload == null) { if (_log.shouldLog(Log.WARN)) @@ -357,9 +379,18 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi } private void handleDestroySession(DestroySessionMessage message) { - if (_log.shouldLog(Log.INFO)) - _log.info("Destroying client session " + _runner.getSessionId()); - _runner.stopRunning(); + SessionId id = message.getSessionId(); + SessionConfig cfg = _runner.getConfig(id); + _runner.removeSession(id); + int left = _runner.getSessionIds().size(); + if (left <= 0) { + _runner.stopRunning(); + } else { + if (cfg != null) + _context.tunnelManager().removeAlias(cfg.getDestination()); + if (_log.shouldLog(Log.INFO)) + _log.info("Still " + left + " sessions left"); + } } /** override for testing */ @@ -370,7 +401,13 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi _runner.disconnectClient("Invalid CreateLeaseSetMessage"); return; } - Destination dest = _runner.getConfig().getDestination(); + SessionId id = message.getSessionId(); + SessionConfig config = _runner.getConfig(id); + if (config == null) { + _log.error("Unknown session in CLSM"); + return; + } + Destination dest = config.getDestination(); Destination ndest = message.getLeaseSet().getDestination(); if (!dest.equals(ndest)) { if (_log.shouldLog(Log.ERROR)) @@ -414,8 +451,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi return; } if (_log.shouldLog(Log.INFO)) - _log.info("New lease set granted for destination " - + _runner.getDestHash()); + _log.info("New lease set granted for destination " + dest); // leaseSetCreated takes care of all the LeaseRequestState stuff (including firing any jobs) _runner.leaseSetCreated(message.getLeaseSet()); @@ -423,6 +459,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi /** override for testing */ protected void handleDestLookup(DestLookupMessage message) { + // no session id in DLM _context.jobQueue().addJob(new LookupDestJob(_context, _runner, message.getHash(), _runner.getDestHash())); } @@ -432,10 +469,12 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi * @since 0.9.11 */ protected void handleHostLookup(HostLookupMessage message) { + Hash h = _runner.getDestHash(message.getSessionId()); + if (h == null) + return; // ok? _context.jobQueue().addJob(new LookupDestJob(_context, _runner, message.getReqID(), message.getTimeout(), message.getSessionId(), - message.getHash(), message.getHostname(), - _runner.getDestHash())); + message.getHash(), message.getHostname(), h)); } /** @@ -447,32 +486,37 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi * ClientConnectionRunner.sessionEstablished(). Those can't be changed later. */ private void handleReconfigureSession(ReconfigureSessionMessage message) { + SessionId id = message.getSessionId(); + SessionConfig config = _runner.getConfig(id); + if (config == null) { + _log.error("Unknown session"); + sendStatusMessage(id, SessionStatusMessage.STATUS_INVALID); + //_runner.stopRunning(); // ok? + return; + } if (_log.shouldLog(Log.INFO)) - _log.info("Updating options - old: " + _runner.getConfig() + " new: " + message.getSessionConfig()); - if (!message.getSessionConfig().getDestination().equals(_runner.getConfig().getDestination())) { + _log.info("Updating options - old: " + _runner.getConfig(id) + " new: " + message.getSessionConfig()); + if (!message.getSessionConfig().getDestination().equals(config.getDestination())) { _log.error("Dest mismatch"); - sendStatusMessage(SessionStatusMessage.STATUS_INVALID); + sendStatusMessage(id, SessionStatusMessage.STATUS_INVALID); _runner.stopRunning(); return; } - _runner.getConfig().getOptions().putAll(message.getSessionConfig().getOptions()); - Hash dest = _runner.getDestHash(); + Hash dest = config.getDestination().calculateHash(); + config.getOptions().putAll(message.getSessionConfig().getOptions()); ClientTunnelSettings settings = new ClientTunnelSettings(dest); Properties props = new Properties(); - props.putAll(_runner.getConfig().getOptions()); + props.putAll(config.getOptions()); settings.readFromProperties(props); _context.tunnelManager().setInboundSettings(dest, settings.getInboundSettings()); _context.tunnelManager().setOutboundSettings(dest, settings.getOutboundSettings()); - sendStatusMessage(SessionStatusMessage.STATUS_UPDATED); + sendStatusMessage(id, SessionStatusMessage.STATUS_UPDATED); } - private void sendStatusMessage(int status) { + private void sendStatusMessage(SessionId id, int status) { SessionStatusMessage msg = new SessionStatusMessage(); - SessionId id = _runner.getSessionId(); - if (id == null) - id = ClientManager.UNKNOWN_SESSION_ID; msg.setSessionId(id); msg.setStatus(status); try { diff --git a/router/java/src/net/i2p/router/client/CreateSessionJob.java b/router/java/src/net/i2p/router/client/CreateSessionJob.java index af01a496c..558dba8e7 100644 --- a/router/java/src/net/i2p/router/client/CreateSessionJob.java +++ b/router/java/src/net/i2p/router/client/CreateSessionJob.java @@ -26,25 +26,20 @@ import net.i2p.util.Log; */ class CreateSessionJob extends JobImpl { private final Log _log; - private final ClientConnectionRunner _runner; + private final SessionConfig _config; - public CreateSessionJob(RouterContext context, ClientConnectionRunner runner) { + public CreateSessionJob(RouterContext context, SessionConfig config) { super(context); _log = context.logManager().getLog(CreateSessionJob.class); - _runner = runner; + _config = config; if (_log.shouldLog(Log.DEBUG)) - _log.debug("CreateSessionJob for runner " + _runner + " / config: " + _runner.getConfig()); + _log.debug("CreateSessionJob for config: " + config); } public String getName() { return "Request tunnels for a new client"; } + public void runJob() { - SessionConfig cfg = _runner.getConfig(); - if ( (cfg == null) || (cfg.getDestination() == null) ) { - if (_log.shouldLog(Log.ERROR)) - _log.error("No session config on runner " + _runner); - return; - } - Hash dest = cfg.getDestination().calculateHash(); + Hash dest = _config.getDestination().calculateHash(); if (_log.shouldLog(Log.INFO)) _log.info("Requesting lease set for destination " + dest); ClientTunnelSettings settings = new ClientTunnelSettings(dest); @@ -61,10 +56,10 @@ class CreateSessionJob extends JobImpl { // XXX props.putAll(Router.getInstance().getConfigMap()); // override them by the client's settings - props.putAll(cfg.getOptions()); + props.putAll(_config.getOptions()); // and load 'em up (using anything not yet set as the software defaults) settings.readFromProperties(props); - getContext().tunnelManager().buildTunnels(cfg.getDestination(), settings); + getContext().tunnelManager().buildTunnels(_config.getDestination(), settings); } } diff --git a/router/java/src/net/i2p/router/client/LeaseRequestState.java b/router/java/src/net/i2p/router/client/LeaseRequestState.java index 67968df3b..1fb50620c 100644 --- a/router/java/src/net/i2p/router/client/LeaseRequestState.java +++ b/router/java/src/net/i2p/router/client/LeaseRequestState.java @@ -40,6 +40,7 @@ class LeaseRequestState { /** created lease set from client - FIXME always null */ public LeaseSet getGranted() { return _grantedLeaseSet; } + /** FIXME unused - why? */ public void setGranted(LeaseSet ls) { _grantedLeaseSet = ls; } diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java index 0ee148282..7ce5f5cba 100644 --- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java +++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java @@ -14,6 +14,7 @@ import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessagePayloadMessage; import net.i2p.data.i2cp.MessageStatusMessage; +import net.i2p.data.i2cp.SessionId; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.util.Log; @@ -26,14 +27,20 @@ import net.i2p.util.Log; class MessageReceivedJob extends JobImpl { private final Log _log; private final ClientConnectionRunner _runner; + private final Destination _toDest; private final Payload _payload; private final boolean _sendDirect; + /** + * @param toDest requred to pick session + * @param fromDest ignored, generally null + */ public MessageReceivedJob(RouterContext ctx, ClientConnectionRunner runner, Destination toDest, Destination fromDest, Payload payload, boolean sendDirect) { super(ctx); _log = ctx.logManager().getLog(MessageReceivedJob.class); _runner = runner; + _toDest = toDest; _payload = payload; _sendDirect = sendDirect; } @@ -43,8 +50,8 @@ class MessageReceivedJob extends JobImpl { public void runJob() { if (_runner.isDead()) return; MessageId id = null; - long nextID = _runner.getNextMessageId(); try { + long nextID = _runner.getNextMessageId(); if (_sendDirect) { sendMessage(nextID); } else { @@ -55,7 +62,7 @@ class MessageReceivedJob extends JobImpl { } catch (I2CPMessageException ime) { if (_log.shouldLog(Log.WARN)) _log.warn("Error writing out the message", ime); - if (!_sendDirect) + if (id != null && !_sendDirect) _runner.removePayload(id); } } @@ -69,7 +76,13 @@ class MessageReceivedJob extends JobImpl { // + " (with nonce=1)", new Exception("available")); MessageStatusMessage msg = new MessageStatusMessage(); msg.setMessageId(id.getMessageId()); - msg.setSessionId(_runner.getSessionId().getSessionId()); + SessionId sid = _runner.getSessionId(_toDest.calculateHash()); + if (sid == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("No session for " + _toDest.calculateHash()); + return; + } + msg.setSessionId(sid.getSessionId()); msg.setSize(size); // has to be >= 0, it is initialized to -1 msg.setNonce(1); @@ -84,7 +97,13 @@ class MessageReceivedJob extends JobImpl { private void sendMessage(long id) throws I2CPMessageException { MessagePayloadMessage msg = new MessagePayloadMessage(); msg.setMessageId(id); - msg.setSessionId(_runner.getSessionId().getSessionId()); + SessionId sid = _runner.getSessionId(_toDest.calculateHash()); + if (sid == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("No session for " + _toDest.calculateHash()); + return; + } + msg.setSessionId(sid.getSessionId()); msg.setPayload(_payload); _runner.doSend(msg); } diff --git a/router/java/src/net/i2p/router/client/ReportAbuseJob.java b/router/java/src/net/i2p/router/client/ReportAbuseJob.java index 8dd36ac3c..c24e5e9ba 100644 --- a/router/java/src/net/i2p/router/client/ReportAbuseJob.java +++ b/router/java/src/net/i2p/router/client/ReportAbuseJob.java @@ -8,10 +8,12 @@ package net.i2p.router.client; * */ +import net.i2p.data.Destination; import net.i2p.data.i2cp.AbuseReason; import net.i2p.data.i2cp.AbuseSeverity; import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.data.i2cp.ReportAbuseMessage; +import net.i2p.data.i2cp.SessionId; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.util.Log; @@ -23,17 +25,22 @@ import net.i2p.util.Log; class ReportAbuseJob extends JobImpl { private final Log _log; private final ClientConnectionRunner _runner; + private final Destination _dest; private final String _reason; private final int _severity; - public ReportAbuseJob(RouterContext context, ClientConnectionRunner runner, String reason, int severity) { + + public ReportAbuseJob(RouterContext context, ClientConnectionRunner runner, + Destination dest, String reason, int severity) { super(context); _log = context.logManager().getLog(ReportAbuseJob.class); _runner = runner; + _dest = dest; _reason = reason; _severity = severity; } public String getName() { return "Report Abuse"; } + public void runJob() { if (_runner.isDead()) return; AbuseReason res = new AbuseReason(); @@ -41,9 +48,11 @@ class ReportAbuseJob extends JobImpl { AbuseSeverity sev = new AbuseSeverity(); sev.setSeverity(_severity); ReportAbuseMessage msg = new ReportAbuseMessage(); - msg.setMessageId(null); msg.setReason(res); - msg.setSessionId(_runner.getSessionId()); + SessionId id = _runner.getSessionId(_dest.calculateHash()); + if (id == null) + return; + msg.setSessionId(id); msg.setSeverity(sev); try { _runner.doSend(msg); diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java index 9b07978f6..f5ec343a0 100644 --- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java +++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java @@ -16,6 +16,7 @@ import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.data.i2cp.RequestLeaseSetMessage; import net.i2p.data.i2cp.RequestVariableLeaseSetMessage; +import net.i2p.data.i2cp.SessionId; import net.i2p.router.JobImpl; import net.i2p.router.RouterContext; import net.i2p.util.Log; @@ -63,13 +64,16 @@ class RequestLeaseSetJob extends JobImpl { // _log.debug("Adding fudge " + fudge); endTime += fudge; + SessionId id = _runner.getSessionId(_requestState.getRequested().getDestination().calculateHash()); + if (id == null) + return; I2CPMessage msg; if (getContext().getProperty(PROP_VARIABLE, DFLT_VARIABLE) && (_runner instanceof QueuedClientConnectionRunner || RequestVariableLeaseSetMessage.isSupported(_runner.getClientVersion()))) { // new style - leases will have individual expirations RequestVariableLeaseSetMessage rmsg = new RequestVariableLeaseSetMessage(); - rmsg.setSessionId(_runner.getSessionId()); + rmsg.setSessionId(id); for (int i = 0; i < requested.getLeaseCount(); i++) { Lease lease = requested.getLease(i); if (lease.getEndDate().getTime() < endTime) { @@ -90,7 +94,7 @@ class RequestLeaseSetJob extends JobImpl { RequestLeaseSetMessage rmsg = new RequestLeaseSetMessage(); Date end = new Date(endTime); rmsg.setEndDate(end); - rmsg.setSessionId(_runner.getSessionId()); + rmsg.setSessionId(id); for (int i = 0; i < requested.getLeaseCount(); i++) { Lease lease = requested.getLease(i); rmsg.addEndpoint(lease.getGateway(), @@ -144,8 +148,7 @@ class RequestLeaseSetJob extends JobImpl { CheckLeaseRequestStatus.this.getContext().statManager().addRateData("client.requestLeaseSetTimeout", 1); if (_log.shouldLog(Log.ERROR)) { long waited = System.currentTimeMillis() - _start; - _log.error("Failed to receive a leaseSet in the time allotted (" + waited + "): " + _requestState + " for " - + _runner.getConfig().getDestination().calculateHash().toBase64()); + _log.error("Failed to receive a leaseSet in the time allotted (" + waited + "): " + _requestState); } if (_requestState.getOnFailed() != null) RequestLeaseSetJob.this.getContext().jobQueue().addJob(_requestState.getOnFailed()); diff --git a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java index 5de3db1a3..96dceea18 100644 --- a/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/dummy/DummyTunnelManagerFacade.java @@ -50,6 +50,8 @@ public class DummyTunnelManagerFacade implements TunnelManagerFacade { public int getOutboundClientTunnelCount(Hash destination) { return 0; } public long getLastParticipatingExpiration() { return -1; } public void buildTunnels(Destination client, ClientTunnelSettings settings) {} + public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient) { return false; } + public void removeAlias(Destination dest) {} public TunnelPoolSettings getInboundSettings() { return null; } public TunnelPoolSettings getOutboundSettings() { return null; } public TunnelPoolSettings getInboundSettings(Hash client) { return null; } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index 258e01046..4159014f2 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -8,6 +8,7 @@ import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.Set; import java.util.TreeSet; import net.i2p.data.Hash; @@ -609,6 +610,12 @@ public class TunnelPool { } if (ls != null) { _context.clientManager().requestLeaseSet(_settings.getDestination(), ls); + Set aliases = _settings.getAliases(); + if (aliases != null && !aliases.isEmpty()) { + for (Hash h : aliases) { + _context.clientManager().requestLeaseSet(h, ls); + } + } } } } 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 d311d46a9..61fbb1ddd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -97,7 +97,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { ctx.statManager().createRateStat("tunnel.testAborted", "Tunnel test could not occur, since there weren't any tunnels to test with", "Tunnels", RATES); } - + /** * Pick a random inbound exploratory tunnel. * Warning - selectInboundExploratoryTunnel(Hash) is preferred. @@ -113,7 +113,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return info; } - + /** * Pick a random inbound tunnel from the given destination's pool. * Warning - selectOutboundTunnel(Hash, Hash) is preferred. @@ -132,7 +132,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { " but there isn't a pool?"); return null; } - + /** * Pick a random outbound exploratory tunnel. * Warning - selectOutboundExploratoryTunnel(Hash) is preferred. @@ -148,7 +148,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return info; } - + /** * Pick a random outbound tunnel from the given destination's pool. * Warning - selectOutboundTunnel(Hash, Hash) is preferred. @@ -164,7 +164,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return null; } - + /** * Pick the inbound exploratory tunnel with the gateway closest to the given hash. * By using this instead of the random selectTunnel(), @@ -184,7 +184,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return info; } - + /** * Pick the inbound tunnel with the gateway closest to the given hash * from the given destination's pool. @@ -208,7 +208,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { " but there isn't a pool?"); return null; } - + /** * Pick the outbound exploratory tunnel with the endpoint closest to the given hash. * By using this instead of the random selectTunnel(), @@ -228,7 +228,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return info; } - + /** * Pick the outbound tunnel with the endpoint closest to the given hash * from the given destination's pool. @@ -249,7 +249,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { } return null; } - + /** * Expensive (iterates through all tunnels of all pools) and unnecessary. * @deprecated unused @@ -267,7 +267,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { if (info != null) return info; return null; } - + /** @return number of inbound exploratory tunnels */ public int getFreeTunnelCount() { return _inboundExploratory.size(); @@ -304,10 +304,11 @@ public class TunnelPoolManager implements TunnelManagerFacade { return pool.getTunnelCount(); return 0; } - + public int getParticipatingCount() { return _context.tunnelDispatcher().getParticipatingCount(); } + public long getLastParticipatingExpiration() { return _context.tunnelDispatcher().getLastParticipatingExpiration(); } - + /** * @return (number of part. tunnels) / (estimated total number of hops in our expl.+client tunnels) * 100 max. @@ -330,7 +331,6 @@ public class TunnelPoolManager implements TunnelManagerFacade { return Math.min(part / (double) count, 100d); } - public boolean isValidTunnel(Hash client, TunnelInfo tunnel) { if (tunnel.getExpiration() < _context.clock().now()) return false; @@ -386,17 +386,18 @@ public class TunnelPoolManager implements TunnelManagerFacade { pool.setSettings(settings); } } - + public synchronized void restart() { _handler.restart(); _executor.restart(); shutdownExploratory(); startup(); } - + /** * Used only at session startup. * Do not use to change settings. + * Do not use for aliased destinations; use addAlias(). */ public void buildTunnels(Destination client, ClientTunnelSettings settings) { Hash dest = client.calculateHash(); @@ -434,8 +435,68 @@ public class TunnelPoolManager implements TunnelManagerFacade { else outbound.startup(); } - - + + /** + * Add another destination to the same tunnels. + * Must have same encryption key an a different signing key. + * @throws IllegalArgumentException if not + * @return success + * @since 0.9.19 + */ + public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient) { + if (dest.getSigningPublicKey().equals(existingClient.getSigningPublicKey())) + throw new IllegalArgumentException("signing key must differ"); + if (!dest.getPublicKey().equals(existingClient.getPublicKey())) + throw new IllegalArgumentException("encryption key mismatch"); + Hash h = dest.calculateHash(); + Hash e = existingClient.calculateHash(); + synchronized(this) { + TunnelPool inbound = _clientInboundPools.get(e); + TunnelPool outbound = _clientOutboundPools.get(e); +/////// gah same tunnel pool or different? + if (inbound == null || outbound == null) + return false; + _clientInboundPools.put(h, inbound); + _clientOutboundPools.put(h, outbound); + } + return true; + } + + /** + * Remove a destination for the same tunnels as another. + * @since 0.9.19 + */ + public void removeAlias(Destination dest) { + Hash h = dest.calculateHash(); + synchronized(this) { + TunnelPool inbound = _clientInboundPools.remove(h); + if (inbound != null) { + Hash p = inbound.getSettings().getAliasOf(); + if (p != null) { + TunnelPool pri = _clientInboundPools.get(p); + if (pri != null) { + Set aliases = pri.getSettings().getAliases(); + if (aliases != null) + aliases.remove(h); + } + } + } + TunnelPool outbound = _clientOutboundPools.remove(h); + if (outbound != null) { + Hash p = inbound.getSettings().getAliasOf(); + if (p != null) { + TunnelPool pri = _clientInboundPools.get(p); + if (pri != null) { + Set aliases = pri.getSettings().getAliases(); + if (aliases != null) + aliases.remove(h); + } + } + } + // TODO if primary already vanished... + } + } + private static class DelayedStartup implements SimpleTimer.TimedEvent { private final TunnelPool pool; @@ -469,7 +530,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { if (outbound != null) outbound.shutdown(); } - + /** queue a recurring test job if appropriate */ void buildComplete(PooledTunnelCreatorConfig cfg) { if (cfg.getLength() > 1 && @@ -518,7 +579,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { _context.jobQueue().addJob(new BootstrapPool(_context, _inboundExploratory)); _context.jobQueue().addJob(new BootstrapPool(_context, _outboundExploratory)); } - + private static class BootstrapPool extends JobImpl { private TunnelPool _pool; public BootstrapPool(RouterContext ctx, TunnelPool pool) { @@ -531,7 +592,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { _pool.buildFallback(); } } - + /** * Cannot be restarted */ @@ -546,7 +607,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { _inboundExploratory.shutdown(); _outboundExploratory.shutdown(); } - + /** list of TunnelPool instances currently in play */ public void listPools(List out) { out.addAll(_clientInboundPools.values()); From 91e98ba447ecbaf12ec635c0ee7d5f5fb08ee7d8 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 18 Apr 2015 19:01:23 +0000 Subject: [PATCH 002/258] I2CP Multisession Work in progress: Fix NPE in requestLeaseSet() Fix setting new session ID in SessionStatusMessage Fix subsession support detection Streaming: one socket manager, multiple connection managers. Change data structure for subessions in socket manager Subsession cleanup on destroy I2PTunnel: add DSA subsession for non-DSA shared client Javadocs --- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 36 ++++++++++++++++++ .../streaming/impl/ConnectionManager.java | 3 +- .../streaming/impl/I2PSocketManagerFull.java | 37 +++++++++++++++---- .../src/net/i2p/client/I2PSessionImpl.java | 8 +++- .../router/client/ClientConnectionRunner.java | 27 +++++++++----- .../net/i2p/router/client/ClientManager.java | 16 ++++++-- .../client/ClientManagerFacadeImpl.java | 10 +++++ .../client/ClientMessageEventListener.java | 3 ++ .../i2p/router/client/LeaseRequestState.java | 3 ++ 9 files changed, 120 insertions(+), 23 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index a2c408973..5ca28ce36 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -31,6 +31,7 @@ import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManagerFactory; import net.i2p.client.streaming.I2PSocketOptions; +import net.i2p.crypto.SigType; import net.i2p.data.Destination; import net.i2p.util.EventDispatcher; import net.i2p.util.I2PAppThread; @@ -291,6 +292,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna socketManager.destroySocketManager(); // We could be here a LONG time, holding the lock socketManager = buildSocketManager(tunnel, pkf); + // FIXME may not be the right place for this + I2PSession sub = addSubsession(tunnel); + if (sub != null && _log.shouldLog(Log.WARN)) + _log.warn("Added subsession " + sub); } else { if (_log.shouldLog(Log.INFO)) _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Not building a new socket manager since the old one is open [s=" + s + "]"); @@ -303,10 +308,41 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna if (_log.shouldLog(Log.INFO)) _log.info(tunnel.getClientOptions().getProperty("inbound.nickname") + ": Building a new socket manager since there is no other one"); socketManager = buildSocketManager(tunnel, pkf); + I2PSession sub = addSubsession(tunnel); + if (sub != null && _log.shouldLog(Log.WARN)) + _log.warn("Added subsession " + sub); } return socketManager; } + /** + * Add a subsession to a shared client if necessary. + * + * @since 0.9.20 + */ + protected static synchronized I2PSession addSubsession(I2PTunnel tunnel) { + I2PSession sess = socketManager.getSession(); + if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1) + return null; + Properties props = new Properties(); + props.putAll(tunnel.getClientOptions()); + String name = props.getProperty("inbound.nickname"); + if (name != null) + props.setProperty("inbound.nickname", name + " (DSA)"); + name = props.getProperty("outbound.nickname"); + if (name != null) + props.setProperty("outbound.nickname", name + " (DSA)"); + // TODO set sig type in props? + try { + return socketManager.addSubsession(null, props); + } catch (I2PSessionException ise) { + Log log = tunnel.getContext().logManager().getLog(I2PTunnelClientBase.class); + if (log.shouldLog(Log.WARN)) + log.warn("Failed to add subssession", ise); + return null; + } + } + /** * Kill the shared client, so that on restart in android * we won't latch onto the old one diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index 950670efc..e298a9321 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -429,7 +429,8 @@ class ConnectionManager { // try { _connectionLock.wait(remaining); } catch (InterruptedException ie) {} try { Thread.sleep(remaining/4); } catch (InterruptedException ie) {} } else { - con = new Connection(_context, this, _schedulerChooser, _timer, _outboundQueue, _conPacketHandler, opts, false); + con = new Connection(_context, this, _schedulerChooser, _timer, + _outboundQueue, _conPacketHandler, opts, false); con.setRemotePeer(peer); assignReceiveStreamId(con); break; // stop looping as a psuedo-wait diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 26a7c6e7e..ff9be1351 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -11,7 +11,7 @@ import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -40,7 +40,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final I2PAppContext _context; private final Log _log; private final I2PSession _session; - private final List _subsessions; + private final ConcurrentHashMap _subsessions; private final I2PServerSocketFull _serverSocket; private StandardServerSocket _realServerSocket; private final ConnectionOptions _defaultOptions; @@ -84,7 +84,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { public I2PSocketManagerFull(I2PAppContext context, I2PSession session, Properties opts, String name) { _context = context; _session = session; - _subsessions = new CopyOnWriteArrayList(); + _subsessions = new ConcurrentHashMap(4); _log = _context.logManager().getLog(I2PSocketManagerFull.class); _name = name + " " + (__managerId.incrementAndGet()); @@ -125,7 +125,6 @@ public class I2PSocketManagerFull implements I2PSocketManager { return _session; } -//////////// gahhh we want a socket manager, not a session /** * @return a new subsession, non-null * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session @@ -135,7 +134,17 @@ public class I2PSocketManagerFull implements I2PSocketManager { */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { I2PSession rv = _session.addSubsession(privateKeyStream, opts); - _subsessions.add(rv); + ConnectionOptions defaultOptions = new ConnectionOptions(opts); + ConnectionManager connectionManager = new ConnectionManager(_context, rv, defaultOptions); + ConnectionManager old = _subsessions.putIfAbsent(rv, connectionManager); + if (old != null) { + // shouldn't happen + _session.removeSubsession(rv); + connectionManager.shutdown(); + throw new I2PSessionException("dup"); + } + if (_log.shouldLog(Log.WARN)) + _log.warn("Added subsession " + rv); return rv; } @@ -146,8 +155,15 @@ public class I2PSocketManagerFull implements I2PSocketManager { */ public void removeSubsession(I2PSession session) { _session.removeSubsession(session); - _subsessions.remove(session); - // ... + ConnectionManager cm = _subsessions.remove(session); + if (cm != null) { + cm.shutdown(); + if (_log.shouldLog(Log.WARN)) + _log.warn("Removeed subsession " + session); + } else { + if (_log.shouldLog(Log.WARN)) + _log.warn("Subsession not found to remove " + session); + } } /** @@ -335,6 +351,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { if (_log.shouldLog(Log.INFO)) _log.info("Connecting to " + peer.calculateHash().toBase64().substring(0,6) + " with options: " + opts); +// fixme pick the subsession here // the following blocks unless connect delay > 0 Connection con = _connectionManager.connect(peer, opts); if (con == null) @@ -419,6 +436,12 @@ public class I2PSocketManagerFull implements I2PSocketManager { } _connectionManager.setAllowIncomingConnections(false); _connectionManager.shutdown(); + if (!_subsessions.isEmpty()) { + for (I2PSession sess : _subsessions.keySet()) { + removeSubsession(sess); + } + } + // should we destroy the _session too? // yes, since the old lib did (and SAM wants it to, and i dont know why not) if ( (_session != null) && (!_session.isClosed()) ) { diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index e711f04c4..2a0f9ed4a 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -267,6 +267,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa } _routerSupportsFastReceive = _context.isRouterContext(); _routerSupportsHostLookup = _context.isRouterContext(); + _routerSupportsSubsessions = _context.isRouterContext(); } /** @@ -338,7 +339,10 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa if (id != null) _subsessionMap.remove(id); /// tell the subsession - ///.... + try { + // doesn't really throw + session.destroySession(); + } catch (I2PSessionException ise) {} } } @@ -893,7 +897,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa synchronized (_subsessionLock) { for (SubSession sess : _subsessions) { if (sess.getSessionId() == null) { - sub.messageReceived(reader, message); + sess.messageReceived(reader, message); id = sess.getSessionId(); if (id != null) { if (id.equals(_sessionId)) { diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index 79fa79b2c..3acdfdadc 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -723,13 +723,15 @@ class ClientConnectionRunner { * within the timeout specified, queue up the onFailedJob. This call does not * block. * + * @param h the Destination's hash * @param set LeaseSet with requested leases - this object must be updated to contain the * signed version (as well as any changed/added/removed Leases) + * The LeaseSet contains Leases and destination only, it is unsigned. * @param expirationTime ms to wait before failing * @param onCreateJob Job to run after the LeaseSet is authorized, null OK * @param onFailedJob Job to run after the timeout passes without receiving authorization, null OK */ - void requestLeaseSet(LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) { + void requestLeaseSet(Hash h, LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) { if (_dead) { if (_log.shouldLog(Log.WARN)) _log.warn("Requesting leaseSet from a dead client: " + set); @@ -737,6 +739,12 @@ class ClientConnectionRunner { _context.jobQueue().addJob(onFailedJob); return; } + SessionParams sp = _sessions.get(h); + if (sp == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Requesting leaseSet for an unknown sesssion"); + return; + } // We can't use LeaseSet.equals() here because the dest, keys, and sig on // the new LeaseSet are null. So we compare leases one by one. // In addition, the client rewrites the expiration time of all the leases to @@ -748,10 +756,9 @@ class ClientConnectionRunner { int leases = set.getLeaseCount(); // synch so _currentLeaseSet isn't changed out from under us LeaseSet current = null; + Destination dest = sp.dest; synchronized (this) { - Destination dest = set.getDestination(); - if (dest != null) - current = getLeaseSet(dest.calculateHash()); + current = sp.currentLeaseSet; if (current != null && current.getLeaseCount() == leases) { for (int i = 0; i < leases; i++) { if (! current.getLease(i).getTunnelId().equals(set.getLease(i).getTunnelId())) @@ -770,10 +777,6 @@ class ClientConnectionRunner { } if (_log.shouldLog(Log.INFO)) _log.info("Current leaseSet " + current + "\nNew leaseSet " + set); - Hash h = set.getDestination().calculateHash(); - SessionParams sp = _sessions.get(h); - if (sp == null) - return; LeaseRequestState state; synchronized (this) { state = sp.leaseRequest; @@ -788,12 +791,15 @@ class ClientConnectionRunner { // theirs is newer } else { // ours is newer, so wait a few secs and retry + set.setDestination(dest); _context.simpleTimer2().addEvent(new Rerequest(set, expirationTime, onCreateJob, onFailedJob), 3*1000); } // fire onCreated? return; // already requesting } else { - sp.leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, _context.clock().now() + expirationTime, set); + set.setDestination(dest); + sp.leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, + _context.clock().now() + expirationTime, set); if (_log.shouldLog(Log.DEBUG)) _log.debug("New request: " + state); } @@ -807,6 +813,7 @@ class ClientConnectionRunner { private final Job _onCreate; private final Job _onFailed; + /** @param ls dest must be set */ public Rerequest(LeaseSet ls, long expirationTime, Job onCreate, Job onFailed) { _ls = ls; _expirationTime = expirationTime; @@ -815,7 +822,7 @@ class ClientConnectionRunner { } public void timeReached() { - requestLeaseSet(_ls, _expirationTime, _onCreate, _onFailed); + requestLeaseSet(_ls.getDestination().calculateHash(), _ls, _expirationTime, _onCreate, _onFailed); } } diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 10bfdf7e4..6174973e4 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -392,7 +392,8 @@ class ClientManager { * * @param dest Destination from which the LeaseSet's authorization should be requested * @param set LeaseSet with requested leases - this object must be updated to contain the - * signed version (as well as any changed/added/removed Leases) + * signed version (as well as any changed/added/removed Leases). + * The LeaseSet contains Leases only; it is unsigned and does not have the destination set. * @param timeout ms to wait before failing * @param onCreateJob Job to run after the LeaseSet is authorized * @param onFailedJob Job to run after the timeout passes without receiving authorization @@ -405,15 +406,24 @@ class ClientManager { + dest.calculateHash().toBase64() + ". disconnected?"); _ctx.jobQueue().addJob(onFailedJob); } else { - runner.requestLeaseSet(set, timeout, onCreateJob, onFailedJob); + runner.requestLeaseSet(dest.calculateHash(), set, timeout, onCreateJob, onFailedJob); } } + /** + * Request that a particular client authorize the Leases contained in the + * LeaseSet. + * + * @param dest Destination from which the LeaseSet's authorization should be requested + * @param ls LeaseSet with requested leases - this object must be updated to contain the + * signed version (as well as any changed/added/removed Leases). + * The LeaseSet contains Leases only; it is unsigned and does not have the destination set. + */ public void requestLeaseSet(Hash dest, LeaseSet ls) { ClientConnectionRunner runner = getRunner(dest); if (runner != null) { // no need to fire off any jobs... - runner.requestLeaseSet(ls, REQUEST_LEASESET_TIMEOUT, null, null); + runner.requestLeaseSet(dest, ls, REQUEST_LEASESET_TIMEOUT, null, null); } } diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index d4e476ad7..cc82592d5 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -115,6 +115,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte * @param dest Destination from which the LeaseSet's authorization should be requested * @param set LeaseSet with requested leases - this object must be updated to contain the * signed version (as well as any changed/added/removed Leases) + * The LeaseSet contains Leases only; it is unsigned and does not have the destination set. * @param timeout ms to wait before failing * @param onCreateJob Job to run after the LeaseSet is authorized * @param onFailedJob Job to run after the timeout passes without receiving authorization @@ -126,6 +127,15 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte _log.error("Null manager on requestLeaseSet!"); } + /** + * Request that a particular client authorize the Leases contained in the + * LeaseSet. + * + * @param dest Destination from which the LeaseSet's authorization should be requested + * @param ls LeaseSet with requested leases - this object must be updated to contain the + * signed version (as well as any changed/added/removed Leases). + * The LeaseSet contains Leases only; it is unsigned and does not have the destination set. + */ public void requestLeaseSet(Hash dest, LeaseSet set) { if (_manager != null) _manager.requestLeaseSet(dest, set); diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index 320ce235d..e12205e83 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -251,6 +251,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi props.putAll(in.getOptions()); cfg.setOptions(props); boolean isPrimary = _runner.getSessionIds().isEmpty(); + // this sets the session id int status = _runner.sessionEstablished(cfg); if (status != SessionStatusMessage.STATUS_CREATED) { // For now, we do NOT send a SessionStatusMessage - see javadoc above @@ -266,6 +267,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi _runner.disconnectClient(msg); return; } + // get the new session ID + id = _runner.getSessionId(dest.calculateHash()); sendStatusMessage(id, status); if (_log.shouldLog(Log.INFO)) diff --git a/router/java/src/net/i2p/router/client/LeaseRequestState.java b/router/java/src/net/i2p/router/client/LeaseRequestState.java index 27072db6f..2fb6b9760 100644 --- a/router/java/src/net/i2p/router/client/LeaseRequestState.java +++ b/router/java/src/net/i2p/router/client/LeaseRequestState.java @@ -30,6 +30,9 @@ class LeaseRequestState { /** * @param expiration absolute time, when the request expires (not when the LS expires) + * @param requested LeaseSet with requested leases - this object must be updated to contain the + * signed version (as well as any changed/added/removed Leases) + * The LeaseSet contains Leases and destination only, it is unsigned. */ public LeaseRequestState(Job onGranted, Job onFailed, long expiration, LeaseSet requested) { _onGranted = onGranted; From ff5d29de1a9a503b72047a10b2f4206e8cc1d277 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 18 Apr 2015 19:50:14 +0000 Subject: [PATCH 003/258] I2CP Multisession - Work in progress: Fix NPE in addSubsession() by creating key stream Set sigtype for subsession --- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 3 +- .../streaming/impl/I2PSocketManagerFull.java | 50 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 5ca28ce36..e3005e953 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -25,6 +25,7 @@ import javax.net.ssl.SSLServerSocketFactory; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.client.streaming.I2PSocket; @@ -332,7 +333,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna name = props.getProperty("outbound.nickname"); if (name != null) props.setProperty("outbound.nickname", name + " (DSA)"); - // TODO set sig type in props? + props.setProperty(I2PClient.PROP_SIGTYPE, "DSA_SHA1"); try { return socketManager.addSubsession(null, props); } catch (I2PSessionException ise) { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index ff9be1351..20e3ff55c 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -1,5 +1,7 @@ package net.i2p.client.streaming.impl; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.ConnectException; @@ -17,13 +19,19 @@ import java.util.concurrent.atomic.AtomicInteger; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketOptions; +import net.i2p.crypto.SigType; +import net.i2p.data.Certificate; import net.i2p.data.Destination; +import net.i2p.data.PrivateKey; +import net.i2p.data.PublicKey; +import net.i2p.data.SimpleDataStructure; import net.i2p.util.Log; /** @@ -133,6 +141,27 @@ public class I2PSocketManagerFull implements I2PSocketManager { * @since 0.9.19 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { + if (privateKeyStream == null) { + ByteArrayOutputStream keyStream = new ByteArrayOutputStream(1024); + try { + SigType type = getSigType(opts); + if (type != SigType.DSA_SHA1) { + // hassle, have to set up the padding and cert, see I2PClientImpl + throw new I2PSessionException("type " + type + " unsupported"); + } + PublicKey pub = _session.getMyDestination().getPublicKey(); + PrivateKey priv = _session.getDecryptionKey(); + SimpleDataStructure[] keys = _context.keyGenerator().generateSigningKeys(type); + pub.writeBytes(keyStream); + keys[0].writeBytes(keyStream); // signing pub + Certificate.NULL_CERT.writeBytes(keyStream); + priv.writeBytes(keyStream); + keys[1].writeBytes(keyStream); // signing priv + } catch (Exception e) { + throw new I2PSessionException("Error creating keys", e); + } + privateKeyStream = new ByteArrayInputStream(keyStream.toByteArray()); + } I2PSession rv = _session.addSubsession(privateKeyStream, opts); ConnectionOptions defaultOptions = new ConnectionOptions(opts); ConnectionManager connectionManager = new ConnectionManager(_context, rv, defaultOptions); @@ -147,6 +176,27 @@ public class I2PSocketManagerFull implements I2PSocketManager { _log.warn("Added subsession " + rv); return rv; } + + /** + * @param opts may be null + * @since 0.9.20 copied from I2PSocketManagerFactory + */ + private SigType getSigType(Properties opts) { + if (opts != null) { + String st = opts.getProperty(I2PClient.PROP_SIGTYPE); + if (st != null) { + SigType rv = SigType.parseSigType(st); + if (rv != null && rv.isAvailable()) + return rv; + if (rv != null) + st = rv.toString(); + _log.logAlways(Log.WARN, "Unsupported sig type " + st + + ", reverting to " + I2PClient.DEFAULT_SIGTYPE); + // TODO throw instead? + } + } + return I2PClient.DEFAULT_SIGTYPE; + } /** * Remove the subsession From 57b641bf63f9cfcea08262ee671478629a277c89 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 18 Apr 2015 20:45:30 +0000 Subject: [PATCH 004/258] I2CP Multisession - Work in progress: Fix NPE in receiveMessage() --- .../router/client/ClientConnectionRunner.java | 22 +++++++++++++++++++ .../net/i2p/router/client/ClientManager.java | 5 ++++- .../i2p/router/client/MessageReceivedJob.java | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index 3acdfdadc..100fe8f76 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -698,6 +698,8 @@ class ClientConnectionRunner { * * Note that no failure indication is available. * Fails silently on e.g. queue overflow to client, client dead, etc. + * + * @param toDest non-null * @param fromDest generally null when from remote, non-null if from local */ void receiveMessage(Destination toDest, Destination fromDest, Payload payload) { @@ -708,6 +710,26 @@ class ClientConnectionRunner { j.runJob(); } + /** + * Asynchronously deliver the message to the current runner + * + * Note that no failure indication is available. + * Fails silently on e.g. queue overflow to client, client dead, etc. + * + * @param toHash non-null + * @param fromDest generally null when from remote, non-null if from local + * @since 0.9.20 + */ + void receiveMessage(Hash toHash, Destination fromDest, Payload payload) { + SessionParams sp = _sessions.get(toHash); + if (sp == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("No session found for receiveMessage()"); + return; + } + receiveMessage(sp.dest, fromDest, payload); + } + /** * Send async abuse message to the client * diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 6174973e4..f8fc2bb8e 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -627,7 +627,10 @@ class ClientManager { if (runner != null) { //_ctx.statManager().addRateData("client.receiveMessageSize", // _msg.getPayload().getSize(), 0); - runner.receiveMessage(dest, null, _msg.getPayload()); + if (dest != null) + runner.receiveMessage(dest, null, _msg.getPayload()); + else + runner.receiveMessage(_msg.getDestinationHash(), null, _msg.getPayload()); } else { // no client connection... // we should pool these somewhere... diff --git a/router/java/src/net/i2p/router/client/MessageReceivedJob.java b/router/java/src/net/i2p/router/client/MessageReceivedJob.java index 7ce5f5cba..3614d1693 100644 --- a/router/java/src/net/i2p/router/client/MessageReceivedJob.java +++ b/router/java/src/net/i2p/router/client/MessageReceivedJob.java @@ -32,7 +32,7 @@ class MessageReceivedJob extends JobImpl { private final boolean _sendDirect; /** - * @param toDest requred to pick session + * @param toDest non-null, required to pick session * @param fromDest ignored, generally null */ public MessageReceivedJob(RouterContext ctx, ClientConnectionRunner runner, Destination toDest, From be8f7f9676c0f77fbab6fed9505ef733e7ead128 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 01:32:30 +0000 Subject: [PATCH 005/258] I2CP Multisession - Work in progress: Fix sending CreateSessionMessage for subsession New AliasedTunnelPool for subsessions, don't reuse TunnelPool, so it has its own settings Fix addAlias() Simplify refreshSettings() Send status message on subsession create failure Fix settings for subsession --- .../src/net/i2p/client/I2PSessionImpl.java | 2 + core/java/src/net/i2p/client/SubSession.java | 3 +- .../client/ClientMessageEventListener.java | 26 ++-- .../router/tunnel/pool/AliasedTunnelPool.java | 141 ++++++++++++++++++ .../i2p/router/tunnel/pool/TunnelPool.java | 34 ++--- .../router/tunnel/pool/TunnelPoolManager.java | 33 +++- 6 files changed, 206 insertions(+), 33 deletions(-) create mode 100644 router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 2a0f9ed4a..6990f2a51 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -647,6 +647,8 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa // now send CreateSessionMessages for all subsessions, one at a time, must wait for each response synchronized(_subsessionLock) { for (SubSession ss : _subsessions) { + if (_log.shouldLog(Log.INFO)) + _log.info(getPrefix() + "Connecting subsession " + ss); _producer.connect(ss); } } diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index 1e75fa409..9dcf04e72 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -114,7 +114,8 @@ class SubSession extends I2PSessionMuxedImpl { */ @Override public boolean isClosed() { - return getSessionId() == null || _primary.isClosed(); + // FIXME + return /* getSessionId() == null || */ _primary.isClosed(); } /** diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index e12205e83..ead5dcd26 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -248,9 +248,18 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionConfig cfg = new SessionConfig(dest); cfg.setSignature(in.getSignature()); Properties props = new Properties(); - props.putAll(in.getOptions()); - cfg.setOptions(props); boolean isPrimary = _runner.getSessionIds().isEmpty(); + if (!isPrimary) { + // all the primary options, then the overrides from the alias + SessionConfig pcfg = _runner.getPrimaryConfig(); + if (pcfg != null) { + props.putAll(pcfg.getOptions()); + } else { + _log.error("no primary config?"); + } + } + props.putAll(inProps); + cfg.setOptions(props); // this sets the session id int status = _runner.sessionEstablished(cfg); if (status != SessionStatusMessage.STATUS_CREATED) { @@ -269,28 +278,27 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi } // get the new session ID id = _runner.getSessionId(dest.calculateHash()); - sendStatusMessage(id, status); if (_log.shouldLog(Log.INFO)) _log.info("Session " + id + " established for " + dest.calculateHash()); if (isPrimary) { + sendStatusMessage(id, status); startCreateSessionJob(cfg); } else { SessionConfig pcfg = _runner.getPrimaryConfig(); if (pcfg != null) { - /////////// - // new tunnel name etc. ClientTunnelSettings settings = new ClientTunnelSettings(dest.calculateHash()); - // all the primary options, then the overrides from the alias - props.putAll(pcfg.getOptions()); - props.putAll(props); settings.readFromProperties(props); boolean ok = _context.tunnelManager().addAlias(dest, settings, pcfg.getDestination()); if (!ok) { _log.error("Add alias failed"); - // send status message... + status = SessionStatusMessage.STATUS_REFUSED; } + } else { + _log.error("no primary config?"); + status = SessionStatusMessage.STATUS_INVALID; } + sendStatusMessage(id, status); } } diff --git a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java new file mode 100644 index 000000000..05132c9ad --- /dev/null +++ b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java @@ -0,0 +1,141 @@ +package net.i2p.router.tunnel.pool; + +import java.util.List; + +import net.i2p.data.Hash; +import net.i2p.data.LeaseSet; +import net.i2p.data.TunnelId; +import net.i2p.router.RouterContext; +import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelPoolSettings; +import net.i2p.util.Log; + +/** + * A tunnel pool with its own settings and Destination, + * but uses another pool for its tunnels. + * + * @since 0.9.20 + */ +public class AliasedTunnelPool extends TunnelPool { + + private final TunnelPool _aliasOf; + + AliasedTunnelPool(RouterContext ctx, TunnelPoolManager mgr, TunnelPoolSettings settings, TunnelPool aliasOf) { + super(ctx, mgr, settings, null); + if (settings.isExploratory()) + throw new IllegalArgumentException(); + if (settings.getAliasOf() == null) + throw new IllegalArgumentException(); + _aliasOf = aliasOf; + } + + @Override + synchronized void startup() { + if (_log.shouldLog(Log.INFO)) + _log.info(toString() + ": Startup() called, was already alive? " + _alive, new Exception()); + _alive = true; + } + + @Override + synchronized void shutdown() { + if (_log.shouldLog(Log.WARN)) + _log.warn(toString() + ": Shutdown called"); + _alive = false; + } + + @Override + TunnelInfo selectTunnel() { + return _aliasOf.selectTunnel(); + } + + @Override + TunnelInfo selectTunnel(Hash closestTo) { + return _aliasOf.selectTunnel(closestTo); + } + + @Override + public TunnelInfo getTunnel(TunnelId gatewayId) { + return _aliasOf.getTunnel(gatewayId); + } + + @Override + public List listTunnels() { + return _aliasOf.listTunnels(); + } + + @Override + boolean needFallback() { + return false; + } + + @Override + public List listPending() { + return _aliasOf.listPending(); + } + + @Override + public boolean isAlive() { + return _alive && _aliasOf.isAlive(); + } + + @Override + public int size() { + return _aliasOf.size(); + } + + @Override + void addTunnel(TunnelInfo info) { + _aliasOf.addTunnel(info); + } + + @Override + void removeTunnel(TunnelInfo info) { + _aliasOf.removeTunnel(info); + } + + @Override + void tunnelFailed(TunnelInfo cfg) { + _aliasOf.tunnelFailed(cfg); + } + + @Override + void tunnelFailed(TunnelInfo cfg, Hash blamePeer) { + _aliasOf.tunnelFailed(cfg, blamePeer); + } + + @Override + void refreshLeaseSet() {} + + @Override + boolean buildFallback() { + return _aliasOf.buildFallback(); + } + + @Override + protected LeaseSet locked_buildNewLeaseSet() { + return _context.netDb().lookupLeaseSetLocally(_aliasOf.getSettings().getDestination()); + } + + @Override + public long getLifetimeProcessed() { + return _aliasOf.getLifetimeProcessed(); + } + + @Override + int countHowManyToBuild() { + return 0; + } + + @Override + PooledTunnelCreatorConfig configureNewTunnel() { + return null; + } + + @Override + void buildComplete(PooledTunnelCreatorConfig cfg) {} + + @Override + public String toString() { + return "Aliased " + super.toString(); + } +} diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index e30a0fadd..b69caa789 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -31,13 +31,13 @@ import net.i2p.util.Log; */ public class TunnelPool { private final List _inProgress = new ArrayList(); - private final RouterContext _context; - private final Log _log; + protected final RouterContext _context; + protected final Log _log; private TunnelPoolSettings _settings; private final List _tunnels; private final TunnelPeerSelector _peerSelector; private final TunnelPoolManager _manager; - private volatile boolean _alive; + protected volatile boolean _alive; private long _lifetimeProcessed; private TunnelInfo _lastSelected; private long _lastSelectionPeriod; @@ -119,19 +119,15 @@ public class TunnelPool { } } - void refreshSettings() { - if (!_settings.isExploratory()) { + private void refreshSettings() { + if (!_settings.isExploratory()) return; // don't override client specified settings - } else { - if (_settings.isExploratory()) { - Properties props = new Properties(); - props.putAll(_context.router().getConfigMap()); - if (_settings.isInbound()) - _settings.readFromProperties(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY, props); - else - _settings.readFromProperties(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY, props); - } - } + Properties props = new Properties(); + props.putAll(_context.router().getConfigMap()); + if (_settings.isInbound()) + _settings.readFromProperties(TunnelPoolSettings.PREFIX_INBOUND_EXPLORATORY, props); + else + _settings.readFromProperties(TunnelPoolSettings.PREFIX_OUTBOUND_EXPLORATORY, props); } /** @@ -413,11 +409,15 @@ public class TunnelPool { public List listPending() { synchronized (_inProgress) { return new ArrayList(_inProgress); } } /** duplicate of size(), let's pick one */ - int getTunnelCount() { synchronized (_tunnels) { return _tunnels.size(); } } + int getTunnelCount() { return size(); } public TunnelPoolSettings getSettings() { return _settings; } void setSettings(TunnelPoolSettings settings) { + if (settings != null && _settings != null) { + settings.getAliases().addAll(_settings.getAliases()); + settings.setAliasOf(_settings.getAliasOf()); + } _settings = settings; if (_settings != null) { if (_log.shouldLog(Log.INFO)) @@ -717,7 +717,7 @@ public class TunnelPool { * * @return null on failure */ - private LeaseSet locked_buildNewLeaseSet() { + protected LeaseSet locked_buildNewLeaseSet() { if (!_alive) return null; 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 6cba6ef4b..f318b479d 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -451,14 +451,35 @@ public class TunnelPoolManager implements TunnelManagerFacade { Hash h = dest.calculateHash(); Hash e = existingClient.calculateHash(); synchronized(this) { - TunnelPool inbound = _clientInboundPools.get(e); - TunnelPool outbound = _clientOutboundPools.get(e); -/////// gah same tunnel pool or different? - if (inbound == null || outbound == null) + TunnelPool inbound = _clientInboundPools.get(h); + TunnelPool outbound = _clientOutboundPools.get(h); + if (inbound != null || outbound != null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("already have alias " + dest); return false; + } + TunnelPool eInbound = _clientInboundPools.get(e); + TunnelPool eOutbound = _clientOutboundPools.get(e); + if (eInbound == null || eOutbound == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("primary not found " + existingClient); + return false; + } + eInbound.getSettings().getAliases().add(h); + eOutbound.getSettings().getAliases().add(h); + TunnelPoolSettings newIn = settings.getInboundSettings(); + TunnelPoolSettings newOut = settings.getOutboundSettings(); + newIn.setAliasOf(e); + newOut.setAliasOf(e); + inbound = new AliasedTunnelPool(_context, this, newIn, eInbound); + outbound = new AliasedTunnelPool(_context, this, newOut, eOutbound); _clientInboundPools.put(h, inbound); _clientOutboundPools.put(h, outbound); + inbound.startup(); + outbound.startup(); } + if (_log.shouldLog(Log.WARN)) + _log.warn("Added " + h + " as alias for " + e + " with settings " + settings); return true; } @@ -483,9 +504,9 @@ public class TunnelPoolManager implements TunnelManagerFacade { } TunnelPool outbound = _clientOutboundPools.remove(h); if (outbound != null) { - Hash p = inbound.getSettings().getAliasOf(); + Hash p = outbound.getSettings().getAliasOf(); if (p != null) { - TunnelPool pri = _clientInboundPools.get(p); + TunnelPool pri = _clientOutboundPools.get(p); if (pri != null) { Set aliases = pri.getSettings().getAliases(); if (aliases != null) From d8baf62966dedfcaf23aa3ad6269842a34cec37f Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 03:11:37 +0000 Subject: [PATCH 006/258] I2CP Multisession - Work in progress: Stub out hardcoded list of DSA-only destinations Tweak client name length in summary bar Force initial leaseset request for subsession Send SessionStatus msg before LS request for subsession --- .../src/net/i2p/router/web/SummaryHelper.java | 4 +-- .../streaming/impl/I2PSocketManagerFull.java | 36 +++++++++++++++++-- .../net/i2p/router/client/ClientManager.java | 6 +++- .../client/ClientMessageEventListener.java | 7 ++-- .../router/tunnel/pool/AliasedTunnelPool.java | 1 + .../i2p/router/tunnel/pool/TunnelPool.java | 2 +- 6 files changed, 48 insertions(+), 8 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 e97dd3480..a458b60ee 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -435,10 +435,10 @@ public class SummaryHelper extends HelperBase { buf.append("client.png\" alt=\"Client\" title=\"").append(_("Client")).append("\">"); buf.append(""); - if (name.length() < 18) + if (name.length() <= 20) buf.append(DataHelper.escapeHTML(name)); else - buf.append(DataHelper.escapeHTML(name.substring(0,15))).append("…"); + buf.append(DataHelper.escapeHTML(name.substring(0,18))).append("…"); buf.append("\n"); LeaseSet ls = _context.netDb().lookupLeaseSetLocally(h); if (ls != null && _context.tunnelManager().getOutboundClientTunnelCount(h) > 0) { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 20e3ff55c..a501a8d22 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -11,6 +11,7 @@ import java.net.Socket; import java.net.SocketTimeoutException; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -29,9 +30,11 @@ import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.crypto.SigType; import net.i2p.data.Certificate; import net.i2p.data.Destination; +import net.i2p.data.Hash; import net.i2p.data.PrivateKey; import net.i2p.data.PublicKey; import net.i2p.data.SimpleDataStructure; +import net.i2p.util.ConvertToHash; import net.i2p.util.Log; /** @@ -57,7 +60,23 @@ public class I2PSocketManagerFull implements I2PSocketManager { private static final AtomicInteger __managerId = new AtomicInteger(); private final ConnectionManager _connectionManager; private final AtomicBoolean _isDestroyed = new AtomicBoolean(); + + private static final Set _dsaOnly = new HashSet(16); + private static final String[] DSA_ONLY_HASHES = { + "3t5Ar2NCTIOId70uzX2bZyJljR0aBogxMEzNyHirB7A=" // forum.i2p + }; + static { + for (int i = 0; i < DSA_ONLY_HASHES.length; i++) { + String s = DSA_ONLY_HASHES[i]; + Hash h = ConvertToHash.getHash(s); + if (h != null) + _dsaOnly.add(h); + else + System.out.println("Bad hash " + s); + } + } + /** * How long to wait for the client app to accept() before sending back CLOSE? * This includes the time waiting in the queue. Currently set to 5 seconds. @@ -401,9 +420,22 @@ public class I2PSocketManagerFull implements I2PSocketManager { if (_log.shouldLog(Log.INFO)) _log.info("Connecting to " + peer.calculateHash().toBase64().substring(0,6) + " with options: " + opts); -// fixme pick the subsession here + // pick the subsession here + ConnectionManager cm = _connectionManager; + if (!_subsessions.isEmpty()) { + Hash h = peer.calculateHash(); + if (_dsaOnly.contains(h)) { + // FIXME just taking the first one for now + for (Map.Entry e : _subsessions.entrySet()) { + if (e.getKey().getMyDestination().getSigType() == SigType.DSA_SHA1) { + cm = e.getValue(); + break; + } + } + } + } // the following blocks unless connect delay > 0 - Connection con = _connectionManager.connect(peer, opts); + Connection con = cm.connect(peer, opts); if (con == null) throw new TooManyStreamsException("Too many streams, max " + _defaultOptions.getMaxConns()); I2PSocketFull socket = new I2PSocketFull(con,_context); diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index f8fc2bb8e..5004baedd 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -401,7 +401,7 @@ class ClientManager { public void requestLeaseSet(Destination dest, LeaseSet set, long timeout, Job onCreateJob, Job onFailedJob) { ClientConnectionRunner runner = getRunner(dest); if (runner == null) { - if (_log.shouldLog(Log.ERROR)) + if (_log.shouldLog(Log.WARN)) _log.warn("Cannot request the lease set, as we can't find a client runner for " + dest.calculateHash().toBase64() + ". disconnected?"); _ctx.jobQueue().addJob(onFailedJob); @@ -424,6 +424,10 @@ class ClientManager { if (runner != null) { // no need to fire off any jobs... runner.requestLeaseSet(dest, ls, REQUEST_LEASESET_TIMEOUT, null, null); + } else { + if (_log.shouldLog(Log.WARN)) + _log.warn("Cannot request the lease set, as we can't find a client runner for " + + dest + ". disconnected?"); } } diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index ead5dcd26..628d8b0a5 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -289,16 +289,19 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi if (pcfg != null) { ClientTunnelSettings settings = new ClientTunnelSettings(dest.calculateHash()); settings.readFromProperties(props); + // addAlias() sends the create lease set msg, so we have to send the SMS first + sendStatusMessage(id, status); boolean ok = _context.tunnelManager().addAlias(dest, settings, pcfg.getDestination()); if (!ok) { _log.error("Add alias failed"); - status = SessionStatusMessage.STATUS_REFUSED; + // FIXME cleanup } } else { _log.error("no primary config?"); status = SessionStatusMessage.STATUS_INVALID; + sendStatusMessage(id, status); + // FIXME cleanup } - sendStatusMessage(id, status); } } diff --git a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java index 05132c9ad..d4d6ccc23 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java @@ -34,6 +34,7 @@ public class AliasedTunnelPool extends TunnelPool { if (_log.shouldLog(Log.INFO)) _log.info(toString() + ": Startup() called, was already alive? " + _alive, new Exception()); _alive = true; + super.refreshLeaseSet(); } @Override diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index b69caa789..ef6403a5b 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -607,7 +607,7 @@ public class TunnelPool { if (_settings.isInbound() && !_settings.isExploratory()) { if (_log.shouldLog(Log.DEBUG)) _log.debug(toString() + ": refreshing leaseSet on tunnel expiration (but prior to grace timeout)"); - LeaseSet ls = null; + LeaseSet ls; synchronized (_tunnels) { ls = locked_buildNewLeaseSet(); } From f0fdb35ba6874abed4bcda01596503102f37c16e Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 03:35:40 +0000 Subject: [PATCH 007/258] I2CP Multisession - Work in progress: Fix creating subsession LS from primary LS --- .../router/tunnel/pool/AliasedTunnelPool.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java index d4d6ccc23..03b8f0563 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java @@ -3,6 +3,7 @@ package net.i2p.router.tunnel.pool; import java.util.List; import net.i2p.data.Hash; +import net.i2p.data.Lease; import net.i2p.data.LeaseSet; import net.i2p.data.TunnelId; import net.i2p.router.RouterContext; @@ -114,7 +115,20 @@ public class AliasedTunnelPool extends TunnelPool { @Override protected LeaseSet locked_buildNewLeaseSet() { - return _context.netDb().lookupLeaseSetLocally(_aliasOf.getSettings().getDestination()); + LeaseSet ls = _context.netDb().lookupLeaseSetLocally(_aliasOf.getSettings().getDestination()); + if (ls == null) + return null; + // copy everything so it isn't corrupted + LeaseSet rv = new LeaseSet(); + for (int i = 0; i < ls.getLeaseCount(); i++) { + Lease old = ls.getLease(i); + Lease lease = new Lease(); + lease.setEndDate(old.getEndDate()); + lease.setTunnelId(old.getTunnelId()); + lease.setGateway(old.getGateway()); + rv.addLease(lease); + } + return rv; } @Override From 32049d7bfc0f9882600f2019878615485db796cc Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 14:49:13 +0000 Subject: [PATCH 008/258] I2CP Multisession - Work in progress: Reuse LS encryption keypair from primary LS Log tweaks --- .../streaming/impl/I2PSocketManagerFull.java | 3 + .../net/i2p/client/streaming/impl/Packet.java | 2 +- .../client/RequestLeaseSetMessageHandler.java | 59 +++++++++++++++---- .../i2p/data/i2cp/MessageStatusMessage.java | 6 ++ 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index a501a8d22..ff3a09514 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -161,6 +161,9 @@ public class I2PSocketManagerFull implements I2PSocketManager { */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { if (privateKeyStream == null) { + // We don't actually need the same pubkey in the dest, just in the LS. + // The dest one is unused. But this is how we find the LS keys + // to reuse in RequestLeaseSetMessageHandler. ByteArrayOutputStream keyStream = new ByteArrayOutputStream(1024); try { SigType type = getSigType(opts); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java index 032f8117a..9722748a8 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java @@ -806,7 +806,7 @@ class Packet { if (isFlagSet(FLAG_MAX_PACKET_SIZE_INCLUDED)) buf.append(" MS ").append(_optionMaxSize); if (isFlagSet(FLAG_PROFILE_INTERACTIVE)) buf.append(" INTERACTIVE"); if (isFlagSet(FLAG_RESET)) buf.append(" RESET"); - if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) buf.append(" SIG"); + if (isFlagSet(FLAG_SIGNATURE_INCLUDED)) buf.append(" SIG ").append(_optionSignature.length()); if (isFlagSet(FLAG_SIGNATURE_REQUESTED)) buf.append(" SIGREQ"); if (isFlagSet(FLAG_SYNCHRONIZE)) buf.append(" SYN"); } diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java index e6e9965a8..e6729a2e4 100644 --- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java @@ -88,9 +88,8 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { String sspk = session.getOptions().getProperty("i2cp.leaseSetSigningPrivateKey"); PrivateKey privKey = null; SigningPrivateKey signingPrivKey = null; - boolean useOldKeys; if (spk != null && sspk != null) { - useOldKeys = true; + boolean useOldKeys = true; int colon = sspk.indexOf(':'); SigType type = dest.getSigType(); if (colon > 0) { @@ -111,6 +110,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { signingPrivKey.fromBase64(sspk); } catch (DataFormatException iae) { useOldKeys = false; + signingPrivKey = null; } } if (useOldKeys) { @@ -118,20 +118,36 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { privKey = new PrivateKey(); privKey.fromBase64(spk); } catch (DataFormatException iae) { - useOldKeys = false; + privKey = null; } } - } else { - useOldKeys = false; } - if (useOldKeys) - li = new LeaseInfo(privKey, signingPrivKey); - else + if (privKey == null && !_existingLeaseSets.isEmpty()) { + // look for keypair from another dest using same pubkey + PublicKey pk = dest.getPublicKey(); + for (Map.Entry e : _existingLeaseSets.entrySet()) { + if (pk.equals(e.getKey().getPublicKey())) { + privKey = e.getValue().getPrivateKey(); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Creating new leaseInfo keys for " + dest + " with private key from " + e.getKey()); + break; + } + } + } + if (privKey != null) { + if (signingPrivKey != null) { + li = new LeaseInfo(privKey, signingPrivKey); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Creating new leaseInfo keys for " + dest + " WITH configured private keys"); + } else { + li = new LeaseInfo(privKey, dest); + } + } else { li = new LeaseInfo(dest); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Creating new leaseInfo keys for " + dest + " without configured private keys"); + } _existingLeaseSets.put(dest, li); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Creating new leaseInfo keys for " - + dest + " using configured private keys? " + useOldKeys); } else { if (_log.shouldLog(Log.DEBUG)) _log.debug("Caching the old leaseInfo keys for " @@ -178,6 +194,9 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { private final SigningPublicKey _signingPubKey; private final SigningPrivateKey _signingPrivKey; + /** + * New keys + */ public LeaseInfo(Destination dest) { SimpleDataStructure encKeys[] = KeyGenerator.getInstance().generatePKIKeys(); // must be same type as the Destination's signing key @@ -194,6 +213,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { } /** + * Existing keys * @since 0.9.18 */ public LeaseInfo(PrivateKey privKey, SigningPrivateKey signingPrivKey) { @@ -203,6 +223,23 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { _signingPrivKey = signingPrivKey; } + /** + * Existing crypto key, new signing key + * @since 0.9.20 + */ + public LeaseInfo(PrivateKey privKey, Destination dest) { + SimpleDataStructure signKeys[]; + try { + signKeys = KeyGenerator.getInstance().generateSigningKeys(dest.getSigningPublicKey().getType()); + } catch (GeneralSecurityException gse) { + throw new IllegalStateException(gse); + } + _pubKey = KeyGenerator.getPublicKey(privKey); + _privKey = privKey; + _signingPubKey = (SigningPublicKey) signKeys[0]; + _signingPrivKey = (SigningPrivateKey) signKeys[1]; + } + public PublicKey getPublicKey() { return _pubKey; } diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 5b77ffc4c..3ef99808d 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -285,6 +285,12 @@ public class MessageStatusMessage extends I2CPMessageImpl { return "GUARANTEED SUCCESS "; case STATUS_SEND_SUCCESS_LOCAL: return "LOCAL SUCCESS "; + case STATUS_SEND_BEST_EFFORT_FAILURE: + return "PROBABLE FAILURE "; + case STATUS_SEND_FAILURE_NO_TUNNELS: + return "NO LOCAL TUNNELS "; + case STATUS_SEND_FAILURE_NO_LEASESET: + return "LEASESET NOT FOUND "; default: return "SEND FAILURE CODE: " + status; } From b8c8d5b447b97991b68f89ece807305fce52b182 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 15:49:02 +0000 Subject: [PATCH 009/258] I2CP Multisession - Work in progress: Accept subclient data message down client's tunnel in IMD --- .../tunnel/InboundMessageDistributor.java | 37 ++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 62c1e6ed6..d5a90ee68 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -18,6 +18,7 @@ import net.i2p.data.i2np.VariableTunnelBuildReplyMessage; import net.i2p.router.ClientMessage; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; +import net.i2p.router.TunnelPoolSettings; import net.i2p.router.message.GarlicMessageReceiver; import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.util.Log; @@ -204,11 +205,11 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { * */ public void handleClove(DeliveryInstructions instructions, I2NPMessage data) { + int type = data.getType(); switch (instructions.getDeliveryMode()) { case DeliveryInstructions.DELIVERY_MODE_LOCAL: if (_log.shouldLog(Log.DEBUG)) _log.debug("local delivery instructions for clove: " + data.getClass().getSimpleName()); - int type = data.getType(); if (type == GarlicMessage.MESSAGE_TYPE) { _receiver.receive((GarlicMessage)data); } else if (type == DatabaseStoreMessage.MESSAGE_TYPE) { @@ -296,28 +297,45 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { _context.inNetMessagePool().add(data, null, null); } return; + case DeliveryInstructions.DELIVERY_MODE_DESTINATION: + Hash to = instructions.getDestination(); // Can we route UnknownI2NPMessages to a destination too? - if (!(data instanceof DataMessage)) { + if (type != DataMessage.MESSAGE_TYPE) { if (_log.shouldLog(Log.ERROR)) _log.error("cant send a " + data.getClass().getSimpleName() + " to a destination"); - } else if ( (_client != null) && (_client.equals(instructions.getDestination())) ) { + } else if (_client != null && _client.equals(to)) { if (_log.shouldLog(Log.DEBUG)) - _log.debug("data message came down a tunnel for " - + _client); + _log.debug("data message came down a tunnel for " + _client); DataMessage dm = (DataMessage)data; Payload payload = new Payload(); payload.setEncryptedData(dm.getData()); ClientMessage m = new ClientMessage(_client, payload); _context.clientManager().messageReceived(m); + } else if (_client != null) { + // Shared tunnel? + TunnelPoolSettings tgt = _context.tunnelManager().getInboundSettings(to); + if (tgt != null && _client.equals(tgt.getAliasOf())) { + // same as above, just different log + if (_log.shouldLog(Log.DEBUG)) + _log.debug("data message came down a tunnel for " + + _client + " targeting shared " + to); + DataMessage dm = (DataMessage)data; + Payload payload = new Payload(); + payload.setEncryptedData(dm.getData()); + ClientMessage m = new ClientMessage(to, payload); + _context.clientManager().messageReceived(m); + } else { + if (_log.shouldLog(Log.ERROR)) + _log.error("Data message came down a tunnel for " + + _client + " but targetted " + to); + } } else { if (_log.shouldLog(Log.ERROR)) - _log.error("this data message came down a tunnel for " - + (_client == null ? "no one" : _client) - + " but targetted " - + instructions.getDestination()); + _log.error("Data message came down an exploratory tunnel targeting " + to); } return; + case DeliveryInstructions.DELIVERY_MODE_ROUTER: // fall through case DeliveryInstructions.DELIVERY_MODE_TUNNEL: if (_log.shouldLog(Log.INFO)) @@ -325,6 +343,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { + ", treat recursively to prevent leakage"); distribute(data, instructions.getRouter(), instructions.getTunnelId()); return; + default: if (_log.shouldLog(Log.ERROR)) _log.error("Unknown instruction " + instructions.getDeliveryMode() + ": " + instructions); From b2872e6110b91c5aaee7631b04df1358a1ad84d2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 19:05:53 +0000 Subject: [PATCH 010/258] I2CP Multisession - Work in progress: Start availability notifier in subsession Availability notifier cleanup Various log tweaks added while chasing this down Better subsession state management I2PSocketManagerFull verifies subsession to force connect() Successfully tested --- .../streaming/impl/ConnectionManager.java | 8 ++++++ .../streaming/impl/I2PSocketManagerFull.java | 11 +++++--- .../client/streaming/impl/MessageHandler.java | 14 +++++++++-- .../streaming/impl/MessageInputStream.java | 21 ++++++++++++++++ .../i2p/client/I2PSessionDemultiplexer.java | 8 ++++-- .../src/net/i2p/client/I2PSessionImpl.java | 2 +- .../net/i2p/client/I2PSessionMuxedImpl.java | 23 +++++++++++------ .../client/MessagePayloadMessageHandler.java | 2 +- core/java/src/net/i2p/client/SubSession.java | 25 +++++++++++++++++-- 9 files changed, 95 insertions(+), 19 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index e298a9321..3c9808945 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -891,4 +891,12 @@ class ConnectionManager { if (req != null) req.pong(payload); } + + /** + * @since 0.9.20 + */ + @Override + public String toString() { + return "ConnectionManager for " + _session; + } } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index ff3a09514..8122ab50c 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -388,11 +388,16 @@ public class I2PSocketManagerFull implements I2PSocketManager { } private void verifySession() throws I2PException { + verifySession(_connectionManager); + } + + /** @since 0.9.20 */ + private void verifySession(ConnectionManager cm) throws I2PException { if (_isDestroyed.get()) throw new I2PException("Session was closed"); - if (!_connectionManager.getSession().isClosed()) + if (!cm.getSession().isClosed()) return; - _connectionManager.getSession().connect(); + cm.getSession().connect(); } /** @@ -411,7 +416,6 @@ public class I2PSocketManagerFull implements I2PSocketManager { */ public I2PSocket connect(Destination peer, I2PSocketOptions options) throws I2PException, NoRouteToHostException { - verifySession(); if (options == null) options = _defaultOptions; ConnectionOptions opts = null; @@ -437,6 +441,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { } } } + verifySession(cm); // the following blocks unless connect delay > 0 Connection con = cm.connect(peer, opts); if (con == null) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java index 9da5568c4..9577e0e5b 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java @@ -50,7 +50,7 @@ class MessageHandler implements I2PSessionMuxedListener { * @param size size of the message */ public void messageAvailable(I2PSession session, int msgId, long size, int proto, int fromPort, int toPort) { - byte data[] = null; + byte data[]; try { data = session.receiveMessage(msgId); } catch (I2PSessionException ise) { @@ -59,7 +59,17 @@ class MessageHandler implements I2PSessionMuxedListener { _log.warn("Error receiving the message", ise); return; } - if (data == null) return; + if (data == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Received null data on " + session + " proto: " + proto + + " fromPort: " + fromPort + " toPort: " + toPort); + return; + } + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Received " + data.length + " bytes on " + session + + " (" + _manager + ')' + + " proto: " + proto + + " fromPort: " + fromPort + " toPort: " + toPort); Packet packet = new Packet(); try { packet.readPacket(data, 0, data.length); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java index b8ea9a0a2..402db0159 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java @@ -498,6 +498,27 @@ class MessageInputStream extends InputStream { @Override public void close() { synchronized (_dataLock) { + if (_log.shouldLog(Log.DEBUG)) { + StringBuilder buf = new StringBuilder(128); + buf.append("close(), ready bytes: "); + long available = 0; + for (int i = 0; i < _readyDataBlocks.size(); i++) + available += _readyDataBlocks.get(i).getValid(); + available -= _readyDataBlockIndex; + buf.append(available); + buf.append(" blocks: ").append(_readyDataBlocks.size()); + buf.append(" not ready blocks: "); + long notAvailable = 0; + for (Long id : _notYetReadyBlocks.keySet()) { + ByteArray ba = _notYetReadyBlocks.get(id); + buf.append(id).append(" "); + if (ba != null) + notAvailable += ba.getValid(); + } + buf.append("not ready bytes: ").append(notAvailable); + buf.append(" highest ready block: ").append(_highestReadyBlockId); + _log.debug(buf.toString()); + } //while (_readyDataBlocks.size() > 0) // _cache.release((ByteArray)_readyDataBlocks.remove(0)); _readyDataBlocks.clear(); diff --git a/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java b/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java index 1f07a32fc..ea1ef2437 100644 --- a/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java +++ b/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java @@ -74,7 +74,9 @@ public class I2PSessionDemultiplexer implements I2PSessionMuxedListener { * (Streaming lib) */ public void addListener(I2PSessionListener l, int proto, int port) { - _listeners.put(key(proto, port), new NoPortsListener(l)); + I2PSessionListener old = _listeners.put(key(proto, port), new NoPortsListener(l)); + if (old != null && _log.shouldLog(Log.WARN)) + _log.warn("Listener " + l + " replaces " + old + " for proto: " + proto + " port: " + port); } /** @@ -82,7 +84,9 @@ public class I2PSessionDemultiplexer implements I2PSessionMuxedListener { * UDP perhaps */ public void addMuxedListener(I2PSessionMuxedListener l, int proto, int port) { - _listeners.put(key(proto, port), l); + I2PSessionListener old = _listeners.put(key(proto, port), l); + if (old != null && _log.shouldLog(Log.WARN)) + _log.warn("Listener " + l + " replaces " + old + " for proto: " + proto + " port: " + port); } public void removeListener(int proto, int port) { diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 6990f2a51..35baaf51c 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -139,7 +139,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa CLOSED } - private State _state = State.CLOSED; + protected State _state = State.CLOSED; protected final Object _stateLock = new Object(); /** diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java index 880670a53..e62fc3e58 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java @@ -326,9 +326,9 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { protected class MuxedAvailabilityNotifier extends AvailabilityNotifier { private final LinkedBlockingQueue _msgs; - private volatile boolean _alive = false; + private volatile boolean _alive; private static final int POISON_SIZE = -99999; - private final AtomicBoolean stopping = new AtomicBoolean(false); + private final AtomicBoolean stopping = new AtomicBoolean(); public MuxedAvailabilityNotifier() { _msgs = new LinkedBlockingQueue(); @@ -336,12 +336,12 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { @Override public void stopNotifying() { - boolean again = true; synchronized (stopping) { if( !stopping.getAndSet(true)) { - if (_alive == true) { + _msgs.clear(); + if (_alive) { // System.out.println("I2PSessionMuxedImpl.stopNotifying()"); - _msgs.clear(); + boolean again = true; while(again) { try { _msgs.put(new MsgData(0, POISON_SIZE, 0, 0, 0)); @@ -351,8 +351,8 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { continue; } } + _alive = false; } - _alive = false; stopping.set(false); } // stopping.notifyAll(); @@ -366,17 +366,24 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { try { _msgs.put(new MsgData((int)(msgId & 0xffffffff), size, proto, fromPort, toPort)); } catch (InterruptedException ie) {} + if (!_alive && _log.shouldLog(Log.WARN)) + _log.warn(getPrefix() + "message available but notifier not running"); } @Override public void run() { - MsgData msg; + if (_log.shouldLog(Log.DEBUG)) + _log.debug(getPrefix() + "starting muxed availability notifier"); + _msgs.clear(); _alive=true; while (_alive) { + MsgData msg; try { msg = _msgs.take(); } catch (InterruptedException ie) { - _log.debug("I2PSessionMuxedImpl.run() InterruptedException " + String.valueOf(_msgs.size()) + " Messages, Alive " + _alive); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("I2PSessionMuxedImpl.run() InterruptedException " + + String.valueOf(_msgs.size()) + " Messages, Alive " + _alive); continue; } if (msg.size == POISON_SIZE) { diff --git a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java index 49cc2c45b..39dc99403 100644 --- a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java +++ b/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java @@ -33,7 +33,7 @@ class MessagePayloadMessageHandler extends HandlerImpl { public void handleMessage(I2CPMessage message, I2PSessionImpl session) { if (_log.shouldLog(Log.DEBUG)) - _log.debug("Handle message " + message); + _log.debug("Handle message " + message + " for session " + session); try { MessagePayloadMessage msg = (MessagePayloadMessage) message; long id = msg.getMessageId(); diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index 9dcf04e72..2a2882335 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -22,8 +22,11 @@ import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.PrivateKey; import net.i2p.data.SigningPrivateKey; +import net.i2p.data.i2cp.CreateLeaseSetMessage; +import net.i2p.data.i2cp.CreateSessionMessage; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.SessionId; +import net.i2p.util.I2PAppThread; /** * An additional session using another session's connection. @@ -105,7 +108,19 @@ class SubSession extends I2PSessionMuxedImpl { */ @Override public void connect() throws I2PSessionException { + synchronized(_stateLock) { + if (_state != State.OPEN) { + _state = State.OPENING; + } + } _primary.connect(); + synchronized(_stateLock) { + if (_state != State.OPEN) { + Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true); + notifier.start(); + _state = State.OPEN; + } + } } /** @@ -115,7 +130,7 @@ class SubSession extends I2PSessionMuxedImpl { @Override public boolean isClosed() { // FIXME - return /* getSessionId() == null || */ _primary.isClosed(); + return super.isClosed() || _primary.isClosed(); } /** @@ -126,7 +141,12 @@ class SubSession extends I2PSessionMuxedImpl { */ @Override void sendMessage(I2CPMessage message) throws I2PSessionException { - if (isClosed()) + // workaround for now, as primary will send out our CreateSession + // from his connect, while we are still closed. + // If we did it in connect() we wouldn't need this + if (isClosed() && + message.getType() != CreateSessionMessage.MESSAGE_TYPE && + message.getType() != CreateLeaseSetMessage.MESSAGE_TYPE) throw new I2PSessionException("Already closed"); _primary.sendMessage(message); } @@ -153,6 +173,7 @@ class SubSession extends I2PSessionMuxedImpl { if (_availabilityNotifier != null) _availabilityNotifier.stopNotifying(); if (_sessionListener != null) _sessionListener.disconnected(this); + changeState(State.CLOSED); } /** From 47c4c0d6bbd0ad9aa61056aad52e50faca841c0b Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Apr 2015 19:35:38 +0000 Subject: [PATCH 011/258] add all known dsa-only hosts to list --- .../streaming/impl/I2PSocketManagerFull.java | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 8122ab50c..7ea8c90bd 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -61,9 +61,38 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final ConnectionManager _connectionManager; private final AtomicBoolean _isDestroyed = new AtomicBoolean(); + /** @since 0.9.20 */ private static final Set _dsaOnly = new HashSet(16); private static final String[] DSA_ONLY_HASHES = { - "3t5Ar2NCTIOId70uzX2bZyJljR0aBogxMEzNyHirB7A=" // forum.i2p + // list from http://zzz.i2p/topics/1682?page=1#p8414 + // bzr.welterde.i2p + "Cvs1gCZTTkgD2Z2byh2J9atPmh5~I8~L7BNQnQl0hUE=", + // docs.i2p2.i2p + "WCXV87RdrF6j-mnn6qt7kVSBifHTlPL0PmVMFWwaolo=", + // flibusta.i2p + "yy2hYtqqfl84N9skwdRkeM7baFMXHKyDWU3XRShlEo8=", + // forum.i2p + "3t5Ar2NCTIOId70uzX2bZyJljR0aBogxMEzNyHirB7A=", + // i2jump.i2p + "9vaoGZbOaeqdRK2qEunlwRM9mUSW-I9R4OON35TDKK4=", + // irc.welterde.i2p + "5rjezx4McFk3bNhoJV-NTLlQW1AR~jiUcN6DOWMCCVc=", + // lists.i2p2.i2p + "qwtgoFoMSK0TOtbT4ovBX1jHUzCoZCPzrJVxjKD7RCg=", + // mtn.i2p2.i2p + "X5VDzYaoX9-P6bAWnrVSR5seGLkOeORP2l3Mh4drXPo=", + // nntp.welterde.i2p + "VXwmNIwMy1BcUVmut0oZ72jbWoqFzvxJukmS-G8kAAE=", + // paste.i2p2.i2p + "DoyMyUUgOSTddvRpqYfKHFPPjkkX~iQmResyfjjBYWs=", + // syndie.wetlerde.i2p + "xMxC54BFgyp-~zzrQI3F8m2CK--9XMcNmSAep6RH4Kk=", + // ugha.i2p + "zsu3WF~QLBxZXH-gHq9MuZE6y8ROZmMF7dA2MbMMKkY=", + // tracker.welterde.i2p + "EVkFgKkrDKyGfI7TIuDmlHoAmvHC~FbnY946DfujR0A=", + // www.i2p2.i2p + "im9gytzKT15mT1sB5LC9bHXCcwytQ4EPcrGQhoam-4w=" }; static { From 40130a8a6173a390880a092e046565617a981d27 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 12 May 2015 19:07:42 +0000 Subject: [PATCH 012/258] SAM: - Close sockets and stop tunnels when router-side SAM stops (ticket #1572) - Better checks for quoting status message strings (ticket #1488) - Set encoding for sam.keys file - Don't throw NPE on rare stream errors - Comment out unused dumpProperties() - Cleanups, log tweaks, thread name tweaks --- apps/sam/java/src/net/i2p/sam/Handler.java | 14 ++ apps/sam/java/src/net/i2p/sam/SAMBridge.java | 116 +++++++++++++---- apps/sam/java/src/net/i2p/sam/SAMHandler.java | 49 ++++--- .../src/net/i2p/sam/SAMHandlerFactory.java | 9 +- .../src/net/i2p/sam/SAMMessageSession.java | 2 +- apps/sam/java/src/net/i2p/sam/SAMUtils.java | 2 + .../java/src/net/i2p/sam/SAMv1Handler.java | 78 +++++++---- .../java/src/net/i2p/sam/SAMv2Handler.java | 10 +- .../java/src/net/i2p/sam/SAMv3Handler.java | 104 +++++++++------ .../src/net/i2p/sam/SAMv3StreamSession.java | 121 +++++++++++------- 10 files changed, 343 insertions(+), 162 deletions(-) create mode 100644 apps/sam/java/src/net/i2p/sam/Handler.java diff --git a/apps/sam/java/src/net/i2p/sam/Handler.java b/apps/sam/java/src/net/i2p/sam/Handler.java new file mode 100644 index 000000000..16cc27334 --- /dev/null +++ b/apps/sam/java/src/net/i2p/sam/Handler.java @@ -0,0 +1,14 @@ +package net.i2p.sam; + +/** + * Something that can be stopped by the SAMBridge. + * + * @since 0.9.20 + */ +public interface Handler { + + /** + * Stop the handler + */ + public void stopHandling(); +} diff --git a/apps/sam/java/src/net/i2p/sam/SAMBridge.java b/apps/sam/java/src/net/i2p/sam/SAMBridge.java index 4679f68b6..383f44fb5 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMBridge.java +++ b/apps/sam/java/src/net/i2p/sam/SAMBridge.java @@ -19,9 +19,13 @@ import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.nio.ByteBuffer; import java.util.Arrays; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.app.*; @@ -30,6 +34,7 @@ import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.util.I2PAppThread; import net.i2p.util.Log; +import net.i2p.util.PortMapper; /** * SAM bridge implementation. @@ -55,6 +60,7 @@ public class SAMBridge implements Runnable, ClientApp { * destination keys (Destination+PrivateKey+SigningPrivateKey) */ private final Map nameToPrivKeys; + private final Set _handlers; private volatile boolean acceptConnections = true; @@ -95,6 +101,7 @@ public class SAMBridge implements Runnable, ClientApp { _listenPort = options.port; persistFilename = options.keyFile; nameToPrivKeys = new HashMap(8); + _handlers = new HashSet(8); this.i2cpProps = options.opts; _state = INITIALIZED; } @@ -124,6 +131,7 @@ public class SAMBridge implements Runnable, ClientApp { _listenPort = listenPort; persistFilename = persistFile; nameToPrivKeys = new HashMap(8); + _handlers = new HashSet(8); loadKeys(); try { openSocket(); @@ -209,8 +217,9 @@ public class SAMBridge implements Runnable, ClientApp { } /** - * Load up the keys from the persistFilename - * + * Load up the keys from the persistFilename. + * TODO use DataHelper + * TODO store in config dir, not base dir */ private void loadKeys() { synchronized (nameToPrivKeys) { @@ -218,7 +227,7 @@ public class SAMBridge implements Runnable, ClientApp { BufferedReader br = null; try { br = new BufferedReader(new InputStreamReader( - new FileInputStream(persistFilename))); + new FileInputStream(persistFilename), "UTF-8")); String line = null; while ( (line = br.readLine()) != null) { int eq = line.indexOf('='); @@ -226,6 +235,8 @@ public class SAMBridge implements Runnable, ClientApp { String privKeys = line.substring(eq+1); nameToPrivKeys.put(name, privKeys); } + if (_log.shouldInfo()) + _log.info("Loaded " + nameToPrivKeys.size() + " private keys from " + persistFilename); } catch (FileNotFoundException fnfe) { _log.warn("Key file does not exist at " + persistFilename); } catch (IOException ioe) { @@ -237,8 +248,9 @@ public class SAMBridge implements Runnable, ClientApp { } /** - * Store the current keys to disk in the location specified on creation - * + * Store the current keys to disk in the location specified on creation. + * TODO use DataHelper + * TODO store in config dir, not base dir */ private void storeKeys() { synchronized (nameToPrivKeys) { @@ -248,11 +260,13 @@ public class SAMBridge implements Runnable, ClientApp { for (Map.Entry entry : nameToPrivKeys.entrySet()) { String name = entry.getKey(); String privKeys = entry.getValue(); - out.write(name.getBytes()); + out.write(name.getBytes("UTF-8")); out.write('='); - out.write(privKeys.getBytes()); + out.write(privKeys.getBytes("UTF-8")); out.write('\n'); } + if (_log.shouldInfo()) + _log.info("Saved " + nameToPrivKeys.size() + " private keys to " + persistFilename); } catch (IOException ioe) { _log.error("Error writing out the SAM keys to " + persistFilename, ioe); } finally { @@ -261,6 +275,51 @@ public class SAMBridge implements Runnable, ClientApp { } } + /** + * Handlers must call on startup + * @since 0.9.20 + */ + public void register(Handler handler) { + if (_log.shouldInfo()) + _log.info("Register " + handler); + synchronized (_handlers) { + _handlers.add(handler); + } + } + + /** + * Handlers must call on stop + * @since 0.9.20 + */ + public void unregister(Handler handler) { + if (_log.shouldInfo()) + _log.info("Unregister " + handler); + synchronized (_handlers) { + _handlers.remove(handler); + } + } + + /** + * Stop all the handlers. + * @since 0.9.20 + */ + private void stopHandlers() { + List handlers = null; + synchronized (_handlers) { + if (!_handlers.isEmpty()) { + handlers = new ArrayList(_handlers); + _handlers.clear(); + } + } + if (handlers != null) { + for (Handler handler : handlers) { + if (_log.shouldInfo()) + _log.info("Stopping " + handler); + handler.stopHandling(); + } + } + } + ////// begin ClientApp interface, use only if using correct construtor /** @@ -270,6 +329,9 @@ public class SAMBridge implements Runnable, ClientApp { if (_state != INITIALIZED) return; changeState(STARTING); + synchronized (_handlers) { + _handlers.clear(); + } loadKeys(); try { openSocket(); @@ -285,7 +347,8 @@ public class SAMBridge implements Runnable, ClientApp { } /** - * Does NOT stop existing sessions. + * As of 0.9.20, stops running handlers and sessions. + * * @since 0.9.6 */ public synchronized void shutdown(String[] args) { @@ -293,11 +356,11 @@ public class SAMBridge implements Runnable, ClientApp { return; changeState(STOPPING); acceptConnections = false; + stopHandlers(); if (_runner != null) _runner.interrupt(); else changeState(STOPPED); - // TODO does not stop active connections / sessions } /** @@ -375,7 +438,7 @@ public class SAMBridge implements Runnable, ClientApp { * @since 0.9.6 */ private void startThread() { - I2PAppThread t = new I2PAppThread(this, "SAMListener"); + I2PAppThread t = new I2PAppThread(this, "SAMListener " + _listenPort); if (Boolean.parseBoolean(System.getProperty("sam.shutdownOnOOM"))) { t.addOOMEventThreadListener(new I2PAppThread.OOMEventListener() { public void outOfMemory(OutOfMemoryError err) { @@ -487,6 +550,7 @@ public class SAMBridge implements Runnable, ClientApp { changeState(RUNNING); if (_mgr != null) _mgr.register(this); + I2PAppContext.getGlobalContext().portMapper().register(PortMapper.SVC_SAM, _listenPort); try { while (acceptConnections) { SocketChannel s = serverSocket.accept(); @@ -495,18 +559,19 @@ public class SAMBridge implements Runnable, ClientApp { + s.socket().getInetAddress().toString() + ":" + s.socket().getPort()); - class HelloHandler implements Runnable { - private final SocketChannel s; - private final SAMBridge parent; + class HelloHandler implements Runnable, Handler { + private final SocketChannel s; + private final SAMBridge parent; - HelloHandler(SocketChannel s, SAMBridge parent) { + HelloHandler(SocketChannel s, SAMBridge parent) { this.s = s ; this.parent = parent ; - } + } - public void run() { + public void run() { + parent.register(this); try { - SAMHandler handler = SAMHandlerFactory.createSAMHandler(s, i2cpProps); + SAMHandler handler = SAMHandlerFactory.createSAMHandler(s, i2cpProps, parent); if (handler == null) { if (_log.shouldLog(Log.DEBUG)) _log.debug("SAM handler has not been instantiated"); @@ -515,7 +580,6 @@ public class SAMBridge implements Runnable, ClientApp { } catch (IOException e) {} return; } - handler.setBridge(parent); handler.startHandling(); } catch (SAMException e) { if (_log.shouldLog(Log.ERROR)) @@ -526,11 +590,17 @@ public class SAMBridge implements Runnable, ClientApp { } catch (Exception ee) { try { s.close(); } catch (IOException ioe) {} _log.log(Log.CRIT, "Unexpected error handling SAM connection", ee); - } - } + } finally { + parent.unregister(this); + } + } + + /** @since 0.9.20 */ + public void stopHandling() { + try { s.close(); } catch (IOException ioe) {} + } } - // TODO: Handler threads are not saved or tracked and cannot be stopped - new I2PAppThread(new HelloHandler(s,this), "HelloHandler").start(); + new I2PAppThread(new HelloHandler(s,this), "SAM HelloHandler").start(); } changeState(STOPPING); } catch (Exception e) { @@ -546,6 +616,8 @@ public class SAMBridge implements Runnable, ClientApp { if (serverSocket != null) serverSocket.close(); } catch (IOException e) {} + I2PAppContext.getGlobalContext().portMapper().unregister(PortMapper.SVC_SAM); + stopHandlers(); changeState(STOPPED); } } diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandler.java b/apps/sam/java/src/net/i2p/sam/SAMHandler.java index 30213ca6d..56d68878c 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMHandler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMHandler.java @@ -25,12 +25,12 @@ import net.i2p.util.Log; * * @author human */ -abstract class SAMHandler implements Runnable { +abstract class SAMHandler implements Runnable, Handler { protected final Log _log; - protected I2PAppThread thread = null; - protected SAMBridge bridge = null; + protected I2PAppThread thread; + protected final SAMBridge bridge; private final Object socketWLock = new Object(); // Guards writings on socket protected final SocketChannel socket; @@ -41,8 +41,8 @@ abstract class SAMHandler implements Runnable { /** I2CP options configuring the I2CP connection (port, host, numHops, etc) */ protected final Properties i2cpProps; - private final Object stopLock = new Object(); - private volatile boolean stopHandler; + protected final Object stopLock = new Object(); + protected boolean stopHandler; /** * SAMHandler constructor (to be called by subclasses) @@ -53,14 +53,15 @@ abstract class SAMHandler implements Runnable { * @param i2cpProps properties to configure the I2CP connection (host, port, etc) * @throws IOException */ - protected SAMHandler(SocketChannel s, - int verMajor, int verMinor, Properties i2cpProps) throws IOException { + protected SAMHandler(SocketChannel s, int verMajor, int verMinor, + Properties i2cpProps, SAMBridge parent) throws IOException { _log = I2PAppContext.getGlobalContext().logManager().getLog(getClass()); socket = s; this.verMajor = verMajor; this.verMinor = verMinor; this.i2cpProps = i2cpProps; + bridge = parent; } /** @@ -68,12 +69,10 @@ abstract class SAMHandler implements Runnable { * */ public final void startHandling() { - thread = new I2PAppThread(this, "SAMHandler"); + thread = new I2PAppThread(this, getClass().getSimpleName()); thread.start(); } - - public void setBridge(SAMBridge bridge) { this.bridge = bridge; } - + /** * Actually handle the SAM protocol. * @@ -81,10 +80,9 @@ abstract class SAMHandler implements Runnable { protected abstract void handle(); /** - * Get the input stream of the socket connected to the SAM client + * Get the channel of the socket connected to the SAM client * - * @return input stream - * @throws IOException + * @return channel */ protected final SocketChannel getClientSocket() { return socket ; @@ -156,13 +154,17 @@ abstract class SAMHandler implements Runnable { } /** - * Stop the SAM handler - * + * Stop the SAM handler, close the client socket, + * unregister with the bridge. */ - public final void stopHandling() { + public void stopHandling() { synchronized (stopLock) { stopHandler = true; } + try { + closeClientSocket(); + } catch (IOException e) {} + bridge.unregister(this); } /** @@ -183,14 +185,23 @@ abstract class SAMHandler implements Runnable { */ @Override public final String toString() { - return ("SAM handler (class: " + this.getClass().getName() + return (this.getClass().getSimpleName() + "; SAM version: " + verMajor + "." + verMinor + "; client: " + this.socket.socket().getInetAddress().toString() + ":" + this.socket.socket().getPort() + ")"); } + /** + * Register with the bridge, call handle(), + * unregister with the bridge. + */ public final void run() { - handle(); + bridge.register(this); + try { + handle(); + } finally { + bridge.unregister(this); + } } } diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java index d605d57f9..fff86fe75 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java +++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java @@ -38,7 +38,8 @@ class SAMHandlerFactory { * @throws SAMException if the connection handshake (HELLO message) was malformed * @return A SAM protocol handler, or null if the client closed before the handshake */ - public static SAMHandler createSAMHandler(SocketChannel s, Properties i2cpProps) throws SAMException { + public static SAMHandler createSAMHandler(SocketChannel s, Properties i2cpProps, + SAMBridge parent) throws SAMException { StringTokenizer tok; Log log = I2PAppContext.getGlobalContext().logManager().getLog(SAMHandlerFactory.class); @@ -103,13 +104,13 @@ class SAMHandlerFactory { try { switch (verMajor) { case 1: - handler = new SAMv1Handler(s, verMajor, verMinor, i2cpProps); + handler = new SAMv1Handler(s, verMajor, verMinor, i2cpProps, parent); break; case 2: - handler = new SAMv2Handler(s, verMajor, verMinor, i2cpProps); + handler = new SAMv2Handler(s, verMajor, verMinor, i2cpProps, parent); break; case 3: - handler = new SAMv3Handler(s, verMajor, verMinor, i2cpProps); + handler = new SAMv3Handler(s, verMajor, verMinor, i2cpProps, parent); break; default: log.error("BUG! Trying to initialize the wrong SAM version!"); diff --git a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java index dbeec9eda..db2450b01 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java @@ -72,6 +72,7 @@ abstract class SAMMessageSession { handler = new SAMMessageSessionHandler(destStream, props); + // FIXME don't start threads in constructors Thread t = new I2PAppThread(handler, "SAMMessageSessionHandler"); t.start(); } @@ -125,7 +126,6 @@ abstract class SAMMessageSession { /** * Close a SAM message-based session. - * */ public void close() { handler.stopRunning(); diff --git a/apps/sam/java/src/net/i2p/sam/SAMUtils.java b/apps/sam/java/src/net/i2p/sam/SAMUtils.java index 7adaadf7b..e1e52f4fc 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMUtils.java +++ b/apps/sam/java/src/net/i2p/sam/SAMUtils.java @@ -212,6 +212,7 @@ class SAMUtils { } /* Dump a Properties object in an human-readable form */ +/**** private static String dumpProperties(Properties props) { StringBuilder builder = new StringBuilder(); String key, val; @@ -231,6 +232,7 @@ class SAMUtils { return builder.toString(); } +****/ /**** public static void main(String args[]) { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java index 3189f87e3..cf4d46b62 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java @@ -60,8 +60,9 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece * @throws SAMException * @throws IOException */ - public SAMv1Handler(SocketChannel s, int verMajor, int verMinor) throws SAMException, IOException { - this(s, verMajor, verMinor, new Properties()); + public SAMv1Handler(SocketChannel s, int verMajor, int verMinor, + SAMBridge parent) throws SAMException, IOException { + this(s, verMajor, verMinor, new Properties(), parent); } /** * Create a new SAM version 1 handler. This constructor expects @@ -75,13 +76,14 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece * @throws SAMException * @throws IOException */ - public SAMv1Handler(SocketChannel s, int verMajor, int verMinor, Properties i2cpProps) throws SAMException, IOException { - super(s, verMajor, verMinor, i2cpProps); + public SAMv1Handler(SocketChannel s, int verMajor, int verMinor, + Properties i2cpProps, SAMBridge parent) throws SAMException, IOException { + super(s, verMajor, verMinor, i2cpProps, parent); _id = __id.incrementAndGet(); if (_log.shouldLog(Log.DEBUG)) _log.debug("SAM version 1 handler instantiated"); - if ( ! verifVersion() ) { + if ( ! verifVersion() ) { throw new SAMException("BUG! Wrong protocol version!"); } } @@ -183,8 +185,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece } } catch (IOException e) { if (_log.shouldLog(Log.DEBUG)) - _log.debug("Caught IOException (" - + e.getMessage() + ") for message [" + msg + "]", e); + _log.debug("Caught IOException for message [" + msg + "]", e); } catch (Exception e) { _log.error("Unexpected exception for message [" + msg + "]", e); } finally { @@ -193,7 +194,8 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece try { closeClientSocket(); } catch (IOException e) { - _log.error("Error closing socket: " + e.getMessage()); + if (_log.shouldWarn()) + _log.warn("Error closing socket", e); } if (getRawSession() != null) { getRawSession().close(); @@ -797,7 +799,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece public void receiveRawBytes(byte data[]) throws IOException { if (getRawSession() == null) { _log.error("BUG! Received raw bytes, but session is null!"); - throw new NullPointerException("BUG! RAW session is null!"); + return; } ByteArrayOutputStream msg = new ByteArrayOutputStream(); @@ -818,7 +820,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece if (getRawSession() == null) { _log.error("BUG! Got raw receiving stop, but session is null!"); - throw new NullPointerException("BUG! RAW session is null!"); + return; } try { @@ -833,7 +835,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece public void receiveDatagramBytes(Destination sender, byte data[]) throws IOException { if (getDatagramSession() == null) { _log.error("BUG! Received datagram bytes, but session is null!"); - throw new NullPointerException("BUG! DATAGRAM session is null!"); + return; } ByteArrayOutputStream msg = new ByteArrayOutputStream(); @@ -855,7 +857,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece if (getDatagramSession() == null) { _log.error("BUG! Got datagram receiving stop, but session is null!"); - throw new NullPointerException("BUG! DATAGRAM session is null!"); + return; } try { @@ -873,7 +875,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece if ( getStreamSession() == null ) { _log.error ( "BUG! Want to answer to stream SEND, but session is null!" ); - throw new NullPointerException ( "BUG! STREAM session is null!" ); + return; } if ( !writeString ( "STREAM SEND ID=" + id @@ -891,7 +893,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece if ( getStreamSession() == null ) { _log.error ( "BUG! Stream outgoing buffer is free, but session is null!" ); - throw new NullPointerException ( "BUG! STREAM session is null!" ); + return; } if ( !writeString ( "STREAM READY_TO_SEND ID=" + id + "\n" ) ) @@ -904,7 +906,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece public void notifyStreamIncomingConnection(int id, Destination d) throws IOException { if (getStreamSession() == null) { _log.error("BUG! Received stream connection, but session is null!"); - throw new NullPointerException("BUG! STREAM session is null!"); + return; } if (!writeString("STREAM CONNECTED DESTINATION=" @@ -914,18 +916,16 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece } } + /** @param msg may be null */ public void notifyStreamOutgoingConnection ( int id, String result, String msg ) throws IOException { if ( getStreamSession() == null ) { _log.error ( "BUG! Received stream connection, but session is null!" ); - throw new NullPointerException ( "BUG! STREAM session is null!" ); + return; } - String msgString = "" ; - - if ( msg != null ) msgString = " MESSAGE=\"" + msg + "\""; - + String msgString = createMessageString(msg); if ( !writeString ( "STREAM STATUS RESULT=" + result + " ID=" + id @@ -935,11 +935,36 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece throw new IOException ( "Error notifying connection to SAM client" ); } } + + /** + * Create a string to be appended to a status. + * + * @param msg may be null + * @return non-null, "" if msg is null, MESSAGE=msg or MESSAGE="msg a b c" + * with leading space if msg is non-null + * @since 0.9.20 + */ + protected static String createMessageString(String msg) { + String rv; + if ( msg != null ) { + msg = msg.replace("\n", " "); + msg = msg.replace("\r", " "); + if (!msg.startsWith("\"")) { + msg = msg.replace("\"", ""); + if (msg.contains("\"") || msg.contains("\t")) + msg = '"' + msg + '"'; + } + rv = " MESSAGE=\"" + msg + "\""; + } else { + rv = ""; + } + return rv; + } public void receiveStreamBytes(int id, ByteBuffer data) throws IOException { if (getStreamSession() == null) { _log.error("Received stream bytes, but session is null!"); - throw new NullPointerException("BUG! STREAM session is null!"); + return; } String msgText = "STREAM RECEIVED ID=" + id +" SIZE=" + data.remaining() + "\n"; @@ -956,16 +981,15 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece } } + /** @param msg may be null */ public void notifyStreamDisconnection(int id, String result, String msg) throws IOException { if (getStreamSession() == null) { _log.error("BUG! Received stream disconnection, but session is null!"); - throw new NullPointerException("BUG! STREAM session is null!"); + return; } - // FIXME: msg should be escaped! - if (!writeString("STREAM CLOSED ID=" + id + " RESULT=" + result - + (msg == null ? "" : (" MESSAGE=" + msg)) - + "\n")) { + String msgString = createMessageString(msg); + if (!writeString("STREAM CLOSED ID=" + id + " RESULT=" + result + msgString + '\n')) { throw new IOException("Error notifying disconnection to SAM client"); } } @@ -976,7 +1000,7 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece if (getStreamSession() == null) { _log.error("BUG! Got stream receiving stop, but session is null!"); - throw new NullPointerException("BUG! STREAM session is null!"); + return; } try { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java index d96d82cb1..5eec29e1e 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv2Handler.java @@ -34,9 +34,10 @@ class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDatagramRe * @param verMajor SAM major version to manage (should be 2) * @param verMinor SAM minor version to manage */ - public SAMv2Handler ( SocketChannel s, int verMajor, int verMinor ) throws SAMException, IOException + public SAMv2Handler(SocketChannel s, int verMajor, int verMinor, + SAMBridge parent) throws SAMException, IOException { - this ( s, verMajor, verMinor, new Properties() ); + this(s, verMajor, verMinor, new Properties(), parent); } /** @@ -50,9 +51,10 @@ class SAMv2Handler extends SAMv1Handler implements SAMRawReceiver, SAMDatagramRe * @param i2cpProps properties to configure the I2CP connection (host, port, etc) */ - public SAMv2Handler ( SocketChannel s, int verMajor, int verMinor, Properties i2cpProps ) throws SAMException, IOException + public SAMv2Handler(SocketChannel s, int verMajor, int verMinor, + Properties i2cpProps, SAMBridge parent) throws SAMException, IOException { - super ( s, verMajor, verMinor, i2cpProps ); + super(s, verMajor, verMinor, i2cpProps, parent); } @Override diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java index fd3b44a20..5e75dcf66 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java @@ -48,8 +48,8 @@ class SAMv3Handler extends SAMv1Handler private Session session; public static final SessionsDB sSessionsHash = new SessionsDB(); - private boolean stolenSocket; - private boolean streamForwardingSocket; + private volatile boolean stolenSocket; + private volatile boolean streamForwardingSocket; interface Session { @@ -67,9 +67,10 @@ class SAMv3Handler extends SAMv1Handler * @param verMajor SAM major version to manage (should be 3) * @param verMinor SAM minor version to manage */ - public SAMv3Handler ( SocketChannel s, int verMajor, int verMinor ) throws SAMException, IOException + public SAMv3Handler(SocketChannel s, int verMajor, int verMinor, + SAMBridge parent) throws SAMException, IOException { - this ( s, verMajor, verMinor, new Properties() ); + this(s, verMajor, verMinor, new Properties(), parent); } /** @@ -83,9 +84,10 @@ class SAMv3Handler extends SAMv1Handler * @param i2cpProps properties to configure the I2CP connection (host, port, etc) */ - public SAMv3Handler ( SocketChannel s, int verMajor, int verMinor, Properties i2cpProps ) throws SAMException, IOException + public SAMv3Handler(SocketChannel s, int verMajor, int verMinor, + Properties i2cpProps, SAMBridge parent) throws SAMException, IOException { - super ( s, verMajor, verMinor, i2cpProps ); + super(s, verMajor, verMinor, i2cpProps, parent); if (_log.shouldLog(Log.DEBUG)) _log.debug("SAM version 3 handler instantiated"); } @@ -214,6 +216,9 @@ class SAMv3Handler extends SAMv1Handler } } + /** + * The values in the SessionsDB + */ public static class SessionRecord { private final String m_dest ; @@ -266,11 +271,14 @@ class SAMv3Handler extends SAMv1Handler } } + /** + * basically a HashMap from String to SessionRecord + */ public static class SessionsDB { private static final long serialVersionUID = 0x1; - static class ExistingIdException extends Exception { + static class ExistingIdException extends Exception { private static final long serialVersionUID = 0x1; } @@ -284,6 +292,7 @@ class SAMv3Handler extends SAMv1Handler map = new HashMap() ; } + /** @return success */ synchronized public boolean put( String nick, SessionRecord session ) throws ExistingIdException, ExistingDestException { @@ -305,17 +314,12 @@ class SAMv3Handler extends SAMv1Handler return false ; } + /** @return true if removed */ synchronized public boolean del( String nick ) { - SessionRecord rec = map.get(nick); - - if ( rec!=null ) { - map.remove(nick); - return true ; - } - else - return false ; + return map.remove(nick) != null; } + synchronized public SessionRecord get(String nick) { return map.get(nick); @@ -332,12 +336,23 @@ class SAMv3Handler extends SAMv1Handler return this.socket.socket().getInetAddress().getHostAddress(); } + /** + * For SAMv3StreamSession connect and accept + */ public void stealSocket() { stolenSocket = true ; this.stopHandling(); } + /** + * For SAMv3StreamSession + * @since 0.9.20 + */ + SAMBridge getBridge() { + return bridge; + } + public void handle() { String msg = null; String domain = null; @@ -348,7 +363,7 @@ class SAMv3Handler extends SAMv1Handler this.thread.setName("SAMv3Handler " + _id); if (_log.shouldLog(Log.DEBUG)) - _log.debug("SAM handling started"); + _log.debug("SAMv3 handling started"); try { InputStream in = getClientSocket().socket().getInputStream(); @@ -422,8 +437,7 @@ class SAMv3Handler extends SAMv1Handler } } catch (IOException e) { if (_log.shouldLog(Log.DEBUG)) - _log.debug("Caught IOException (" - + e.getMessage() + ") for message [" + msg + "]", e); + _log.debug("Caught IOException for message [" + msg + "]", e); } catch (Exception e) { _log.error("Unexpected exception for message [" + msg + "]", e); } finally { @@ -435,7 +449,8 @@ class SAMv3Handler extends SAMv1Handler try { closeClientSocket(); } catch (IOException e) { - _log.error("Error closing socket: " + e.getMessage()); + if (_log.shouldWarn()) + _log.warn("Error closing socket", e); } } if (streamForwardingSocket) @@ -444,20 +459,40 @@ class SAMv3Handler extends SAMv1Handler try { ((SAMv3StreamSession)streamSession).stopForwardingIncoming(); } catch (SAMException e) { - _log.error("Error while stopping forwarding connections: " + e.getMessage()); + if (_log.shouldWarn()) + _log.warn("Error while stopping forwarding connections", e); } catch (InterruptedIOException e) { - _log.error("Interrupted while stopping forwarding connections: " + e.getMessage()); + if (_log.shouldWarn()) + _log.warn("Interrupted while stopping forwarding connections", e); } } } - - - die(); } } - protected void die() { + /** + * Stop the SAM handler, close the socket, + * unregister with the bridge. + * + * Overridden to not close the client socket if stolen. + * + * @since 0.9.20 + */ + @Override + public void stopHandling() { + synchronized (stopLock) { + stopHandler = true; + } + if (!stolenSocket) { + try { + closeClientSocket(); + } catch (IOException e) {} + } + bridge.unregister(this); + } + + private void die() { SessionRecord rec = null ; if (session!=null) { @@ -813,20 +848,15 @@ class SAMv3Handler extends SAMv1Handler } - public void notifyStreamResult(boolean verbose, String result, String message) throws IOException - { + public void notifyStreamResult(boolean verbose, String result, String message) throws IOException { if (!verbose) return ; - - String out = "STREAM STATUS RESULT="+result; - if (message!=null) - out = out + " MESSAGE=\"" + message + "\""; - out = out + '\n'; + String msgString = createMessageString(message); + String out = "STREAM STATUS RESULT=" + result + msgString + '\n'; - if ( !writeString ( out ) ) - { - throw new IOException ( "Error notifying connection to SAM client" ); - } - } + if (!writeString(out)) { + throw new IOException ( "Error notifying connection to SAM client" ); + } + } public void notifyStreamIncomingConnection(Destination d) throws IOException { if (getStreamSession() == null) { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java index 99854637e..a254d79a3 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java @@ -74,6 +74,7 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi /** * Connect the SAM STREAM session to the specified Destination + * for a single connection, using the socket stolen from the handler. * * @param handler The handler that communicates with the requesting client * @param dest Base64-encoded Destination to connect to @@ -87,7 +88,7 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi * @throws IOException */ public void connect ( SAMv3Handler handler, String dest, Properties props ) - throws I2PException, ConnectException, NoRouteToHostException, + throws I2PException, ConnectException, NoRouteToHostException, DataFormatException, InterruptedIOException, IOException { boolean verbose = (props.getProperty("SILENT", "false").equals("false")); @@ -117,13 +118,17 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi WritableByteChannel toClient = handler.getClientSocket(); WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); - (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P"), "SAMPipeClientToI2P")).start(); - (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient"), "SAMPipeI2PToClient")).start(); - + SAMBridge bridge = handler.getBridge(); + (new Thread(rec.getThreadGroup(), + new Pipe(fromClient, toI2P, bridge), + "ConnectV3 SAMPipeClientToI2P")).start(); + (new Thread(rec.getThreadGroup(), + new Pipe(fromI2P, toClient, bridge), + "ConnectV3 SAMPipeI2PToClient")).start(); } /** - * Accept an incoming STREAM + * Accept a single incoming STREAM on the socket stolen from the handler. * * @param handler The handler that communicates with the requesting client * @param verbose If true, SAM will send the Base64-encoded peer Destination of an @@ -150,8 +155,7 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi this.socketServer = this.socketMgr.getServerSocket(); } - I2PSocket i2ps; - i2ps = this.socketServer.accept(); + I2PSocket i2ps = this.socketServer.accept(); synchronized( this.socketServerLock ) { @@ -159,11 +163,11 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi } SAMv3Handler.SessionRecord rec = SAMv3Handler.sSessionsHash.get(nick); - - if ( rec==null || i2ps==null ) throw new InterruptedIOException() ; - - if (verbose) - handler.notifyStreamIncomingConnection(i2ps.getPeerDestination()) ; + + if ( rec==null || i2ps==null ) throw new InterruptedIOException() ; + + if (verbose) + handler.notifyStreamIncomingConnection(i2ps.getPeerDestination()) ; handler.stealSocket() ; ReadableByteChannel fromClient = handler.getClientSocket(); @@ -171,8 +175,13 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi WritableByteChannel toClient = handler.getClientSocket(); WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); - (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P"), "SAMPipeClientToI2P")).start(); - (new Thread(rec.getThreadGroup(), new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient"), "SAMPipeI2PToClient")).start(); + SAMBridge bridge = handler.getBridge(); + (new Thread(rec.getThreadGroup(), + new Pipe(fromClient, toI2P, bridge), + "AcceptV3 SAMPipeClientToI2P")).start(); + (new Thread(rec.getThreadGroup(), + new Pipe(fromI2P, toClient, bridge), + "AcceptV3 SAMPipeI2PToClient")).start(); } @@ -210,10 +219,10 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi } SocketForwarder forwarder = new SocketForwarder(host, port, this, verbose); - (new Thread(rec.getThreadGroup(), new I2PAppThread(forwarder, "SAMStreamForwarder"), "SAMStreamForwarder")).start(); + (new Thread(rec.getThreadGroup(), forwarder, "SAMV3StreamForwarder")).start(); } - private static class SocketForwarder extends Thread + private static class SocketForwarder implements Runnable { private final String host; private final int port; @@ -261,8 +270,10 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi ReadableByteChannel fromI2P = Channels.newChannel(i2ps.getInputStream()); WritableByteChannel toClient = clientServerSock ; WritableByteChannel toI2P = Channels.newChannel(i2ps.getOutputStream()); - (new I2PAppThread(new Pipe(fromClient,toI2P, "SAMPipeClientToI2P"), "SAMPipeClientToI2P")).start(); - (new I2PAppThread(new Pipe(fromI2P,toClient, "SAMPipeI2PToClient"), "SAMPipeI2PToClient")).start(); + (new I2PAppThread(new Pipe(fromClient, toI2P, null), + "ForwardV3 SAMPipeClientToI2P")).start(); + (new I2PAppThread(new Pipe(fromI2P,toClient, null), + "ForwardV3 SAMPipeI2PToClient")).start(); } catch (IOException e) { try { @@ -277,48 +288,62 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi } } - private static class Pipe extends Thread + private static class Pipe implements Runnable, Handler { private final ReadableByteChannel in ; private final WritableByteChannel out ; private final ByteBuffer buf ; + private final SAMBridge bridge; - public Pipe(ReadableByteChannel in, WritableByteChannel out, String name) + /** + * @param bridge may be null + */ + public Pipe(ReadableByteChannel in, WritableByteChannel out, SAMBridge bridge) { - super(name); this.in = in ; this.out = out ; this.buf = ByteBuffer.allocate(BUFFER_SIZE) ; + this.bridge = bridge; } - public void run() - { - try { - while (!Thread.interrupted() && (in.read(buf)>=0 || buf.position() != 0)) { - buf.flip(); - out.write(buf); - buf.compact(); - } - } - catch (IOException e) - { - this.interrupt(); + public void run() { + if (bridge != null) + bridge.register(this); + try { + while (!Thread.interrupted() && (in.read(buf)>=0 || buf.position() != 0)) { + buf.flip(); + out.write(buf); + buf.compact(); } - try { - in.close(); - } - catch (IOException e) {} - try { - buf.flip(); - while (buf.hasRemaining()) - out.write(buf); - } - catch (IOException e) {} - try { - out.close(); - } - catch (IOException e) {} - } + } catch (IOException ioe) { + // ignore + } finally { + try { + in.close(); + } catch (IOException e) {} + try { + buf.flip(); + while (buf.hasRemaining()) { + out.write(buf); + } + } catch (IOException e) {} + try { + out.close(); + } catch (IOException e) {} + if (bridge != null) + bridge.unregister(this); + } + } + + /** + * Handler interface + * @since 0.9.20 + */ + public void stopHandling() { + try { + in.close(); + } catch (IOException e) {} + } } public I2PServerSocket getSocketServer() From b5455cee6ec0d44c8e0c859d6c7c331210425dd6 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 12 May 2015 20:13:17 +0000 Subject: [PATCH 013/258] SAM: Set keepalive on sockets (ticket #1573) Also on both sides of I2CP. BOB already does it. --- apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java | 1 + apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java | 1 + core/java/src/net/i2p/client/I2PSessionImpl.java | 2 ++ core/java/src/net/i2p/client/I2PSimpleSession.java | 1 + router/java/src/net/i2p/router/client/ClientListenerRunner.java | 1 + 5 files changed, 6 insertions(+) diff --git a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java index fff86fe75..582854d87 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java +++ b/apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java @@ -46,6 +46,7 @@ class SAMHandlerFactory { try { Socket sock = s.socket(); sock.setSoTimeout(HELLO_TIMEOUT); + sock.setKeepAlive(true); String line = DataHelper.readLine(sock.getInputStream()); sock.setSoTimeout(0); if (line == null) { diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java index a254d79a3..fe9561ced 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java @@ -263,6 +263,7 @@ class SAMv3StreamSession extends SAMStreamSession implements SAMv3Handler.Sessi // build pipes between both sockets try { + clientServerSock.socket().setKeepAlive(true); if (this.verbose) SAMv3Handler.notifyStreamIncomingConnection( clientServerSock, i2ps.getPeerDestination()); diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index ca193f77f..542e08809 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -488,6 +488,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 try { I2PSSLSocketFactory fact = new I2PSSLSocketFactory(_context, false, "certificates/i2cp"); _socket = fact.createSocket(_hostname, _portNum); + _socket.setKeepAlive(true); } catch (GeneralSecurityException gse) { IOException ioe = new IOException("SSL Fail"); ioe.initCause(gse); @@ -495,6 +496,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 } } else { _socket = new Socket(_hostname, _portNum); + _socket.setKeepAlive(true); } // _socket.setSoTimeout(1000000); // Uhmmm we could really-really use a real timeout, and handle it. OutputStream out = _socket.getOutputStream(); diff --git a/core/java/src/net/i2p/client/I2PSimpleSession.java b/core/java/src/net/i2p/client/I2PSimpleSession.java index b6f8bb7eb..ce0ef254f 100644 --- a/core/java/src/net/i2p/client/I2PSimpleSession.java +++ b/core/java/src/net/i2p/client/I2PSimpleSession.java @@ -89,6 +89,7 @@ class I2PSimpleSession extends I2PSessionImpl2 { } else { _socket = new Socket(_hostname, _portNum); } + _socket.setKeepAlive(true); OutputStream out = _socket.getOutputStream(); out.write(I2PClient.PROTOCOL_BYTE); out.flush(); diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index 8510fa071..e88339b0e 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -93,6 +93,7 @@ class ClientListenerRunner implements Runnable { if (validate(socket)) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Connection received"); + socket.setKeepAlive(true); runConnection(socket); } else { if (_log.shouldLog(Log.WARN)) From c58fd8f84ed576094265b20f10a6c3ef701b1d24 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 30 May 2015 15:46:37 +0000 Subject: [PATCH 014/258] i2ptunnel: Fix +/- variance config (ticket #1587) --- .../java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java | 5 +++-- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java index 755fc2719..17cb4e6ac 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java @@ -47,7 +47,8 @@ public class TunnelConfig { private String _i2cpPort; private int _tunnelDepth = -1; private int _tunnelQuantity = -1; - private int _tunnelVariance = -1; + // -2 or higher is valid + private int _tunnelVariance = -3; private int _tunnelBackupQuantity = -1; private boolean _connectDelay; private String _customOptions; @@ -801,7 +802,7 @@ public class TunnelConfig { config.setProperty("option.inbound.length", Integer.toString(_tunnelDepth)); config.setProperty("option.outbound.length", Integer.toString(_tunnelDepth)); } - if (_tunnelVariance >= 0) { + if (_tunnelVariance >= -2) { config.setProperty("option.inbound.lengthVariance", Integer.toString(_tunnelVariance)); config.setProperty("option.outbound.lengthVariance", Integer.toString(_tunnelVariance)); } diff --git a/history.txt b/history.txt index a8f316f19..878f30950 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-05-30 zzz + * i2ptunnel: Fix +/- variance config (ticket #1587) + 2015-05-29 zzz * HTTP client: Fix occasional truncation of compressed responses diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 98bd96d4e..fc03273f8 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 = 32; + public final static long BUILD = 33; /** for example "-test" */ public final static String EXTRA = "-rc"; From 4521156ecb39f1e01cd91d6c74db74f3a01951f0 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 31 May 2015 12:43:06 +0000 Subject: [PATCH 015/258] Fortuna: Catch AIOOBE (ticket #1576) --- core/java/src/net/i2p/util/FortunaRandomSource.java | 10 ++++++++-- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/java/src/net/i2p/util/FortunaRandomSource.java b/core/java/src/net/i2p/util/FortunaRandomSource.java index 340b836a4..9688e8764 100644 --- a/core/java/src/net/i2p/util/FortunaRandomSource.java +++ b/core/java/src/net/i2p/util/FortunaRandomSource.java @@ -262,8 +262,14 @@ public class FortunaRandomSource extends RandomSource implements EntropyHarveste /** reseed the fortuna */ @Override public void feedEntropy(String source, byte[] data, int offset, int len) { - synchronized(_fortuna) { - _fortuna.addRandomBytes(data, offset, len); + try { + synchronized(_fortuna) { + _fortuna.addRandomBytes(data, offset, len); + } + } catch (Exception e) { + // AIOOBE seen, root cause unknown, ticket #1576 + Log log = _context.logManager().getLog(FortunaRandomSource.class); + log.warn("feedEntropy()", e); } } diff --git a/history.txt b/history.txt index 878f30950..832911645 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-05-31 zzz + * Fortuna: Catch AIOOBE (ticket #1576) + 2015-05-30 zzz * i2ptunnel: Fix +/- variance config (ticket #1587) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fc03273f8..b76ab6863 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 = 33; + public final static long BUILD = 34; /** for example "-test" */ public final static String EXTRA = "-rc"; From 3c89bd4e193d589927ceaaecee2d10ef53ab5b1c Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 2 Jun 2015 12:00:59 +0000 Subject: [PATCH 016/258] 0.9.20 --- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 2 ++ installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index d189588ec..0aa44511d 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -18,7 +18,7 @@ public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.19"; + public final static String VERSION = "0.9.20"; /** * For Vuze. diff --git a/history.txt b/history.txt index 832911645..b5ffdbc6b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,5 @@ +* 2015-06-02 0.9.20 released + 2015-05-31 zzz * Fortuna: Catch AIOOBE (ticket #1576) diff --git a/installer/install.xml b/installer/install.xml index cdbf0a510..95ed4b1cd 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.19 + 0.9.20 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b76ab6863..a411b0099 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 34; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); From f57e37d588dfe99008ad322420526880de5c9867 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 12:02:25 +0000 Subject: [PATCH 017/258] comment fix --- core/java/src/net/i2p/util/I2PSSLSocketFactory.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java index 6c149252b..eecd608ab 100644 --- a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java +++ b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java @@ -301,7 +301,6 @@ public class I2PSSLSocketFactory { // is not a viable option because the default HostnameVerifier expects to only be called // in the case that there is a mismatch (and therefore always returns false) while some // of the AsyncHttpClient providers (e.g. Netty, the default) call it on all connections. - // in the case that there is a mismatch (and therefore always returns false) while some // To make matters worse, the check is not trivial (consider SAN and wildcard matching) // and is implemented in sun.security.util.HostnameChecker (a Sun internal proprietary API). // This leaves the developer in the position of either depending on an internal API or From 362086994a97691b0aa83ca7d73036998692a535 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 12:03:07 +0000 Subject: [PATCH 018/258] history for props, -1 --- history.txt | 32 +++++++++++++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/history.txt b/history.txt index b5ffdbc6b..546905432 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,35 @@ +2015-06-03 zzz +Prop from i2p.i2p.zzz.sam: + * I2CP: Set keepalive on sockets (ticket #1573) + * SAM: + - Close sockets and stop tunnels when router-side SAM stops (ticket #1572) + - Better checks for quoting status message strings (ticket #1488) + - Set encoding for sam.keys file + - Don't throw NPE on rare stream errors + - Comment out unused dumpProperties() + - Cleanups, log tweaks, thread name tweaks + - Set keepalive on sockets (ticket #1573) +Prop from i2p.i2p.zzz.test2: + * Console: + - Don't allow unbanning of all-zero hash + - Nicer "move" icons on /configsidebar, add tooltips + - Prevent bad line-wrap of very long menu items + * HTTP Client: Greatly simplify decompression by using InflaterOutputStream + * I2CP: Prevent sending messages before handshake with router is complete + * i2psnark: + - Add support for fast extensions (BEP 6) + - Don't say 'download finished' unless we downloaded something + - Don't lose sort param when hiding peers + * i2ptunnel: Strip top-level supercookies too + * LogWriter: Write dup message to wrapper log and crit buf also (ticket #1585) + * Reseed: Only log reseed network disconnected warning once + * Router: Add gzip and translate caches to clearCaches() + * Susidns, addressbook: Don't attempt to fetch subscriptions if + HTTP proxy is down (ticket #1530) + * SSU: More synchronization in PeerState + * Stats: Reduce number of rates in required stats to save memory + * UPnP: Only log network disconnected warning once + * 2015-06-02 0.9.20 released 2015-05-31 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b0099..87e5bffca 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 = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = ""; From 9304cb2bbc1ec6915e78488291e085d6e3e7b85d Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 12:33:42 +0000 Subject: [PATCH 019/258] SAM message quoting fix --- apps/sam/java/src/net/i2p/sam/SAMv1Handler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java index cf4d46b62..588d5f5e5 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java +++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java @@ -951,10 +951,10 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece msg = msg.replace("\r", " "); if (!msg.startsWith("\"")) { msg = msg.replace("\"", ""); - if (msg.contains("\"") || msg.contains("\t")) + if (msg.contains(" ") || msg.contains("\t")) msg = '"' + msg + '"'; } - rv = " MESSAGE=\"" + msg + "\""; + rv = " MESSAGE=" + msg; } else { rv = ""; } From e2ca74963f46c06dcbd8e8150f9fb1259b99a7a1 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 16:55:01 +0000 Subject: [PATCH 020/258] Console: Click on version or country in /netdb table to get list of those routers --- .../src/net/i2p/router/web/NetDbHelper.java | 18 ++++++++-- .../src/net/i2p/router/web/NetDbRenderer.java | 34 ++++++++++++++----- apps/routerconsole/jsp/netdb.jsp | 2 ++ 3 files changed, 44 insertions(+), 10 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 a72e2cd65..8cbd02304 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -5,6 +5,8 @@ import net.i2p.data.DataHelper; public class NetDbHelper extends HelperBase { private String _routerPrefix; + private String _version; + private String _country; private int _full; private boolean _lease; private boolean _debug; @@ -33,6 +35,18 @@ public class NetDbHelper extends HelperBase { _routerPrefix = DataHelper.stripHTML(r); // XSS } + /** @since 0.9.21 */ + public void setVersion(String v) { + if (v != null) + _version = DataHelper.stripHTML(v); // XSS + } + + /** @since 0.9.21 */ + public void setCountry(String c) { + if (c != null) + _country = DataHelper.stripHTML(c); // XSS + } + public void setFull(String f) { try { _full = Integer.parseInt(f); @@ -59,8 +73,8 @@ public class NetDbHelper extends HelperBase { NetDbRenderer renderer = new NetDbRenderer(_context); try { renderNavBar(); - if (_routerPrefix != null) - renderer.renderRouterInfoHTML(_out, _routerPrefix); + if (_routerPrefix != null || _version!= null || _country != null) + renderer.renderRouterInfoHTML(_out, _routerPrefix, _version, _country); else if (_lease) renderer.renderLeaseSetHTML(_out, _debug); else diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 01e465987..89b4a7000 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -78,7 +78,14 @@ public class NetDbRenderer { } } - public void renderRouterInfoHTML(Writer out, String routerPrefix) throws IOException { + /** + * One String must be non-null + * + * @param routerPrefix may be null. "." for our router only + * @param version may be null + * @param country may be null + */ + public void renderRouterInfoHTML(Writer out, String routerPrefix, String version, String country) throws IOException { StringBuilder buf = new StringBuilder(4*1024); if (".".equals(routerPrefix)) { renderRouterInfo(buf, _context.router().getRouterInfo(), true, true); @@ -87,13 +94,23 @@ public class NetDbRenderer { Set routers = _context.netDb().getRouters(); for (RouterInfo ri : routers) { Hash key = ri.getIdentity().getHash(); - if (key.toBase64().startsWith(routerPrefix)) { + if ((routerPrefix != null && key.toBase64().startsWith(routerPrefix)) || + (version != null && version.equals(ri.getVersion())) || + (country != null && country.equals(_context.commSystem().getCountry(key)))) { renderRouterInfo(buf, ri, false, true); notFound = false; } } - if (notFound) - buf.append(_("Router") + ' ').append(routerPrefix).append(' ' + _("not found in network database") ); + if (notFound) { + buf.append(_("Router")).append(' '); + if (routerPrefix != null) + buf.append(routerPrefix); + else if (version != null) + buf.append(version); + else if (country != null) + buf.append(country); + buf.append(' ').append(_("not found in network database")); + } } out.write(buf.toString()); out.flush(); @@ -320,8 +337,9 @@ public class NetDbRenderer { buf.append("" + _("Version") + "" + _("Count") + "\n"); for (String routerVersion : versionList) { int num = versions.count(routerVersion); - buf.append("").append(DataHelper.stripHTML(routerVersion)); - buf.append("").append(num).append("\n"); + String ver = DataHelper.stripHTML(routerVersion); + buf.append("").append(ver); + buf.append("").append(num).append("\n"); } buf.append("\n"); } @@ -353,9 +371,9 @@ public class NetDbRenderer { for (String country : countryList) { int num = countries.count(country); buf.append("\"").append(country.toUpperCase(Locale.US)).append("\""); "); + buf.append(" src=\"/flags.jsp?c=").append(country).append("\"> "); buf.append(getTranslatedCountry(country)); - buf.append("").append(num).append("\n"); + buf.append("").append(num).append("\n"); } buf.append("\n"); } diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index ccbbccfee..15231ec85 100644 --- a/apps/routerconsole/jsp/netdb.jsp +++ b/apps/routerconsole/jsp/netdb.jsp @@ -23,5 +23,7 @@ " /> " /> " /> + " /> + " /> From 657f13af29a0ad9d5578ac3befe4edb38858eb7c Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 17:25:25 +0000 Subject: [PATCH 021/258] Remove ConnectionManager ref from PacketQueue --- .../src/net/i2p/client/streaming/impl/Connection.java | 3 +++ .../i2p/client/streaming/impl/ConnectionManager.java | 2 +- .../src/net/i2p/client/streaming/impl/PacketQueue.java | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java index e25e4707c..c3b63d756 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java @@ -873,6 +873,9 @@ class Connection { */ public void setOptions(ConnectionOptions opts) { _options = opts; } + /** @since 0.9.21 */ + public ConnectionManager getConnectionManager() { return _connectionManager; } + public I2PSession getSession() { return _connectionManager.getSession(); } public I2PSocketFull getSocket() { return _socket; } public void setSocket(I2PSocketFull socket) { _socket = socket; } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index 3c9808945..55d9522bf 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -88,7 +88,7 @@ class ConnectionManager { // As of 0.9.1, listen on configured port (default 0 = all) int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY; _session.addMuxedSessionListener(_messageHandler, protocol, defaultOptions.getLocalPort()); - _outboundQueue = new PacketQueue(_context, _session, this); + _outboundQueue = new PacketQueue(_context, _session); _recentlyClosed = new LHMCache(32); /** Socket timeout for accept() */ _soTimeout = -1; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 51b8baef7..b2558b174 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -29,7 +29,6 @@ class PacketQueue implements SendMessageStatusListener { private final I2PAppContext _context; private final Log _log; private final I2PSession _session; - private final ConnectionManager _connectionManager; private final ByteCache _cache = ByteCache.getInstance(64, 36*1024); private final Map _messageStatusMap; private volatile boolean _dead; @@ -46,10 +45,9 @@ class PacketQueue implements SendMessageStatusListener { private static final long REMOVE_EXPIRED_TIME = 67*1000; private static final boolean ENABLE_STATUS_LISTEN = true; - public PacketQueue(I2PAppContext context, I2PSession session, ConnectionManager mgr) { + public PacketQueue(I2PAppContext context, I2PSession session) { _context = context; _session = session; - _connectionManager = mgr; _log = context.logManager().getLog(PacketQueue.class); _messageStatusMap = new ConcurrentHashMap(16); new RemoveExpired(); @@ -213,8 +211,10 @@ class PacketQueue implements SendMessageStatusListener { _log.debug(msg); } Connection c = packet.getConnection(); - String suffix = (c != null ? "wsize " + c.getOptions().getWindowSize() + " rto " + c.getOptions().getRTO() : null); - _connectionManager.getPacketHandler().displayPacket(packet, "SEND", suffix); + if (c != null) { + String suffix = "wsize " + c.getOptions().getWindowSize() + " rto " + c.getOptions().getRTO(); + c.getConnectionManager().getPacketHandler().displayPacket(packet, "SEND", suffix); + } if (I2PSocketManagerFull.pcapWriter != null && _context.getBooleanProperty(I2PSocketManagerFull.PROP_PCAP)) packet.logTCPDump(); From 27f56776ca2b56e95c73480f93a2d4ee1c51bf1a Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 3 Jun 2015 20:45:15 +0000 Subject: [PATCH 022/258] Console: Fix display of n/a for events that never happened on floodfill profiles --- .../router/web/ProfileOrganizerRenderer.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 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 1a5461246..ef70b170a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -227,28 +227,19 @@ class ProfileOrganizerRenderer { else buf.append(" "); buf.append("").append(num(prof.getIntegrationValue())).append(""); - long time; - time = now - prof.getLastHeardAbout(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - prof.getLastHeardFrom(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - prof.getLastSendSuccessful(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - prof.getLastSendFailed(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); + buf.append("").append(formatInterval(now, prof.getLastHeardAbout())).append(""); + buf.append("").append(formatInterval(now, prof.getLastHeardFrom())).append(""); + buf.append("").append(formatInterval(now, prof.getLastSendSuccessful())).append(""); + buf.append("").append(formatInterval(now, prof.getLastSendFailed())).append(""); buf.append("").append(avg(prof, 10*60*1000l, ra)).append(""); buf.append("").append(avg(prof, 60*60*1000l, ra)).append(""); buf.append("").append(avg(prof, 24*60*60*1000l, ra)).append(""); DBHistory dbh = prof.getDBHistory(); if (dbh != null) { - time = now - dbh.getLastLookupSuccessful(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - dbh.getLastLookupFailed(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - dbh.getLastStoreSuccessful(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); - time = now - dbh.getLastStoreFailed(); - buf.append("").append(DataHelper.formatDuration2(time)).append(""); + buf.append("").append(formatInterval(now, dbh.getLastLookupSuccessful())).append(""); + buf.append("").append(formatInterval(now, dbh.getLastLookupFailed())).append(""); + buf.append("").append(formatInterval(now, dbh.getLastStoreSuccessful())).append(""); + buf.append("").append(formatInterval(now, dbh.getLastStoreFailed())).append(""); buf.append("").append(davg(dbh, 60*60*1000l, ra)).append(""); buf.append("").append(davg(dbh, 24*60*60*1000l, ra)).append(""); } else { @@ -369,6 +360,13 @@ class ProfileOrganizerRenderer { return ((int) avg) + "%"; } + /** @since 0.9.21 */ + private String formatInterval(long now, long then) { + if (then <= 0) + return _(NA); + return DataHelper.formatDuration2(now - then); + } + /** translate a string */ private String _(String s) { return Messages.getString(s, _context); From 2590e7d4ff57f1beb0a42c087da1367ca4684ce7 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 4 Jun 2015 22:25:44 +0000 Subject: [PATCH 023/258] i2ptunnel: Don't connect manager to router in constructor (ticket #815) --- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 37 ++++++------------- history.txt | 4 ++ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 2d4d7e0dd..a2508224f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -119,9 +119,13 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna /** * The main constructor. - * - * As of 0.9.20 this is fast, and does NOT connect the manager to the router, + *

+ * As of 0.9.21 this is fast, and does NOT connect the manager to the router, * or open the local socket. You MUST call startRunning() for that. + *

+ * (0.9.20 claimed to be fast, but due to a bug it DID connect the manager + * to the router. It did NOT open the local socket however, so it was still + * necessary to call startRunning() for that.) * * @param localPort if 0, use any port, get actual port selected with getLocalPort() * @throws IllegalArgumentException if the I2CP configuration is b0rked so @@ -135,9 +139,13 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna /** * Use this to build a client with a persistent private key. - * - * As of 0.9.20 this is fast, and does NOT connect the manager to the router, + *

+ * As of 0.9.21 this is fast, and does NOT connect the manager to the router, * or open the local socket. You MUST call startRunning() for that. + *

+ * (0.9.20 claimed to be fast, but due to a bug it DID connect the manager + * to the router. It did NOT open the local socket however, so it was still + * necessary to call startRunning() for that.) * * @param localPort if 0, use any port, get actual port selected with getLocalPort() * @param pkf Path to the private key file, or null to generate a transient key @@ -178,27 +186,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true"); if (tunnel.getClientOptions().getProperty("i2p.streaming.answerPings") == null) tunnel.getClientOptions().setProperty("i2p.streaming.answerPings", "false"); - - boolean openNow = !Boolean.parseBoolean(tunnel.getClientOptions().getProperty("i2cp.delayOpen")); - if (openNow) { - while (sockMgr == null) { - verifySocketManager(); - if (sockMgr == null) { - _log.error("Unable to connect to router and build tunnels for " + handlerName); - // FIXME there is a loop in buildSocketManager(), do we really need another one here? - // no matter, buildSocketManager() now throws an IllegalArgumentException - try { Thread.sleep(10*1000); } catch (InterruptedException ie) {} - } - } - // can't be null unless we limit the loop above - //if (sockMgr == null) { - // l.log("Invalid I2CP configuration"); - // throw new IllegalArgumentException("Socket manager could not be created"); - //} - l.log("Tunnels ready for client: " + handlerName); - - } // else delay creating session until createI2PSocket() is called - } /** diff --git a/history.txt b/history.txt index 546905432..3b9056260 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-06-04 str4d + * i2ptunnel: + - Don't connect manager to router in constructor (ticket #815) + 2015-06-03 zzz Prop from i2p.i2p.zzz.sam: * I2CP: Set keepalive on sockets (ticket #1573) From 09cdc0093981691e3f3923f0522220fb0ce1ba89 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 4 Jun 2015 22:34:13 +0000 Subject: [PATCH 024/258] i2ptunnel: Don't call startup() in chained constructor (ticket #1593) --- .../src/net/i2p/i2ptunnel/I2PTunnelClientBase.java | 11 ++++++----- history.txt | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index a2508224f..19984db02 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -90,8 +90,11 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna public static final String PROP_USE_SSL = I2PTunnelServer.PROP_USE_SSL; /** - * This constructor always starts the tunnel (ignoring the i2cp.delayOpen option). - * It is used to add a client to an existing socket manager. + * This constructor is used to add a client to an existing socket manager. + *

+ * As of 0.9.21 this does NOT open the local socket. You MUST call + * {@link #startRunning()} for that. The local socket will be opened + * immediately (ignoring the i2cp.delayOpen option). * * @param localPort if 0, use any port, get actual port selected with getLocalPort() * @param sktMgr the existing socket manager @@ -113,8 +116,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna _context.statManager().createRateStat("i2ptunnel.client.manageTime", "How long it takes to accept a socket and fire it into an i2ptunnel runner (or queue it for the pool)?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); _log = _context.logManager().getLog(getClass()); - - startup(); } /** @@ -523,7 +524,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna if (open && listenerReady) { boolean openNow = !Boolean.parseBoolean(getTunnel().getClientOptions().getProperty("i2cp.delayOpen")); - if (openNow) + if (openNow || chained) l.log("Client ready, listening on " + getTunnel().listenHost + ':' + localPort); else l.log("Client ready, listening on " + getTunnel().listenHost + ':' + localPort + ", delaying tunnel open until required"); diff --git a/history.txt b/history.txt index 3b9056260..9d3a0af95 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,7 @@ 2015-06-04 str4d * i2ptunnel: - Don't connect manager to router in constructor (ticket #815) + - Don't call startup() in chained constructor (ticket #1593) 2015-06-03 zzz Prop from i2p.i2p.zzz.sam: From 78e0a37fc9469fca237ea1b813e52ecaacd96bf6 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 4 Jun 2015 22:36:45 +0000 Subject: [PATCH 025/258] Define I2PTunnelClientBase stats in one place --- .../i2p/i2ptunnel/I2PTunnelClientBase.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 19984db02..697206325 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -111,10 +111,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna this.l = l; _ownDest = true; // == ! shared client _context = tunnel.getContext(); - _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.closeNoBacklog", "How many pending sockets remain when it was removed prior to backlog timeout?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.manageTime", "How long it takes to accept a socket and fire it into an i2ptunnel runner (or queue it for the pool)?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + initStats(); _log = _context.logManager().getLog(getClass()); } @@ -165,10 +162,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna _handlerName = handlerName; _context = tunnel.getContext(); - _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.closeNoBacklog", "How many pending sockets remain when it was removed prior to backlog timeout?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.manageTime", "How long it takes to accept a socket and fire it into an i2ptunnel runner (or queue it for the pool)?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); - _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + initStats(); _log = _context.logManager().getLog(getClass()); // normalize path so we can find it @@ -188,7 +182,14 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna if (tunnel.getClientOptions().getProperty("i2p.streaming.answerPings") == null) tunnel.getClientOptions().setProperty("i2p.streaming.answerPings", "false"); } - + + private void initStats() { + _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + _context.statManager().createRateStat("i2ptunnel.client.closeNoBacklog", "How many pending sockets remain when it was removed prior to backlog timeout?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + _context.statManager().createRateStat("i2ptunnel.client.manageTime", "How long it takes to accept a socket and fire it into an i2ptunnel runner (or queue it for the pool)?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + _context.statManager().createRateStat("i2ptunnel.client.buildRunTime", "How long it takes to run a queued socket into an i2ptunnel runner?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 }); + } + /** * Create the manager if it doesn't exist, AND connect it to the router and * build tunnels. From 663ccb72d72904385b7dfe941fd459c1420dad79 Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 5 Jun 2015 01:53:52 +0000 Subject: [PATCH 026/258] Bump router version --- 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 87e5bffca..282c18b42 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 = ""; From 7c13fb2ba0d16b64c32efa0801c1dffc204f57ee Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 6 Jun 2015 09:24:46 +0000 Subject: [PATCH 027/258] Android's SimpleDateFormat doesn't support XXX at any API --- .../java/src/net/i2p/router/news/RFC3339Date.java | 5 +++-- history.txt | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java b/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java index cc676be24..6dac0b89f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/RFC3339Date.java @@ -29,7 +29,8 @@ public abstract class RFC3339Date { private static final String TZF1, TZF2; static { - if (SystemVersion.isJava7()) { + // Android's SimpleDateFormat doesn't support XXX at any API + if (SystemVersion.isJava7() && !SystemVersion.isAndroid()) { // ISO 8601 // These handle timezones like +1000, +10, and +10:00 TZF1 = "yyyy-MM-dd'T'HH:mm:ssXXX"; @@ -81,7 +82,7 @@ public abstract class RFC3339Date { // strip the ':' out of the time zone, if present, // for Java 6 where we don't have the 'X' format int len = s.length(); - if (!SystemVersion.isJava7() && + if ((!SystemVersion.isJava7() || SystemVersion.isAndroid()) && s.charAt(len - 1) != 'Z' && s.charAt(len - 3) == ':' && (s.charAt(len - 6) == '+' || s.charAt(len - 6) == '-')) { diff --git a/history.txt b/history.txt index 9d3a0af95..2daecfd2d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-06-06 str4d + * newsxml: Don't use XXX for parsing dates on Android + 2015-06-04 str4d * i2ptunnel: - Don't connect manager to router in constructor (ticket #815) From 55e36ee4588265aa03dbedd1a63693f7c626b94b Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 6 Jun 2015 16:01:39 +0000 Subject: [PATCH 028/258] Console: Add indication of current ff status on /configadvanced, change immediately when config changes, force republish Router: RI rebuild locking --- .../i2p/router/web/ConfigAdvancedHandler.java | 9 +++++++ .../i2p/router/web/ConfigAdvancedHelper.java | 5 ++++ apps/routerconsole/jsp/configadvanced.jsp | 11 +++++++- router/java/src/net/i2p/router/Router.java | 26 ++++++++++++++++--- .../FloodfillNetworkDatabaseFacade.java | 2 +- 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java index 345f17b0d..88735e286 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java @@ -7,6 +7,7 @@ import java.util.Properties; import java.util.Set; import net.i2p.data.DataHelper; +import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; /** * Handler to deal with form submissions from the advanced config form and act @@ -83,6 +84,14 @@ public class ConfigAdvancedHandler extends FormHandler { /** @since 0.9.20 */ private void saveFF() { boolean saved = _context.router().saveConfig(ConfigAdvancedHelper.PROP_FLOODFILL_PARTICIPANT, _ff); + if (_ff.equals("false") || _ff.equals("true")) { + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); + boolean wasFF = fndf.floodfillEnabled(); + boolean isFF = _ff.equals("true"); + fndf.setFloodfillEnabled(isFF); + if (wasFF != isFF) + _context.router().rebuildRouterInfo(); + } if (saved) addFormNotice(_("Configuration saved successfully")); else diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java index c64cb2e5a..0ee5c0b4f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java @@ -35,4 +35,9 @@ public class ConfigAdvancedHelper extends HelperBase { return CHECKED; return ""; } + + /** @since 0.9.21 */ + public boolean isFloodfill() { + return _context.netDb().floodfillEnabled(); + } } diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 637020405..961ac83fa 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -25,7 +25,16 @@

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

-

<%=intl._("Floodill participation helps the network, but may use more of your computer's resources.")%>

+

<%=intl._("Floodill participation helps the network, but may use more of your computer's resources.")%> +

+<% + if (advancedhelper.isFloodfill()) { +%><%=intl._("This router is currently a floodfill participant.")%><% + } else { +%><%=intl._("This router is not currently a floodfill participant.")%><% + } +%> +

diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 68621597e..b2029f923 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -72,6 +72,7 @@ public class Router implements RouterClock.ClockShiftListener { /** full path */ private String _configFilename; private RouterInfo _routerInfo; + private final Object _routerInfoLock = new Object(); /** not for external use */ public final Object routerInfoFileLock = new Object(); private final Object _configFileLock = new Object(); @@ -489,14 +490,20 @@ public class Router implements RouterClock.ClockShiftListener { * Our current router info. * Warning, may be null if called very early. */ - public RouterInfo getRouterInfo() { return _routerInfo; } + public RouterInfo getRouterInfo() { + synchronized (_routerInfoLock) { + return _routerInfo; + } + } /** * Caller must ensure info is valid - no validation done here. * Not for external use. */ public void setRouterInfo(RouterInfo info) { - _routerInfo = info; + synchronized (_routerInfoLock) { + _routerInfo = info; + } if (_log.shouldLog(Log.INFO)) _log.info("setRouterInfo() : " + info, new Exception("I did it")); if (info != null) @@ -817,7 +824,17 @@ public class Router implements RouterClock.ClockShiftListener { public void rebuildRouterInfo(boolean blockingRebuild) { if (_log.shouldLog(Log.INFO)) _log.info("Rebuilding new routerInfo"); + synchronized (_routerInfoLock) { + locked_rebuildRouterInfo(blockingRebuild); + } + } + + /** + * Rebuild and republish our routerInfo since something significant + * has changed. + */ + private void locked_rebuildRouterInfo(boolean blockingRebuild) { RouterInfo ri = null; if (_routerInfo != null) ri = new RouterInfo(_routerInfo); @@ -957,7 +974,10 @@ public class Router implements RouterClock.ClockShiftListener { } public boolean isHidden() { - RouterInfo ri = _routerInfo; + RouterInfo ri; + synchronized (_routerInfoLock) { + ri = _routerInfo; + } if ( (ri != null) && (ri.isHidden()) ) return true; String h = _context.getProperty(PROP_HIDDEN_HIDDEN); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index a02013a5f..de0a6639f 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -277,7 +277,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad @Override protected PeerSelector createPeerSelector() { return new FloodfillPeerSelector(_context); } - synchronized void setFloodfillEnabled(boolean yes) { + public synchronized void setFloodfillEnabled(boolean yes) { _floodfillEnabled = yes; if (yes && _floodThrottler == null) { _floodThrottler = new FloodThrottler(); From 9f2ded6073fa2271c9cbe47d54447814054d526e Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 6 Jun 2015 20:53:33 +0000 Subject: [PATCH 029/258] cleanup --- core/java/src/net/i2p/I2PAppContext.java | 1 - router/java/src/net/i2p/router/RouterContext.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index f7e2d7699..b59a40586 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -23,7 +23,6 @@ import net.i2p.data.Base64; import net.i2p.data.RoutingKeyGenerator; import net.i2p.internal.InternalClientManager; import net.i2p.stat.StatManager; -import net.i2p.update.UpdateManager; import net.i2p.util.Clock; import net.i2p.util.ConcurrentHashSet; import net.i2p.util.FileUtil; diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 31dbb49b3..87bc22b0b 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -28,7 +28,6 @@ import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.router.transport.OutboundMessageRegistry; import net.i2p.router.tunnel.TunnelDispatcher; import net.i2p.router.tunnel.pool.TunnelPoolManager; -import net.i2p.update.UpdateManager; import net.i2p.util.KeyRing; import net.i2p.util.I2PProperties.I2PPropertyCallback; import net.i2p.util.SystemVersion; @@ -64,7 +63,6 @@ public class RouterContext extends I2PAppContext { private Banlist _banlist; private Blocklist _blocklist; private MessageValidator _messageValidator; - private UpdateManager _updateManager; //private MessageStateMonitor _messageStateMonitor; private RouterThrottle _throttle; private RouterAppManager _appManager; From fb131a040c3e56cb76cf4040fae15d0d7a1393af Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 6 Jun 2015 20:54:13 +0000 Subject: [PATCH 030/258] fix snark sort by rate of stopped torrents --- apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index 63da5f296..7f5e8a4f0 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -322,16 +322,22 @@ class PeerCoordinator implements PeerListener */ public long getDownloadRate() { + if (halted) + return 0; return getRate(downloaded_old); } public long getUploadRate() { + if (halted) + return 0; return getRate(uploaded_old); } public long getCurrentUploadRate() { + if (halted) + return 0; // no need to synchronize, only one value long r = uploaded_old[0]; if (r <= 0) From f6f051cfa43687a5116ac871d0fbdfd01f3d4b90 Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 6 Jun 2015 21:31:38 +0000 Subject: [PATCH 031/258] remove unneeded user-tmp abstraction; tighten tmpdir perms --- debian/apparmor/i2p | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p index 2b548fcb4..5d4ad3403 100644 --- a/debian/apparmor/i2p +++ b/debian/apparmor/i2p @@ -5,7 +5,6 @@ #include #include #include - #include network inet stream, network inet6 stream, @@ -51,8 +50,9 @@ /usr/share/java/wrapper*.jar r, # 'm' is needed by the I2P-Bote plugin - /{,var/}tmp/ rwm, - owner /{,var/}tmp/** rwklm, + /{,lib/live/mount/overlay/}tmp/ rwm, + owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/ rwm, + owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/** rwklm, # Prevent spamming the logs deny /dev/tty rw, From bc6b0c12aca31d719e1b025d8755fb3422570d11 Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 6 Jun 2015 21:33:51 +0000 Subject: [PATCH 032/258] update debian changelog to reflect the latest release --- debian/changelog | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/debian/changelog b/debian/changelog index fcc4669a9..860e523b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,54 @@ +i2p (0.9.20-1) unstable; urgency=medium + + * New Upstream Version + - Add support for address book export + - Add support for SSL in HTTP server tunnel + - Allow class 'M' (64-128 KBps share bandwidth) to become floodfill + - Raise connection limits for new classes 'P' (512-2000 KBps share + bandwidth) and 'X' (over 2000 KBps) + - Add support for signed development builds + - Clock skew fixes + - Fixes and configuration for when IPv4 is firewalled but IPv6 still works + - Locking fixes for i2ptunnel clients to prevent hangs at startup + - Verify hostnames when reseeding + - Fix deletion of config files for deleted torrents in i2psnark + - Fix hangs fetching proxy.i2p local resources via Privoxy + - Fixes for duplicate shared clients + - Fix for occasional page truncation in HTTP client + - Fixes for handling corrupted SSU packets + - Fix closing of SAM sessions when I2P session closes + - Reduce NTCP threads + - Eliminate SimpleScheduler threads + - Add continent-based NTP servers as fallbacks for country-based ones + - Remove all default non-SSL reseed hosts + - Disable fallback to non-su3 reseeding + - Several fixes in streaming for better "loopback" performance, + may or may not help in real world + - Reduce latency in i2ptunnel + - Add a larger Bloom filter for very high bandwidth and memory + - Add Bloom filter warning when configured for high bandwidth but not + enough memory + - Reduce max netdb search depth to reduce floodfill load + - Improved header processing and error handling in i2ptunnel HTTP server + - Better error handling and user feedback when HTTP client tunnel is + disabled + - More changes to improve floodfill capacity + - New configuration for forcing IPv4 (only) to firewalled on /confignet + - New configuration for floodfill on /configadvanced + - Show separate IPv4 and IPv6 status in summary bar when appropriate + - Better handling of corrupt SSU packets + - Jetty 8.1.17.v20150415 + - Translation updates + - Update GeoIP data (new installs and PPA only) + + -- Kill Your TV Tue, 02 Jun 2015 18:36:42 +0000 + +i2p (0.9.19-4) unstable; urgency=medium + + * Re-enable systemd unit file + + -- Kill Your TV Thu, 30 Apr 2015 22:54:56 +0000 + i2p (0.9.19-3) unstable; urgency=medium * A couple more apparmor profile tweaks From 0936a2ee235a647eb840ff5af0126ff437c0080e Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 6 Jun 2015 21:36:24 +0000 Subject: [PATCH 033/258] disable 193.150.121.66 (ticket #1596) --- router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 4d4d85468..3830db6d4 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -92,7 +92,8 @@ public class Reseeder { "https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support "https://i2p.mooo.com/netDb/" + "," + - "https://193.150.121.66/netDb/" + "," + + // ticket #1596 + // "https://193.150.121.66/netDb/" + "," + "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support, SNI required "https://us.reseed.i2p2.no:444/" + "," + "https://uk.reseed.i2p2.no:444/" + "," + From 384e9118c6c62ac74f9a77d4a101edfda872b18b Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 7 Jun 2015 12:44:29 +0000 Subject: [PATCH 034/258] Logs: Correct wrapper.config location when running as a Linux service --- .../src/net/i2p/router/tasks/OOMListener.java | 15 +++++++++++++-- .../i2p/router/tunnel/BloomFilterIVValidator.java | 12 +++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/tasks/OOMListener.java b/router/java/src/net/i2p/router/tasks/OOMListener.java index d30365993..7f09f677d 100644 --- a/router/java/src/net/i2p/router/tasks/OOMListener.java +++ b/router/java/src/net/i2p/router/tasks/OOMListener.java @@ -8,6 +8,7 @@ import net.i2p.router.RouterContext; import net.i2p.router.util.EventLog; import net.i2p.util.I2PThread; import net.i2p.util.Log; +import net.i2p.util.SystemVersion; /** * Kaboom @@ -48,9 +49,19 @@ public class OOMListener implements I2PThread.OOMEventListener { log.log(Log.CRIT, "Thread ran out of memory, shutting down I2P", oom); log.log(Log.CRIT, "free mem: " + Runtime.getRuntime().freeMemory() + " total mem: " + Runtime.getRuntime().totalMemory()); - if (_context.hasWrapper()) + if (_context.hasWrapper()) { + // Can't find any System property or wrapper property that gives + // you the actual config file path, have to guess + String path; + if (!SystemVersion.isWindows() && !SystemVersion.isMac() && + "i2psvc".equals(System.getProperty("user.name"))) { + path = "/etc/i2p"; + } else { + path = _context.getBaseDir().toString(); + } log.log(Log.CRIT, "To prevent future shutdowns, increase wrapper.java.maxmemory in " + - _context.getBaseDir() + File.separatorChar + "wrapper.config"); + path + File.separatorChar + "wrapper.config"); + } } catch (OutOfMemoryError oome) {} try { ThreadDump.dump(_context, 1); diff --git a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java index 0c872fea6..beb6ec438 100644 --- a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java @@ -96,12 +96,22 @@ class BloomFilterIVValidator implements IVValidator { private void warn(long maxMemory, int KBps, long recMaxMem, int threshKBps) { if (SystemVersion.isAndroid()) return; + // Can't find any System property or wrapper property that gives + // you the actual config file path, have to guess + // TODO if !SystemVersion.hasWrapper ... + String path; + if (!SystemVersion.isWindows() && !SystemVersion.isMac() && + "i2psvc".equals(System.getProperty("user.name"))) { + path = "/etc/i2p"; + } else { + path = _context.getBaseDir().toString(); + } String msg = "Configured for " + DataHelper.formatSize(KBps *1024) + "Bps share bandwidth but only " + DataHelper.formatSize(maxMemory) + "B available memory." + " Recommend increasing wrapper.java.maxmemory in " + - _context.getBaseDir() + File.separatorChar + "wrapper.config" + + path + File.separatorChar + "wrapper.config" + // getMaxMemory() returns significantly lower than wrapper config, so add 10% " to at least " + (recMaxMem * 11 / 10 / (1024*1024)) + " (MB)" + " if the actual share bandwidth exceeds " + From 9041a2c69f7d94b97efd3807dadfbd2ce274586a Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 7 Jun 2015 14:13:58 +0000 Subject: [PATCH 035/258] SSU: Possible fix for NPE in establisher --- .../router/transport/udp/EstablishmentManager.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java index fce85e926..89076f9ce 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -850,11 +850,20 @@ class EstablishmentManager { if (_log.shouldLog(Log.WARN)) _log.warn("Peer " + state + " sent us an invalid DH parameter", ippe); _inboundStates.remove(state.getRemoteHostId()); + state.fail(); return; } - _transport.send(_builder.buildSessionCreatedPacket(state, + UDPPacket pkt = _builder.buildSessionCreatedPacket(state, _transport.getExternalPort(state.getSentIP().length == 16), - _transport.getIntroKey())); + _transport.getIntroKey()); + if (pkt == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Peer " + state + " sent us an invalid IP?"); + _inboundStates.remove(state.getRemoteHostId()); + state.fail(); + return; + } + _transport.send(pkt); state.createdPacketSent(); } From e8f4e19bac84ede911e3399b0012962cc0063499 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 7 Jun 2015 16:29:41 +0000 Subject: [PATCH 036/258] NetDB: Fix early NPE --- .../networkdb/kademlia/FloodfillNetworkDatabaseFacade.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index de0a6639f..7c1442e20 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -173,7 +173,8 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad * @since 0.7.11 */ boolean shouldThrottleLookup(Hash from, TunnelId id) { - return _lookupThrottler.shouldThrottle(from, id); + // null before startup + return _lookupThrottler == null || _lookupThrottler.shouldThrottle(from, id); } /** From fa8c39026762a3caf3ac8ea2d71cb834badcbd9e Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 8 Jun 2015 16:14:08 +0000 Subject: [PATCH 037/258] Language fixups. --- .../i2p/util/ResettableGZIPInputStream.java | 2 +- history.txt | 109 +++++++++--------- .../src/net/i2p/data/i2np/DataMessage.java | 2 +- .../i2p/data/i2np/DeliveryInstructions.java | 4 +- .../net/i2p/data/i2np/I2NPMessageReader.java | 2 +- .../i2p/data/i2np/TunnelGatewayMessage.java | 4 +- .../net/i2p/data/i2np/UnknownI2NPMessage.java | 2 +- .../src/net/i2p/data/router/RouterInfo.java | 2 +- router/java/src/net/i2p/router/Banlist.java | 4 +- router/java/src/net/i2p/router/JobQueue.java | 2 +- .../src/net/i2p/router/JobQueueRunner.java | 2 +- router/java/src/net/i2p/router/Router.java | 2 +- .../net/i2p/router/dummy/VMCommSystem.java | 2 +- .../router/message/SendMessageDirectJob.java | 2 +- .../FloodfillNetworkDatabaseFacade.java | 2 +- .../kademlia/IterativeLookupJob.java | 2 +- .../KademliaNetworkDatabaseFacade.java | 2 +- .../kademlia/PersistentDataStore.java | 2 +- .../router/networkdb/kademlia/SearchJob.java | 8 +- .../kademlia/SearchUpdateReplyFoundJob.java | 2 +- .../networkdb/kademlia/SingleLookupJob.java | 2 +- .../peermanager/CapacityCalculator.java | 2 +- .../i2p/router/peermanager/PeerTestJob.java | 6 +- .../i2p/router/startup/LoadRouterInfoJob.java | 2 +- .../net/i2p/router/transport/GetBidsJob.java | 2 +- .../transport/OutboundMessageRegistry.java | 4 +- .../i2p/router/transport/TransportImpl.java | 6 +- .../router/transport/TransportManager.java | 2 +- .../transport/ntcp/NTCPSendFinisher.java | 2 +- .../i2p/router/transport/udp/ACKSender.java | 2 +- .../udp/OutboundMessageFragments.java | 2 +- .../router/tunnel/BatchedPreprocessor.java | 2 +- .../i2p/router/tunnel/FragmentHandler.java | 2 +- .../i2p/router/tunnel/FragmentedMessage.java | 4 +- .../tunnel/InboundGatewayProcessor.java | 2 +- .../tunnel/InboundMessageDistributor.java | 2 +- .../i2p/router/tunnel/TunnelDispatcher.java | 4 +- .../i2p/router/tunnel/pool/BuildHandler.java | 2 +- .../i2p/router/tunnel/pool/TunnelPool.java | 2 +- 39 files changed, 107 insertions(+), 104 deletions(-) diff --git a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java index a25e54d6e..645bd29f3 100644 --- a/core/java/src/net/i2p/util/ResettableGZIPInputStream.java +++ b/core/java/src/net/i2p/util/ResettableGZIPInputStream.java @@ -110,7 +110,7 @@ public class ResettableGZIPInputStream extends InflaterInputStream { //if (_lookaheadStream.getEOFReached()) { if (inf.finished()) { verifyFooter(); - inf.reset(); // so it doesn't bitch about missing data... + inf.reset(); // so it doesn't complain about missing data... _complete = true; } return read; diff --git a/history.txt b/history.txt index 2daecfd2d..1f8e402b9 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-06-08 dg + * Language fixes + 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android @@ -4347,7 +4350,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Use new synchronized change-and-save-config methods to eliminate races with ReadConfigJob * Tunnels: - - When a peer is shitlisted, fail all our tunnels where + - When a peer is banlisted, fail all our tunnels where that peer is the adjacent hop. In particular this will remove outbound tunnels when we can't contact the first hop, and enable quicker recovery. @@ -4866,7 +4869,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2011-09-30 zzz * logs.jsp: Add wrapper version - * Shitlist: Shorten time + * Banlist: Shorten time * Wrapper: Update armv7 to 3.5.12 2011-09-30 kytv @@ -4957,7 +4960,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel tunnels from being expired and causing high CPU usage 2011-09-08 zzz - * Blocklist: Include IP in shitlist reason + * Blocklist: Include IP in banlist reason * Ministreaming: Drop old classes replaced by streaming years ago. * NTCP: Hopefully fix race NPE, thx devzero @@ -7129,7 +7132,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * Transport clock skews: - Store and report UDP clock skews even for large values, so a badly skewed local clock will be reported to the console - - Don't shitlist for NTCP clock skew if we don't know what time it is + - Don't banlist for NTCP clock skew if we don't know what time it is - If NTP hasn't worked yet, have NTCP or SSU update the clock one time - Include failed clock skew in NTCP skew vector if there aren't many connections - Don't include NTCP clock skews for non-established connections @@ -7491,7 +7494,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * addressbook: Move class to net.i2p.addressbook * build: Take two test scripts out of the installer * i2psnark: Bye TPB - * Shitlist: Fix bug from two checkins ago, all were forever + * Banlist: Fix bug from two checkins ago, all were forever 2009-11-14 zzz * HTTP Proxy: @@ -7506,7 +7509,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2009-11-11 zzz * Console: Some colon cleansing * FloodfillPeerSelector: Adjustments - * Shitlist: Move HTML renderer to router console, + * Banlist: Move HTML renderer to router console, add cause parameter for ease of translation, tag all causes @@ -7854,13 +7857,13 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * logs.jsp: Add system encoding * Ministreaming: Cleanups, deprecation, move demos out of the lib * netdb.jsp: Flags for leases - * NTCP: Clean up clock skew shitlist message + * NTCP: Clean up clock skew banlist message * profiles.jsp: - Rename the Failing column - Reduce the time cutoff again to 90m (was 2h) * readme*html: localhost -> 127.0.0.1 * Router: Don't do some things when we are shutting down - * Shitlist: Clean up expire message + * Banlist: Clean up expire message * Stats: - Fix BufferedStatsLog so it works at all - Don't instantiate BufferedStatsLog unless stats.logFilters @@ -7926,7 +7929,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel including our own 2) It randomly dies after a while * Console: - - Rename the shitlist and the blocklist + - Rename the banlist and the blocklist - Try to reduce servlet problems on iframe - Select server or client icon for local dests * EepHead: New @@ -8661,7 +8664,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel spiff up tunnels.jsp and profiles.jsp. Existing installs can get files with 'ant updaterWIthGeoIP' or in the console docs bundle 'ant consoleDocs' - - Use flags for shitlist and peers.jsp too + - Use flags for banlist and peers.jsp too - Tweak tunnels.jsp to show class letters - Hide in-progress details on tunnels.jsp - Add a little color to confignav @@ -9142,7 +9145,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Plug in-progress build leak 2009-02-07 zzz - * ClientConnectionRunner, Shitlist, TunnelDispatcher: + * ClientConnectionRunner, Banlist, TunnelDispatcher: Update using concurrent * Streaming ConnectionHandler: Bound SYN queue and use concurrent to prevent blowup @@ -9290,13 +9293,13 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Floodfills periodically shuffle their KBuckets, and FloodfillPeerSelector sorts more keys, so that exploration works well - * Shitlist: Reduce max time to 30m (was 60m) + * Banlist: Reduce max time to 30m (was 60m) * Streaming: - Reduce default initial window size from 12 to 6, to account for the MTU increase in the last release and try to limit initial packet loss - Reduce fast retransmit threshold from 3 to 2 - * Transport: Don't shitlist a peer if we are at our + * Transport: Don't banlist a peer if we are at our connection limit 2009-01-03 zzz @@ -9420,7 +9423,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-11-21 zzz * Cache DNS and negative DNS for 5m (was 1m and forever) - * Delay shitlist cleaner at startup + * Delay banlist cleaner at startup * Strip wrapper properties from client config * Define multiple cert type * Prohibit negative maxSends in streaming @@ -9628,7 +9631,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * configpeer.jsp: Add blocklist info * help.jsp: Add link to German FAQ * tunnels.jsp: Fix inactive participating count - * SearchReplyJob: Don't look up references to shitlisted peers + * SearchReplyJob: Don't look up references to banlisted peers * TunnelPeerSelector: Avoid a peer for 20s after a reject or timeout 2008-09-20 zzz @@ -9691,7 +9694,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-09-06 zzz * EepGet command line: Fix byte counts after a failed resume * NTCP: Mark unreachable on outbound connection timeout - * Shitlist: Fix partial shitlisting (still unused though) + * Banlist: Fix partial banlisting (still unused though) * Summary Bar: Warn if firewalled and floodfill * Throttle: Combine current and last bw measurement, reduce default max tunnels to 2500 (was 3000) @@ -9735,16 +9738,16 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-08-04 zzz * Floodfill Peer Selector: - Avoid peers whose netdb is old, or have a recent failed store, - or are forever-shitlisted + or are forever-banlisted 2008-07-30 zzz * Blocklists: - New, disabled by default, except for blocking of - forever-shitlisted peers. See source for instructions + forever-banlisted peers. See source for instructions and file format. * Transport - Reject peers from inbound connections: - Check IP against blocklist - - Check router hash against forever-shitlist, then block IP + - Check router hash against forever-banlist, then block IP 2008-07-16 zzz * configpeer.jsp: New @@ -9776,7 +9779,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel - Change some logging from WARN to INFO - Clean up toString() * SSU: - - Try to pick better introducers by checking shitlist, + - Try to pick better introducers by checking banlist, wasUnreachable list, failing list, and idle times - To keep introducer connections up and valid, periodically send a "ping" (a data packet with no data and no acks) @@ -9863,8 +9866,8 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-06-07 zzz * NetDb: Tweak some logging on lease problems - * Shitlist: - - Add shitlistForever() and isShitlistedForever(), unused for now + * Banlist: + - Add banlistForever() and isBanlistedForever(), unused for now - Sort the HTML output by router hash * netdb.jsp: - Sort the lease HTML output by dest hash, local first @@ -9906,7 +9909,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel (for SAM for example). Defaults to true of course. * Logging: Move common WARN output to DEBUG so we can ask users to set the default log level to WARN without massive spewage - * ProfileOrganizer: Restrict !isSelectable() (i.e. shitlisted) peers from the High Capacity tier, + * ProfileOrganizer: Restrict !isSelectable() (i.e. banlisted) peers from the High Capacity tier, not just the Fast tier, since we don't use them for tunnels anyway * SAM: Add some compiler flexibility to two obscure makefiles * i2psnark: Change displayed peer idents to match that shown by bytemonsoon @@ -10069,7 +10072,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-04-17 zzz * Reachability: - Track unreachable peers persistently - (i.e. separately from shitlist, and not cleared when they contact us) + (i.e. separately from banlist, and not cleared when they contact us) - Exclude detected unreachable peers from inbound tunnels - Exclude detected unreachable peers from selected leases - Exclude detected unreachable floodfill peers from lookups @@ -10077,15 +10080,15 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-04-16 zzz * SSU/Reachability: - - Extend shitlist time from 4-8m to 40-60m - - Add some shitlist logging - - Don't shitlist twice when unreachable on all transports + - Extend banlist time from 4-8m to 40-60m + - Add some banlist logging + - Don't banlist twice when unreachable on all transports - Exclude netDb-listed unreachable peers from inbound tunnels; this won't help much since there are very few of these now - Remove 10s delay on inbound UDP connections used for the 0.6.1.10 transition - Track and display UDP connection direction on peers.jsp - - Show shitlist status in-line on profiles.jsp + - Show banlist status in-line on profiles.jsp 2008-04-15 zzz * SSU Reachability/PeerTestManager: @@ -10183,7 +10186,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2008-03-14 zzz * Floodfill Search: - - Prefer heard-from, unfailing, unshitlisted floodfill peers + - Prefer heard-from, unfailing, unbanlisted floodfill peers 2008-03-14 zzz * ProfileOrganizer: @@ -10968,8 +10971,8 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel new "identlog.txt" text file in the I2P install directory. For debugging purposes, publish the count of how many identities the router has cycled through, though not the identities itself. - * Cleaned up the way the multitransport shitlisting worked, and - added per-transport shitlists + * Cleaned up the way the multitransport banlisting worked, and + added per-transport banlists * When dropping a router reference locally, first fire a netDb lookup for the entry * Take the peer selection filters into account when organizing the @@ -10999,7 +11002,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel even if those shouldn't exist) 2006-07-14 jrandom - * Improve the multitransport shitlisting (thanks Complication!) + * Improve the multitransport banlisting (thanks Complication!) * Allow routers with a capacity of 16-32KBps to be used in tunnels under the default configuration (thanks for the stats Complication!) * Properly allow older router references to load on startup @@ -11021,7 +11024,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel GNU/Classpath based JVMs * Adjust the Fortuna PRNG's pooling system to reduce contention on refill with a background thread to refill the output buffer - * Add per-transport support for the shitlist + * Add per-transport support for the banlist * Add a new async pumped tunnel gateway to reduce tunnel dispatcher contention @@ -11091,7 +11094,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * SSU modifications to cut down on unnecessary connection failures 2006-05-16 jrandom - * Further shitlist randomizations + * Further banlist randomizations * Adjust the stats monitored for detecting cpu overload when dropping new tunnel requests @@ -11304,7 +11307,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel picker. * Cut down on subsequent streaming lib reset packets transmitted * Use a larger MTU more often - * Allow netDb searches to query shitlisted peers, as the queries are + * Allow netDb searches to query banlisted peers, as the queries are indirect. * Add an option to disable non-floodfill netDb searches (non-floodfill searches are used by default, but can be disabled by adding @@ -11366,7 +11369,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel searches outside the floodfill set) * Fix to the SSU IP detection code so we won't use introducers when we don't need them (thanks Complication!) - * Add a brief shitlist to i2psnark so it doesn't keep on trying to reach + * Add a brief banlist to i2psnark so it doesn't keep on trying to reach peers given to it * Don't let netDb searches wander across too many peers * Don't use the 1s bandwidth usage in the tunnel participation throttle, @@ -11925,7 +11928,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel left to the (work in progress) web UI. 2005-12-14 jrandom - * Fix to drop peer references when we shitlist people again (thanks zzz!) + * Fix to drop peer references when we banlist people again (thanks zzz!) * Further I2PSnark fixes to deal with arbitrary torrent info attributes (thanks Complication!) @@ -12024,7 +12027,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel separate jdom or rome, as they're inside syndie.war. 2005-11-30 jrandom - * Don't let the TCP transport alone shitlist a peer, since other + * Don't let the TCP transport alone banlist a peer, since other transports may be working. Also display whether TCP connections are inbound or outbound on the peers page. * Fixed some substantial bugs in the SSU introducers where we wouldn't @@ -12092,7 +12095,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel address (read: SSU IP or port). This only offers minimal additional protection against trivial attackers, but should provide functional improvement for people who have periodic IP changes, since their new - router address would not be shitlisted while their old one would be. + router address would not be banlisted while their old one would be. * Added further infrastructure for restricted route operation, but its use is not recommended. @@ -12240,10 +12243,10 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * Improved the bandwidth throtting on tunnel participation, especially for low bandwidth peers. * Improved failure handling in SSU with proactive reestablishment of - failing idle peers, and rather than shitlisting a peer who failed too + failing idle peers, and rather than banlisting a peer who failed too much, drop the SSU session and allow a new attempt (which, if it fails, - will cause a shitlisting) - * Clarify the cause of the shitlist on the profiles page, and include + will cause a banlisting) + * Clarify the cause of the banlist on the profiles page, and include bandwidth limiter info at the bottom of the peers page. 2005-10-26 jrandom @@ -12256,7 +12259,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2005-10-25 jrandom * Defer netDb searches for newly referenced peers until we actually want them - * Ignore netDb references to peers on our shitlist + * Ignore netDb references to peers on our banlist * Set the timeout for end to end client messages to the max delay after finding the leaseSet, so we don't have as many expired messages floating around. @@ -12471,7 +12474,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel reseeding - useful on OSes that make it hard to create dot files. Thanks Complication (and anon)! * Fixed the installer version string (thanks Frontier!) - * Added cleaner rejection of invalid IP addresses, shitlist those who send + * Added cleaner rejection of invalid IP addresses, banlist those who send us invalid IP addresses, verify again that we are not sending invalid IP addresses, and log an error if it happens. (Thanks Complication, ptm, and adab!) @@ -12499,7 +12502,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel instead of k/cwin) * Limit the number of inbound SSU sessions being built at once (using half of the i2np.udp.maxConcurrentEstablish config prop) - * Don't shitlist on a message send failure alone (unless there aren't any + * Don't banlist on a message send failure alone (unless there aren't any common transports). * More careful bandwidth bursting @@ -12636,7 +12639,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2005-09-13 jrandom * More careful error handling with introductions (thanks dust!) * Fix the forceIntroducers checkbox on config.jsp (thanks Complication!) - * Hide the shitlist on the summary so it doesn't confuse new users. + * Hide the banlist on the summary so it doesn't confuse new users. 2005-09-12 comwiz * Migrated the router tests to junit @@ -12743,8 +12746,8 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel 2005-08-24 jrandom * Catch errors with corrupt tunnel messages more gracefully (no need to kill the thread and cause an OOM...) - * Don't skip shitlisted peers for netDb store messages, as they aren't - necessarily shitlisted by other people (though they probably are). + * Don't skip banlisted peers for netDb store messages, as they aren't + necessarily banlisted by other people (though they probably are). * Adjust the netDb store per-peer timeout based on each particular peer's profile (timeout = 4x their average netDb store response time) * Don't republish leaseSets to *failed* peers - send them to peers who @@ -12787,14 +12790,14 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel netDb. * Don't overwrite the status with 'unknown' unless we haven't had a valid status in a while. - * Make sure to avoid shitlisted peers for peer testing. + * Make sure to avoid banlisted peers for peer testing. * When we get an unknown result to a peer test, try again soon afterwards. * When a peer tells us that our address is different from what we expect, if we've done a recent peer test with a result of OK, fire off a peer test to make sure our IP/port is still valid. If our test is old or the result was not OK, accept their suggestion, but queue up a peer test for later. - * Don't try to do a netDb store to a shitlisted peer, and adjust the way + * Don't try to do a netDb store to a banlisted peer, and adjust the way we monitor netDb store progress (to clear up the high netDb.storePeers stat) @@ -13426,7 +13429,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel * Fix a fencepost in the tunnel building so that e.g. a variance of 2 means +/- 2, not +/- 1 (thanks dm!) * Avoid an NPE on client disconnect - * Never select a shitlisted peer to participate in a tunnel + * Never select a banlisted peer to participate in a tunnel * Have netDb store messages timeout after 10s, not the full 60s (duh) * Keep session tags around for a little longer, just in case (grr) * Cleaned up some closing event issues on the streaming lib @@ -14276,7 +14279,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel (thanks Jonva!) 2004-10-04 jrandom - * Update the shitlist to reject a peer for an exponentially increasing + * Update the banlist to reject a peer for an exponentially increasing period of time (with an upper bounds of an hour). * Various minor stat and debugging fixes @@ -14290,7 +14293,7 @@ i2psnark: Fix ConnectionAcceptor not restarting after tunnel such as "dbResponseTime" or "tunnelTestResponseTime". 2004-10-02 jrandom - * Assure that we quickly fail messages bound for shitlisted peers. + * Assure that we quickly fail messages bound for banlisted peers. * Address a race on startup where the first peer contacted could hang the router (thanks Romster!) * Only whine about an intermittent inability to query the time server once diff --git a/router/java/src/net/i2p/data/i2np/DataMessage.java b/router/java/src/net/i2p/data/i2np/DataMessage.java index c77ec5df0..f1505397e 100644 --- a/router/java/src/net/i2p/data/i2np/DataMessage.java +++ b/router/java/src/net/i2p/data/i2np/DataMessage.java @@ -49,7 +49,7 @@ public class DataMessage extends FastI2NPMessageImpl { long size = DataHelper.fromLong(data, curIndex, 4); curIndex += 4; if (size > MAX_SIZE) - throw new I2NPMessageException("wtf, size=" + size); + throw new I2NPMessageException("too large msg, size=" + size); _data = new byte[(int)size]; System.arraycopy(data, curIndex, _data, 0, (int)size); } diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java index e4e32377c..9669d6f91 100644 --- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java +++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java @@ -357,8 +357,8 @@ public class DeliveryInstructions extends DataStructureImpl { int offset = 0; offset += getAdditionalInfo(rv, offset); if (offset != additionalSize) - //_log.log(Log.CRIT, "wtf, additionalSize = " + additionalSize + ", offset = " + offset); - throw new IllegalStateException("wtf, additionalSize = " + additionalSize + ", offset = " + offset); + //_log.log(Log.CRIT, "size mismatch, additionalSize = " + additionalSize + ", offset = " + offset); + throw new IllegalStateException("size mismatch, additionalSize = " + additionalSize + ", offset = " + offset); return rv; } diff --git a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java index 1acd53e59..f253cfed2 100644 --- a/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java +++ b/router/java/src/net/i2p/data/i2np/I2NPMessageReader.java @@ -164,7 +164,7 @@ public class I2NPMessageReader { _listener.disconnected(I2NPMessageReader.this); cancelRunner(); } catch (Exception e) { - _log.log(Log.CRIT, "wtf, error reading", e); + _log.log(Log.CRIT, "error reading msg!", e); _listener.readError(I2NPMessageReader.this, e); _listener.disconnected(I2NPMessageReader.this); cancelRunner(); diff --git a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java index b25e3fccc..d908ca4d1 100644 --- a/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java +++ b/router/java/src/net/i2p/data/i2np/TunnelGatewayMessage.java @@ -62,7 +62,7 @@ public class TunnelGatewayMessage extends FastI2NPMessageImpl { if (_msg != null) throw new IllegalStateException(); if (msg == null) - throw new IllegalArgumentException("wtf, dont set me to null"); + throw new IllegalArgumentException("dont set me to null!"); _msg = msg; } @@ -137,7 +137,7 @@ public class TunnelGatewayMessage extends FastI2NPMessageImpl { //handler.readMessage(data, curIndex); //_msg = handler.lastRead(); //if (_msg == null) - // throw new I2NPMessageException("wtf, message read has no payload?"); + // throw new I2NPMessageException("impossible? message read has no payload?!"); // NEW WAY save lots of effort at the IBGW by reading as an UnknownI2NPMessage instead // This will save a lot of object churn and processing, diff --git a/router/java/src/net/i2p/data/i2np/UnknownI2NPMessage.java b/router/java/src/net/i2p/data/i2np/UnknownI2NPMessage.java index 791f8126a..72bcc081e 100644 --- a/router/java/src/net/i2p/data/i2np/UnknownI2NPMessage.java +++ b/router/java/src/net/i2p/data/i2np/UnknownI2NPMessage.java @@ -48,7 +48,7 @@ public class UnknownI2NPMessage extends FastI2NPMessageImpl { throw new IllegalStateException(); if (type != _type) throw new I2NPMessageException("Message type is incorrect for this message"); if (dataSize > MAX_SIZE) - throw new I2NPMessageException("wtf, size=" + dataSize); + throw new I2NPMessageException("size mismatch, too big, size=" + dataSize); _data = new byte[dataSize]; System.arraycopy(data, offset, _data, 0, dataSize); } diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java index cb977a864..24667108e 100644 --- a/router/java/src/net/i2p/data/router/RouterInfo.java +++ b/router/java/src/net/i2p/data/router/RouterInfo.java @@ -308,7 +308,7 @@ public class RouterInfo extends DatabaseEntry { */ protected byte[] getBytes() throws DataFormatException { if (_byteified != null) return _byteified; - if (_identity == null) throw new DataFormatException("Router identity isn't set? wtf!"); + if (_identity == null) throw new DataFormatException("Router identity isn't set?!"); //long before = Clock.getInstance().now(); ByteArrayOutputStream out = new ByteArrayOutputStream(2*1024); diff --git a/router/java/src/net/i2p/router/Banlist.java b/router/java/src/net/i2p/router/Banlist.java index 41fb9612d..984be5ec6 100644 --- a/router/java/src/net/i2p/router/Banlist.java +++ b/router/java/src/net/i2p/router/Banlist.java @@ -162,11 +162,11 @@ public class Banlist { */ public boolean banlistRouter(Hash peer, String reason, String reasonCode, String transport, long expireOn) { if (peer == null) { - _log.error("wtf, why did we try to banlist null?", new Exception("banfaced")); + _log.error("why did we try to banlist null?", new Exception("banfaced")); return false; } if (peer.equals(_context.routerHash())) { - _log.error("wtf, why did we try to banlist ourselves?", new Exception("banfaced")); + _log.error("why did we try to banlist ourselves?", new Exception("banfaced")); return false; } boolean wasAlready = false; diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java index bebd9c6e1..da08c521a 100644 --- a/router/java/src/net/i2p/router/JobQueue.java +++ b/router/java/src/net/i2p/router/JobQueue.java @@ -591,7 +591,7 @@ public class JobQueue { } catch (Throwable t) { _context.clock().removeUpdateListener(this); if (_log.shouldLog(Log.ERROR)) - _log.error("wtf, pumper killed", t); + _log.error("pumper killed?!", t); } } diff --git a/router/java/src/net/i2p/router/JobQueueRunner.java b/router/java/src/net/i2p/router/JobQueueRunner.java index a3ed2da14..9cf23f998 100644 --- a/router/java/src/net/i2p/router/JobQueueRunner.java +++ b/router/java/src/net/i2p/router/JobQueueRunner.java @@ -117,7 +117,7 @@ class JobQueueRunner extends I2PThread { //if ( (jobNum % 10) == 0) // System.gc(); } catch (Throwable t) { - _log.log(Log.CRIT, "WTF, error running?", t); + _log.log(Log.CRIT, "error running?", t); } } //_state = 16; diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index b2029f923..364648ce6 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -852,7 +852,7 @@ public class Router implements RouterClock.ClockShiftListener { addCapabilities(ri); SigningPrivateKey key = _context.keyManager().getSigningPrivateKey(); if (key == null) { - _log.log(Log.CRIT, "Internal error - signing private key not known? wtf"); + _log.log(Log.CRIT, "Internal error - signing private key not known? Impossible?"); return; } ri.sign(key); diff --git a/router/java/src/net/i2p/router/dummy/VMCommSystem.java b/router/java/src/net/i2p/router/dummy/VMCommSystem.java index e6c310d7c..13b8aff0a 100644 --- a/router/java/src/net/i2p/router/dummy/VMCommSystem.java +++ b/router/java/src/net/i2p/router/dummy/VMCommSystem.java @@ -122,7 +122,7 @@ public class VMCommSystem extends CommSystemFacade { _ctx.inNetMessagePool().add(msg, null, _from); } catch (Exception e) { - _log.error("wtf, error reading/formatting a VM message?", e); + _log.error("Error reading/formatting a VM message? Something is not right...", e); } } public String getName() { return "Receive Message"; } diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java index cc7a337cc..aeeb3d1e1 100644 --- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java +++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java @@ -58,7 +58,7 @@ public class SendMessageDirectJob extends JobImpl { _targetHash = toPeer; if (timeoutMs < 10*1000) { if (_log.shouldLog(Log.WARN)) - _log.warn("Very little time given [" + timeoutMs + "], resetting to 5s", new Exception("stingy bastard")); + _log.warn("Very little time given [" + timeoutMs + "], resetting to 5s", new Exception("stingy caller!")); _expiration = ctx.clock().now() + 10*1000; } else { _expiration = timeoutMs + ctx.clock().now(); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index 7c1442e20..dc33507bc 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -129,7 +129,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad */ @Override public void publish(RouterInfo localRouterInfo) throws IllegalArgumentException { - if (localRouterInfo == null) throw new IllegalArgumentException("wtf, null localRouterInfo?"); + if (localRouterInfo == null) throw new IllegalArgumentException("impossible: null localRouterInfo?"); // should this be after super? why not publish locally? if (_context.router().isHidden()) return; // DE-nied! super.publish(localRouterInfo); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java index ac283109c..6b243b769 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java @@ -58,7 +58,7 @@ class IterativeLookupJob extends JobImpl { continue; } if (peer.equals(from)) { - // wtf + // unusual invalidPeers++; continue; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 11ffa9d27..35864c554 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -646,7 +646,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { try { store(h, localLeaseSet); } catch (IllegalArgumentException iae) { - _log.error("wtf, locally published leaseSet is not valid?", iae); + _log.error("locally published leaseSet is not valid?", iae); throw iae; } if (!_context.clientManager().shouldPublishLeaseSet(h)) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java index 01c5e991f..ba10f8872 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -484,7 +484,7 @@ class PersistentDataStore extends TransientDataStore { // don't overwrite recent netdb RIs with reseed data return fileDate > _knownDate + (60*60*1000); } else { - // wtf - prevent injection from reseeding + // safety measure - prevent injection from reseeding _log.error("Prevented LS overwrite by RI " + _key + " from " + _routerFile); return false; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index 450aca443..ee75f47ec 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -94,7 +94,7 @@ class SearchJob extends JobImpl { Job onSuccess, Job onFailure, long timeoutMs, boolean keepStats, boolean isLease) { super(context); if ( (key == null) || (key.getData() == null) ) - throw new IllegalArgumentException("Search for null key? wtf"); + throw new IllegalArgumentException("Search for null key?"); _log = getContext().logManager().getLog(getClass()); _facade = facade; _state = new SearchState(getContext(), key); @@ -425,7 +425,7 @@ class SearchJob extends JobImpl { Hash to = router.getIdentity().getHash(); TunnelInfo inTunnel = getContext().tunnelManager().selectInboundExploratoryTunnel(to); if (inTunnel == null) { - _log.warn("No tunnels to get search replies through! wtf!"); + _log.warn("No tunnels to get search replies through!"); getContext().jobQueue().addJob(new FailedJob(getContext(), router)); return; } @@ -436,7 +436,7 @@ class SearchJob extends JobImpl { //RouterInfo inGateway = getContext().netDb().lookupRouterInfoLocally(inTunnel.getPeer(0)); //if (inGateway == null) { - // _log.error("We can't find the gateway to our inbound tunnel?! wtf"); + // _log.error("We can't find the gateway to our inbound tunnel?!"); // getContext().jobQueue().addJob(new FailedJob(getContext(), router)); // return; //} @@ -448,7 +448,7 @@ class SearchJob extends JobImpl { TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(to); if (outTunnel == null) { - _log.warn("No tunnels to send search out through! wtf!"); + _log.warn("No tunnels to send search out through! Impossible?"); getContext().jobQueue().addJob(new FailedJob(getContext(), router)); return; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java index 63cc1c18f..881410c4a 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchUpdateReplyFoundJob.java @@ -101,7 +101,7 @@ class SearchUpdateReplyFoundJob extends JobImpl implements ReplyJob { _job.replyFound((DatabaseSearchReplyMessage)message, _peer); } else { if (_log.shouldLog(Log.ERROR)) - _log.error(getJobId() + ": WTF, reply job matched a strange message: " + message); + _log.error(getJobId() + ": What?! Reply job matched a strange message: " + message); return; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java index 62a878d6d..b7fd6161e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java @@ -42,7 +42,7 @@ class SingleLookupJob extends JobImpl { Hash peer = _dsrm.getReply(i); if (peer.equals(getContext().routerHash())) // us continue; - if (peer.equals(from)) // wtf + if (peer.equals(from)) // unusual? continue; RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri == null) diff --git a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java index d433e889e..2c4a96c44 100644 --- a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java +++ b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java @@ -173,7 +173,7 @@ class CapacityCalculator { case 30*60*1000: return .3; case 60*60*1000: return .2; case 24*60*60*1000: return .1; - default: throw new IllegalArgumentException("wtf, period [" + period + "]???"); + default: throw new IllegalArgumentException("undefined period passed, period [" + period + "]???"); } } } diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index 466c63ec1..456f6aadd 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -115,7 +115,7 @@ public class PeerTestJob extends JobImpl { private void testPeer(RouterInfo peer) { TunnelInfo inTunnel = getInboundTunnelId(); if (inTunnel == null) { - _log.warn("No tunnels to get peer test replies through! wtf!"); + _log.warn("No tunnels to get peer test replies through!"); return; } TunnelId inTunnelId = inTunnel.getReceiveTunnelId(0); @@ -123,7 +123,7 @@ public class PeerTestJob extends JobImpl { RouterInfo inGateway = getContext().netDb().lookupRouterInfoLocally(inTunnel.getPeer(0)); if (inGateway == null) { if (_log.shouldLog(Log.WARN)) - _log.warn("We can't find the gateway to our inbound tunnel?! wtf"); + _log.warn("We can't find the gateway to our inbound tunnel?! Impossible?"); return; } @@ -135,7 +135,7 @@ public class PeerTestJob extends JobImpl { TunnelInfo outTunnel = getOutboundTunnelId(); if (outTunnel == null) { - _log.warn("No tunnels to send search out through! wtf!"); + _log.warn("No tunnels to send search out through! Something is wrong..."); return; } diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java index cebd333d2..27d026960 100644 --- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java @@ -83,7 +83,7 @@ class LoadRouterInfoJob extends JobImpl { try { // if we have a routerinfo but no keys, things go bad in a hurry: // CRIT ...rkdb.PublishLocalRouterInfoJob: Internal error - signing private key not known? rescheduling publish for 30s - // CRIT net.i2p.router.Router : Internal error - signing private key not known? wtf + // CRIT net.i2p.router.Router : Internal error - signing private key not known? Impossible? // CRIT ...sport.udp.EstablishmentManager: Error in the establisher java.lang.NullPointerException // at net.i2p.router.transport.udp.PacketBuilder.buildSessionConfirmedPacket(PacketBuilder.java:574) // so pretend the RI isn't there if there is no keyfile diff --git a/router/java/src/net/i2p/router/transport/GetBidsJob.java b/router/java/src/net/i2p/router/transport/GetBidsJob.java index 676f72e16..aaa50ee45 100644 --- a/router/java/src/net/i2p/router/transport/GetBidsJob.java +++ b/router/java/src/net/i2p/router/transport/GetBidsJob.java @@ -58,7 +58,7 @@ class GetBidsJob extends JobImpl { Hash us = context.routerHash(); if (to.equals(us)) { if (log.shouldLog(Log.ERROR)) - log.error("wtf, send a message to ourselves? nuh uh. msg = " + msg); + log.error("send a message to ourselves? nuh uh. msg = " + msg); context.statManager().addRateData("transport.bidFailSelf", msg.getLifetime()); fail(context, msg); return; diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java index 584da497f..012107e6c 100644 --- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java +++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java @@ -195,9 +195,9 @@ public class OutboundMessageRegistry { */ private void registerPending(OutNetMessage msg, boolean allowEmpty) { if ( (!allowEmpty) && (msg.getMessage() == null) ) - throw new IllegalArgumentException("OutNetMessage doesn't contain an I2NPMessage? wtf"); + throw new IllegalArgumentException("OutNetMessage doesn't contain an I2NPMessage? Impossible?"); MessageSelector sel = msg.getReplySelector(); - if (sel == null) throw new IllegalArgumentException("No reply selector? wtf"); + if (sel == null) throw new IllegalArgumentException("No reply selector? Impossible?"); if (!_activeMessages.add(msg)) return; // dont add dups diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index df536c42c..ce2d643a6 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -373,9 +373,9 @@ public abstract class TransportImpl implements Transport { + "): " + allTime + "ms/" + sendTime + "ms after failing on: " + msg.getFailedTransports() + " and succeeding on " + getStyle()); if ( (allTime > 60*1000) && (sendSuccessful) ) { - // WTF!!@# + // VERY slow if (_log.shouldLog(Log.WARN)) - _log.warn("WTF, more than a minute slow? " + msg.getMessageType() + _log.warn("Severe latency? More than a minute slow? " + msg.getMessageType() + " of id " + msg.getMessageId() + " (send begin on " + new Date(msg.getSendBegin()) + " / created on " + new Date(msg.getCreated()) + "): " + msg); @@ -497,7 +497,7 @@ public abstract class TransportImpl implements Transport { _listener.messageReceived(inMsg, remoteIdent, remoteIdentHash); } else { if (_log.shouldLog(Log.ERROR)) - _log.error("WTF! Null listener! this = " + toString(), new Exception("Null listener")); + _log.error("Null listener! this = " + toString(), new Exception("Null listener")); } } diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index e5240d6a2..4c0f325bb 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -530,7 +530,7 @@ public class TransportManager implements TransportEventListener { if (msg == null) throw new IllegalArgumentException("Null message? no bidding on a null outNetMessage!"); if (_context.router().getRouterInfo().equals(msg.getTarget())) - throw new IllegalArgumentException("WTF, bids for a message bound to ourselves?"); + throw new IllegalArgumentException("Bids for a message bound to ourselves?"); List rv = new ArrayList(_transports.size()); Set failedTransports = msg.getFailedTransports(); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java index 1431b110f..72061efe2 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPSendFinisher.java @@ -100,7 +100,7 @@ class NTCPSendFinisher { // appx 0.1 ms //_context.statManager().addRateData("ntcp.sendFinishTime", _context.clock().now() - _queued, 0); } catch (Throwable t) { - _log.log(Log.CRIT, " wtf, afterSend borked", t); + _log.log(Log.CRIT, " afterSend broken?", t); } } } diff --git a/router/java/src/net/i2p/router/transport/udp/ACKSender.java b/router/java/src/net/i2p/router/transport/udp/ACKSender.java index a94572ace..8e608ab13 100644 --- a/router/java/src/net/i2p/router/transport/udp/ACKSender.java +++ b/router/java/src/net/i2p/router/transport/udp/ACKSender.java @@ -168,7 +168,7 @@ class ACKSender implements Runnable { if (wanted < 0) { if (_log.shouldLog(Log.WARN)) - _log.warn("wtf, why are we acking something they dont want? remaining=" + remaining + ", peer=" + peer + ", bitfields=" + ackBitfields); + _log.warn("why are we acking something they dont want? remaining=" + remaining + ", peer=" + peer + ", bitfields=" + ackBitfields); continue; } 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 ab91478f1..d9cdfe01a 100644 --- a/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java +++ b/router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java @@ -178,7 +178,7 @@ class OutboundMessageFragments { public void add(OutboundMessageState state) { PeerState peer = state.getPeer(); if (peer == null) - throw new RuntimeException("wtf, null peer for " + state); + throw new RuntimeException("null peer for " + state); peer.add(state); add(peer); //_context.statManager().addRateData("udp.outboundActiveCount", active, 0); diff --git a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java index d363d7a3f..69fe08243 100644 --- a/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java +++ b/router/java/src/net/i2p/router/tunnel/BatchedPreprocessor.java @@ -370,7 +370,7 @@ class BatchedPreprocessor extends TrivialPreprocessor { if (offset <= 0) { StringBuilder buf = new StringBuilder(128); - buf.append("wtf, written offset is ").append(offset); + buf.append("uh? written offset is ").append(offset); buf.append(" for ").append(startAt).append(" through ").append(sendThrough); for (int i = startAt; i <= sendThrough; i++) { buf.append(" ").append(pending.get(i).toString()); diff --git a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java index f02e2d573..6e0d0675f 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentHandler.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentHandler.java @@ -164,7 +164,7 @@ class FragmentHandler { if (_log.shouldLog(Log.ERROR)) _log.error("Corrupt fragment received: offset = " + offset, e); _context.statManager().addRateData("tunnel.corruptMessage", 1, 1); - // java.lang.IllegalStateException: wtf, don't get the completed size when we're not complete - null fragment i=0 of 1 + // java.lang.IllegalStateException: don't get the completed size when we're not complete - null fragment i=0 of 1 // at net.i2p.router.tunnel.FragmentedMessage.getCompleteSize(FragmentedMessage.java:194) // at net.i2p.router.tunnel.FragmentedMessage.toByteArray(FragmentedMessage.java:223) // at net.i2p.router.tunnel.FragmentHandler.receiveComplete(FragmentHandler.java:380) diff --git a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java index c692b2b20..effc2a4c6 100644 --- a/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java +++ b/router/java/src/net/i2p/router/tunnel/FragmentedMessage.java @@ -164,7 +164,7 @@ class FragmentedMessage { } public int getCompleteSize() { if (!_lastReceived) - throw new IllegalStateException("wtf, don't get the completed size when we're not complete"); + throw new IllegalStateException("don't get the completed size when we're not complete!"); if (_releasedAfter > 0) { RuntimeException e = new RuntimeException("use after free in FragmentedMessage"); _log.error("FM completeSize()", e); @@ -175,7 +175,7 @@ class FragmentedMessage { ByteArray ba = _fragments[i]; // NPE seen here, root cause unknown if (ba == null) - throw new IllegalStateException("wtf, don't get the completed size when we're not complete - null fragment i=" + i + " of " + _highFragmentNum); + throw new IllegalStateException("don't get the completed size when we're not complete! - null fragment i=" + i + " of " + _highFragmentNum); size += ba.getValid(); } return size; diff --git a/router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java b/router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java index 696825a06..0902de47b 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundGatewayProcessor.java @@ -20,6 +20,6 @@ class InboundGatewayProcessor extends HopProcessor { public void process(byte orig[], int offset, int length) { boolean ok = super.process(orig, offset, length, null); if (!ok) - throw new RuntimeException("wtf, we are the gateway, how did it fail?"); + throw new RuntimeException("we are the gateway, how did it fail?"); } } diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 62c1e6ed6..bdfa92773 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -188,7 +188,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { TunnelId outId = out.getSendTunnelId(0); if (outId == null) { if (_log.shouldLog(Log.ERROR)) - _log.error("wtf, outbound tunnel has no outboundId? " + out + _log.error("strange? outbound tunnel has no outboundId? " + out + " failing to distribute " + msg); return; } diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index 09744c569..a9c8b667e 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -630,7 +630,7 @@ public class TunnelDispatcher implements Service { * @param targetPeer gateway to the tunnel to receive the message */ public void dispatchOutbound(I2NPMessage msg, TunnelId outboundTunnel, TunnelId targetTunnel, Hash targetPeer) { - if (outboundTunnel == null) throw new IllegalArgumentException("wtf, null outbound tunnel?"); + if (outboundTunnel == null) throw new IllegalArgumentException("null outbound tunnel?"); long before = _context.clock().now(); TunnelGateway gw = _outboundGateways.get(outboundTunnel); if (gw != null) { @@ -677,7 +677,7 @@ public class TunnelDispatcher implements Service { //long dispatchTime = _context.clock().now() - before; //if (dispatchTime > 1000) { // if (_log.shouldLog(Log.WARN)) - // _log.warn("wtf, took " + dispatchTime + " to dispatch " + msg + " out " + outboundTunnel + " in " + gw); + // _log.warn("slow? took " + dispatchTime + " to dispatch " + msg + " out " + outboundTunnel + " in " + gw); //} //if (gw instanceof TunnelGatewayZeroHop) // _context.statManager().addRateData("tunnel.dispatchOutboundZeroHopTime", dispatchTime, dispatchTime); diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java index ca1b03ff4..c799bd16a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java @@ -352,7 +352,7 @@ class BuildHandler implements Runnable { default: _context.statManager().addRateData("tunnel.receiveRejectionCritical", 1); } - // penalize peer based on their bitchiness level + // penalize peer based on their reported error level _context.profileManager().tunnelRejected(peer, rtt, howBad); _context.messageHistory().tunnelParticipantRejected(peer, "peer rejected after " + rtt + " with " + howBad + ": " + cfg.toString()); } diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index 521ff740a..f5e173206 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -749,7 +749,7 @@ public class TunnelPool { TunnelId inId = tunnel.getReceiveTunnelId(0); Hash gw = tunnel.getPeer(0); if ( (inId == null) || (gw == null) ) { - _log.error(toString() + ": wtf, tunnel has no inbound gateway/tunnelId? " + tunnel); + _log.error(toString() + ": broken? tunnel has no inbound gateway/tunnelId? " + tunnel); continue; } Lease lease = new Lease(); From 8098d705f94425026eef6b1fc1ff7a8da13551af Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 8 Jun 2015 16:39:41 +0000 Subject: [PATCH 038/258] Make netDb.storeFloodNew graphable for testing (#1195) --- history.txt | 1 + .../kademlia/FloodfillDatabaseStoreMessageHandler.java | 2 +- .../kademlia/HandleFloodfillDatabaseStoreMessageJob.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/history.txt b/history.txt index 1f8e402b9..7faab9dd3 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,6 @@ 2015-06-08 dg * Language fixes + * Make netDb.storeFloodNew graphable for testing (#1195) 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java index 99d8c6265..37ce81bf7 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseStoreMessageHandler.java @@ -28,7 +28,7 @@ public class FloodfillDatabaseStoreMessageHandler implements HandlerJobBuilder { _context = context; _facade = facade; // following are for HFDSMJ - context.statManager().createRateStat("netDb.storeHandled", "How many netDb store messages have we handled?", "NetworkDatabase", new long[] { 60*60*1000l }); + context.statManager().createRateStat("netDb.storeHandled", "How many netDb store messages have we handled?", "NetworkDatabase", new long[] { 60*1000, 60*60*1000l }); context.statManager().createRateStat("netDb.storeLeaseSetHandled", "How many leaseSet store messages have we handled?", "NetworkDatabase", new long[] { 60*60*1000l }); context.statManager().createRateStat("netDb.storeRouterInfoHandled", "How many routerInfo store messages have we handled?", "NetworkDatabase", new long[] { 60*60*1000l }); context.statManager().createRateStat("netDb.storeRecvTime", "How long it takes to handle the local store part of a dbStore?", "NetworkDatabase", new long[] { 60*60*1000l }); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index ffb6d77f0..8e8f9663e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -215,7 +215,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { // ERR: see comment in HandleDatabaseLookupMessageJob regarding hidden mode //else if (!_message.getRouterInfo().isHidden()) long floodEnd = System.currentTimeMillis(); - getContext().statManager().addRateData("netDb.storeFloodNew", floodEnd-floodBegin); + getContext().statManager().addRateData("netDb.storeFloodNew", floodEnd-floodBegin, 60*1000); } else { // don't flood it *again* getContext().statManager().addRateData("netDb.storeFloodOld", 1); From 97aeecd865b408fb10b180cd70ebfe1ea41ca5b5 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 8 Jun 2015 19:24:28 +0000 Subject: [PATCH 039/258] FloodfillMonitorJob, FloodfillRouterInfoFloodJob: - Directly connect to nearby floodfills to share our RI to speed up integration of new floodfills (#1195). - Called on both non-ff -> ff OR ff -> non-ff. - Create FloodfillRouterInfoFloodJob to do so. --- history.txt | 2 + .../src/net/i2p/router/RouterVersion.java | 2 +- .../kademlia/FloodfillMonitorJob.java | 19 +++++- .../FloodfillNetworkDatabaseFacade.java | 2 +- .../kademlia/FloodfillRouterInfoFloodJob.java | 63 +++++++++++++++++++ 5 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java diff --git a/history.txt b/history.txt index 7faab9dd3..e635ad677 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,8 @@ 2015-06-08 dg * Language fixes * Make netDb.storeFloodNew graphable for testing (#1195) + * Directly connect to nearby floodfills to share our RI + to speed up integration of new floodfills (#1195) 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 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 = ""; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java index 53eb0be4a..2c1a929d9 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -6,6 +6,7 @@ import net.i2p.crypto.SigType; import net.i2p.data.Hash; import net.i2p.data.router.RouterAddress; import net.i2p.data.router.RouterInfo; +import net.i2p.router.Job; import net.i2p.router.JobImpl; import net.i2p.router.Router; import net.i2p.router.RouterContext; @@ -55,13 +56,27 @@ class FloodfillMonitorJob extends JobImpl { } else { getContext().router().eventLog().addEvent(EventLog.NOT_FLOODFILL); } - getContext().router().rebuildRouterInfo(); + getContext().router().rebuildRouterInfo(true); + Job routerInfoFlood = new FloodfillRouterInfoFloodJob(getContext(), _facade); + if(getContext().router().getUptime() < 5*60*1000) { + // Needed to prevent race if router.floodfillParticipant=true (not auto) + routerInfoFlood.getTiming().setStartAfter(getContext().clock().now() + 5*60*1000); + getContext().jobQueue().addJob(routerInfoFlood); + if(_log.shouldLog(Log.DEBUG)) { + _log.logAlways(Log.DEBUG, "Deferring our FloodfillRouterInfoFloodJob run because of low uptime."); + } + } else { + routerInfoFlood.runJob(); + if(_log.shouldLog(Log.DEBUG)) { + _log.logAlways(Log.DEBUG, "Running FloodfillRouterInfoFloodJob"); + } + } } if (_log.shouldLog(Log.INFO)) _log.info("Should we be floodfill? " + ff); int delay = (REQUEUE_DELAY / 2) + getContext().random().nextInt(REQUEUE_DELAY); // there's a lot of eligible non-floodfills, keep them from all jumping in at once - // To do: somehow assess the size of the network to make this adaptive? + // TODO: somehow assess the size of the network to make this adaptive? if (!ff) delay *= 4; // this was 7, reduced for moar FFs --zab requeue(delay); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index dc33507bc..0df3b3290 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -40,7 +40,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad * Was 7 through release 0.9; 5 for 0.9.1. * 4 as of 0.9.2; 3 as of 0.9.9 */ - private static final int MAX_TO_FLOOD = 3; + public static final int MAX_TO_FLOOD = 3; private static final int FLOOD_PRIORITY = OutNetMessage.PRIORITY_NETDB_FLOOD; private static final int FLOOD_TIMEOUT = 30*1000; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java new file mode 100644 index 000000000..fb620a1ad --- /dev/null +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java @@ -0,0 +1,63 @@ +package net.i2p.router.networkdb.kademlia; + +import java.util.Collections; +import java.util.List; + +import net.i2p.data.Hash; +import net.i2p.data.i2np.DatabaseStoreMessage; +import net.i2p.data.router.RouterAddress; +import net.i2p.data.router.RouterInfo; +import net.i2p.router.JobImpl; +import net.i2p.router.OutNetMessage; +import net.i2p.router.Router; +import net.i2p.router.RouterContext; +import net.i2p.stat.Rate; +import net.i2p.stat.RateStat; +import net.i2p.util.Log; + +/** + * Job to flood nearby floodfill routers with our RI. + * Speeds up integration of new ffs. Created for #1195. + * Also called when opting out of ff to call off the hounds ASAP. + * Currently floods FNDF.MAX_TO_FLOOD * 2 routers nearest to us. + * + */ +class FloodfillRouterInfoFloodJob extends JobImpl { + private final Log _log; + private final FloodfillNetworkDatabaseFacade _facade; + + private static final int FLOOD_PEERS = 2 * FloodfillNetworkDatabaseFacade.MAX_TO_FLOOD; + + public FloodfillRouterInfoFloodJob(RouterContext context, FloodfillNetworkDatabaseFacade facade) { + super(context); + _facade = facade; + _log = context.logManager().getLog(FloodfillRouterInfoFloodJob.class); + } + + public String getName() { return "Flood our RouterInfo to nearby floodfills"; } + + public void runJob() { + FloodfillPeerSelector sel = (FloodfillPeerSelector)_facade.getPeerSelector(); + DatabaseStoreMessage dsm; + OutNetMessage outMsg; + RouterInfo nextPeerInfo; + + List peers = sel.selectFloodfillParticipants(getContext().routerHash(), FLOOD_PEERS, null); + + for(Hash ri: peers) { + // Iterate through list of nearby (ff) peers + dsm = new DatabaseStoreMessage(getContext()); + dsm.setMessageExpiration(getContext().clock().now() + 10*1000); + dsm.setEntry(getContext().router().getRouterInfo()); + nextPeerInfo = getContext().netDb().lookupRouterInfoLocally(ri); + if(nextPeerInfo == null) { + continue; + } + outMsg = new OutNetMessage(getContext(), dsm, getContext().clock().now()+10*1000, OutNetMessage.PRIORITY_MY_NETDB_STORE, nextPeerInfo); + getContext().outNetMessagePool().add(outMsg); // Whoosh! + if(_log.shouldLog(Log.DEBUG)) { + _log.logAlways(Log.DEBUG, "Sending our RI to: " + nextPeerInfo.getHash()); + } + } + } +} From ff2ea9ac3e8a46e6cc81a0d33020c53392632662 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 8 Jun 2015 19:35:18 +0000 Subject: [PATCH 040/258] Irc{Outbound,Inbound}Filter: - Silence 'no streams' warning when we can't connect to an IRC server. Change to WARN. --- .../java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java | 4 ++-- .../java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java | 4 ++-- history.txt | 2 ++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java index 5f0dd8333..2a2edf0db 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java @@ -47,8 +47,8 @@ public class IrcInboundFilter implements Runnable { in = new BufferedReader(new InputStreamReader(remote.getInputStream(), "ISO-8859-1")); output=local.getOutputStream(); } catch (IOException e) { - if (_log.shouldLog(Log.ERROR)) - _log.error("IrcInboundFilter: no streams",e); + if (_log.shouldLog(Log.WARN)) + _log.warn("IrcInboundFilter: no streams",e); return; } if (_log.shouldLog(Log.DEBUG)) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java index 5e142081a..75ce191e7 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java @@ -47,8 +47,8 @@ public class IrcOutboundFilter implements Runnable { in = new BufferedReader(new InputStreamReader(local.getInputStream(), "ISO-8859-1")); output=remote.getOutputStream(); } catch (IOException e) { - if (_log.shouldLog(Log.ERROR)) - _log.error("IrcOutboundFilter: no streams",e); + if (_log.shouldLog(Log.WARN)) + _log.warn("IrcOutboundFilter: no streams",e); return; } if (_log.shouldLog(Log.DEBUG)) diff --git a/history.txt b/history.txt index e635ad677..237a51474 100644 --- a/history.txt +++ b/history.txt @@ -3,6 +3,8 @@ * Make netDb.storeFloodNew graphable for testing (#1195) * Directly connect to nearby floodfills to share our RI to speed up integration of new floodfills (#1195) + * Silence Irc{Inbound,Outbound}Filter warnings about 'no streams' + when we can't connect to an IRC server. Change to WARN. 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0725033fa..f6e6df3a5 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 = ""; From cbc2f899a6283c054c066aa88a737e7ec4d86071 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 8 Jun 2015 22:14:49 +0000 Subject: [PATCH 041/258] fixup after prop --- router/java/src/net/i2p/router/client/ClientManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index 0041fc78c..d9d4a3bd2 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -679,9 +679,10 @@ class ClientManager { continue; if (runner.isDead()) continue; - if (runner.getConfig() == null) + SessionConfig cfg = runner.getPrimaryConfig(); + if (cfg == null) continue; // simple session or no session yet - if (runner.getLeaseSet() == null) + if (runner.getLeaseSet(cfg.getDestination().calculateHash()) == null) continue; // don't confuse client while waiting for CreateLeaseSet msg try { // only send version if the client can handle it (0.8.7 or greater) From fef65c996fd2c2948978cee82d3180dca50df273 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 8 Jun 2015 22:18:14 +0000 Subject: [PATCH 042/258] Store the session in Packet, so we may more easily and efficiently handle multisession, especially on the incoming side. More refactoring to follow --- .../i2p/client/streaming/impl/Connection.java | 4 +-- .../impl/ConnectionDataReceiver.java | 2 +- .../streaming/impl/ConnectionHandler.java | 5 ++-- .../streaming/impl/ConnectionManager.java | 14 +++++----- .../client/streaming/impl/MessageHandler.java | 2 +- .../net/i2p/client/streaming/impl/Packet.java | 28 ++++++++++++++----- .../client/streaming/impl/PacketHandler.java | 6 ++-- .../client/streaming/impl/PacketLocal.java | 23 +++++++++++---- .../client/streaming/impl/PacketQueue.java | 4 +-- 9 files changed, 58 insertions(+), 30 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java index 3a0a605ef..83fd80229 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java @@ -310,13 +310,13 @@ class Connection { // Unconditionally set _resetSentOn.set(now); if ( (_remotePeer == null) || (_sendStreamId.get() <= 0) ) return; - PacketLocal reply = new PacketLocal(_context, _remotePeer); + PacketLocal reply = new PacketLocal(_context, _remotePeer, this); reply.setFlag(Packet.FLAG_RESET); reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED); reply.setSendStreamId(_sendStreamId.get()); reply.setReceiveStreamId(_receiveStreamId.get()); // TODO remove this someday, as of 0.9.20 we do not require it - reply.setOptionalFrom(_connectionManager.getSession().getMyDestination()); + reply.setOptionalFrom(); reply.setLocalPort(_localPort); reply.setRemotePort(_remotePort); // this just sends the packet - no retries or whatnot diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java index 8568e7c69..f103e6a30 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java @@ -204,7 +204,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver { //if ( (!ackOnly) && (packet.getSequenceNum() <= 0) ) { if (isFirst) { packet.setFlag(Packet.FLAG_SYNCHRONIZE); - packet.setOptionalFrom(con.getSession().getMyDestination()); + packet.setOptionalFrom(); packet.setOptionalMaxSize(con.getOptions().getMaxMessageSize()); } packet.setLocalPort(con.getLocalPort()); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java index 3b13ec97f..c06ae4a82 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java @@ -243,14 +243,14 @@ class ConnectionHandler { _log.warn("Received a spoofed SYN packet: they said they were " + packet.getOptionalFrom()); return; } - PacketLocal reply = new PacketLocal(_context, packet.getOptionalFrom()); + PacketLocal reply = new PacketLocal(_context, packet.getOptionalFrom(), packet.getSession()); reply.setFlag(Packet.FLAG_RESET); reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED); reply.setAckThrough(packet.getSequenceNum()); reply.setSendStreamId(packet.getReceiveStreamId()); reply.setReceiveStreamId(0); // TODO remove this someday, as of 0.9.20 we do not require it - reply.setOptionalFrom(_manager.getSession().getMyDestination()); + reply.setOptionalFrom(); if (_log.shouldLog(Log.DEBUG)) _log.debug("Sending RST: " + reply + " because of " + packet); // this just sends the packet - no retries or whatnot @@ -292,6 +292,7 @@ class ConnectionHandler { public static final int POISON_MAX_DELAY_REQUEST = Packet.MAX_DELAY_REQUEST + 1; public PoisonPacket() { + super(null); setOptionalDelay(POISON_MAX_DELAY_REQUEST); } } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index 55d9522bf..077c6a1e9 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -270,13 +270,13 @@ class ConnectionManager { } } } - PacketLocal reply = new PacketLocal(_context, from); + PacketLocal reply = new PacketLocal(_context, from, synPacket.getSession()); reply.setFlag(Packet.FLAG_RESET); reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED); reply.setAckThrough(synPacket.getSequenceNum()); reply.setSendStreamId(synPacket.getReceiveStreamId()); reply.setReceiveStreamId(0); - reply.setOptionalFrom(_session.getMyDestination()); + reply.setOptionalFrom(); reply.setLocalPort(synPacket.getLocalPort()); reply.setRemotePort(synPacket.getRemotePort()); // this just sends the packet - no retries or whatnot @@ -329,7 +329,7 @@ class ConnectionManager { return false; } } - PacketLocal pong = new PacketLocal(_context, dest); + PacketLocal pong = new PacketLocal(_context, dest, ping.getSession()); pong.setFlag(Packet.FLAG_ECHO | Packet.FLAG_NO_ACK); pong.setReceiveStreamId(ping.getSendStreamId()); pong.setLocalPort(ping.getLocalPort()); @@ -734,12 +734,12 @@ class ConnectionManager { boolean blocking, PingNotifier notifier) { PingRequest req = new PingRequest(notifier); long id = assignPingId(req); - PacketLocal packet = new PacketLocal(_context, peer); + PacketLocal packet = new PacketLocal(_context, peer, _session); packet.setSendStreamId(id); packet.setFlag(Packet.FLAG_ECHO | Packet.FLAG_NO_ACK | Packet.FLAG_SIGNATURE_INCLUDED); - packet.setOptionalFrom(_session.getMyDestination()); + packet.setOptionalFrom(); packet.setLocalPort(fromPort); packet.setRemotePort(toPort); if (timeoutMs > MAX_PING_TIMEOUT) @@ -780,12 +780,12 @@ class ConnectionManager { byte[] payload) { PingRequest req = new PingRequest(null); long id = assignPingId(req); - PacketLocal packet = new PacketLocal(_context, peer); + PacketLocal packet = new PacketLocal(_context, peer, _session); packet.setSendStreamId(id); packet.setFlag(Packet.FLAG_ECHO | Packet.FLAG_NO_ACK | Packet.FLAG_SIGNATURE_INCLUDED); - packet.setOptionalFrom(_session.getMyDestination()); + packet.setOptionalFrom(); packet.setLocalPort(fromPort); packet.setRemotePort(toPort); packet.setPayload(new ByteArray(payload)); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java index 9577e0e5b..9725771a3 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java @@ -70,7 +70,7 @@ class MessageHandler implements I2PSessionMuxedListener { " (" + _manager + ')' + " proto: " + proto + " fromPort: " + fromPort + " toPort: " + toPort); - Packet packet = new Packet(); + Packet packet = new Packet(session); try { packet.readPacket(data, 0, data.length); packet.setRemotePort(fromPort); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java index 0bf00e4ca..a872b2d77 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.Arrays; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSession; import net.i2p.crypto.SigType; import net.i2p.data.Base64; import net.i2p.data.ByteArray; @@ -67,6 +68,7 @@ import net.i2p.util.Log; * */ class Packet { + protected final I2PSession _session; private long _sendStreamId; private long _receiveStreamId; private long _sequenceNum; @@ -167,8 +169,15 @@ class Packet { * Does no initialization. * See readPacket() for inbound packets, and the setters for outbound packets. */ - public Packet() { } + public Packet(I2PSession session) { + _session = session; + } + /** @since 0.9.21 */ + public I2PSession getSession() { + return _session; + } + private boolean _sendStreamIdSet = false; /** what stream do we send data to the peer on? @@ -334,10 +343,13 @@ class Packet { */ public Destination getOptionalFrom() { return _optionFrom; } - public void setOptionalFrom(Destination from) { - setFlag(FLAG_FROM_INCLUDED, from != null); - if (from == null) throw new RuntimeException("from is null!?"); - _optionFrom = from; + /** + * This sets the from field in the packet to the Destination for the session + * provided in the constructor. + */ + public void setOptionalFrom() { + setFlag(FLAG_FROM_INCLUDED, true); + _optionFrom = _session.getMyDestination(); } /** @@ -508,10 +520,10 @@ class Packet { return cur - offset; } - /** * how large would this packet be if we wrote it * @return How large the current packet would be + * * @throws IllegalStateException */ private int writtenSize() { @@ -546,6 +558,8 @@ class Packet { return size; } + + /** * Read the packet from the buffer (starting at the offset) and return * the number of bytes read. @@ -619,7 +633,7 @@ class Packet { try { Destination optionFrom = Destination.create(bais); cur += optionFrom.size(); - setOptionalFrom(optionFrom); + _optionFrom = optionFrom; } catch (IOException ioe) { throw new IllegalArgumentException("Bad from field", ioe); } catch (DataFormatException dfe) { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java index 500e62d56..4a96693b4 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java @@ -231,6 +231,8 @@ class PacketHandler { * This sends a reset back to the place this packet came from. * If the packet has no 'optional from' or valid signature, this does nothing. * This is not associated with a connection, so no con stats are updated. + * + * @param packet incoming packet to be replied to */ private void sendReset(Packet packet) { Destination from = packet.getOptionalFrom(); @@ -242,13 +244,13 @@ class PacketHandler { _log.warn("Can't send reset after recv spoofed packet: " + packet); return; } - PacketLocal reply = new PacketLocal(_context, from); + PacketLocal reply = new PacketLocal(_context, from, packet.getSession()); reply.setFlag(Packet.FLAG_RESET); reply.setFlag(Packet.FLAG_SIGNATURE_INCLUDED); reply.setSendStreamId(packet.getReceiveStreamId()); reply.setReceiveStreamId(packet.getSendStreamId()); // TODO remove this someday, as of 0.9.20 we do not require it - reply.setOptionalFrom(_manager.getSession().getMyDestination()); + reply.setOptionalFrom(); reply.setLocalPort(packet.getLocalPort()); reply.setRemotePort(packet.getRemotePort()); // this just sends the packet - no retries or whatnot diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java index 83153af72..d82033891 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java @@ -6,6 +6,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSession; import net.i2p.data.Destination; import net.i2p.data.SessionKey; import net.i2p.data.SessionTag; @@ -37,11 +38,20 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { private volatile SimpleTimer2.TimedEvent _resendEvent; /** not bound to a connection */ - public PacketLocal(I2PAppContext ctx, Destination to) { - this(ctx, to, null); + public PacketLocal(I2PAppContext ctx, Destination to, I2PSession session) { + super(session); + _context = ctx; + _createdOn = ctx.clock().now(); + _log = ctx.logManager().getLog(PacketLocal.class); + _to = to; + _connection = null; + _lastSend = -1; + _cancelledOn = -1; } + /** bound to a connection */ public PacketLocal(I2PAppContext ctx, Destination to, Connection con) { + super(con.getSession()); _context = ctx; _createdOn = ctx.clock().now(); _log = ctx.logManager().getLog(PacketLocal.class); @@ -203,10 +213,11 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { * @throws IllegalStateException if there is data missing or otherwise b0rked * @since 0.9.20 moved from Packet */ - public int writeSignedPacket(byte buffer[], int offset, I2PAppContext ctx, SigningPrivateKey key) throws IllegalStateException { + public int writeSignedPacket(byte buffer[], int offset) throws IllegalStateException { setFlag(FLAG_SIGNATURE_INCLUDED); + SigningPrivateKey key = _session.getPrivateKey(); int size = writePacket(buffer, offset, key.getType().getSigLen()); - _optionSignature = ctx.dsa().sign(buffer, offset, size, key); + _optionSignature = _context.dsa().sign(buffer, offset, size, key); //if (false) { // Log l = ctx.logManager().getLog(Packet.class); // l.error("Signing: " + toString()); @@ -258,7 +269,7 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { Connection con = _connection; if (con != null) { buf.append(" from "); - Destination local = con.getSession().getMyDestination(); + Destination local = _session.getMyDestination(); if (local != null) buf.append(local.calculateHash().toBase64().substring(0,4)); else @@ -275,7 +286,7 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { } return buf; } - + ////// begin WriteStatus methods /** diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 10b448bea..2039e5268 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -99,7 +99,7 @@ class PacketQueue implements SendMessageStatusListener { int size = 0; long beforeWrite = System.currentTimeMillis(); if (packet.shouldSign()) - size = packet.writeSignedPacket(buf, 0, _context, _session.getPrivateKey()); + size = packet.writeSignedPacket(buf, 0); else size = packet.writePacket(buf, 0); long writeTime = System.currentTimeMillis() - beforeWrite; @@ -197,7 +197,7 @@ class PacketQueue implements SendMessageStatusListener { //packet.setTagsSent(tagsSent); packet.incrementSends(); Connection c = packet.getConnection(); - if (c != null) { + if (c != null && _log.shouldDebug()) { String suffix = "wsize " + c.getOptions().getWindowSize() + " rto " + c.getOptions().getRTO(); c.getConnectionManager().getPacketHandler().displayPacket(packet, "SEND", suffix); } From f73101b0146d7505d2a6dbc838162a931d0dee20 Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 9 Jun 2015 01:09:23 +0000 Subject: [PATCH 043/258] Added checkAvailable(), update() and getStatus() to UpdateManager interface. --- .../src/net/i2p/update/UpdateManager.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index ce18c59ee..81f5c67c0 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -121,6 +121,80 @@ public interface UpdateManager { * @return true if valid, false if corrupt */ public boolean notifyComplete(UpdateTask task, String actualVersion, File file); + + /** + * Is an update available? + * Blocking. + * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @param maxWait max time to block + * @return new version or null if nothing newer is available + * @since 0.9.21 + */ + public String checkAvailable(UpdateType type, long maxWait); + + /** + * Is an update available? + * Blocking. + * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @param maxWait max time to block + * @param id id of this request + * @return new version or null if nothing newer is available + * @since 0.9.21 + */ + public String checkAvailable(UpdateType type, String id, long maxWait); + + /** + * Non-blocking. Does not check. + * Fails if check or update already in progress. + * If returns true, then call isUpdateInProgress() in a loop + * @param type the UpdateType of this request + * @param maxTime not honored by all Updaters + * @return true if task started + * @since 0.9.21 + */ + public boolean update(UpdateType type); + + /** + * Non-blocking. Does not check. + * Fails if check or update already in progress. + * If returns true, then call isUpdateInProgress() in a loop + * @param type the UpdateType of this request + * @param id id of this request + * @return true if task started + * @since 0.9.21 + */ + public boolean update(UpdateType type, String id); + + /** + * Non-blocking. Does not check. + * Fails if check or update already in progress. + * If returns true, then call isUpdateInProgress() in a loop + * @param type the UpdateType of this request + * @param maxTime not honored by all Updaters + * @return true if task started + * @since 0.9.21 + */ + public boolean update(UpdateType type, long maxTime); + + /** + * Non-blocking. Does not check. + * Fails if check or update already in progress. + * If returns true, then call isUpdateInProgress() in a loop + * @param type the UpdateType of this request + * @param maxTime not honored by all Updaters + * @param id id of this request + * @return true if task started + * @since 0.9.21 + */ + public boolean update(UpdateType type, String id, long maxTime); + + /** + * The status on any update current or last finished. + * @return status or "" + */ + public String getStatus(); /** * For debugging From 1a40e5741399cfab2baabf0e0360aef3f1aa2931 Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 9 Jun 2015 03:32:33 +0000 Subject: [PATCH 044/258] Added isUpdateInProgress() to UpdaterManager interface. --- core/java/src/net/i2p/update/UpdateManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index 81f5c67c0..0a7086010 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -145,6 +145,12 @@ public interface UpdateManager { */ public String checkAvailable(UpdateType type, String id, long maxWait); + /** + * Is any download in progress? + * Does not include checks. + */ + public boolean isUpdateInProgress(); + /** * Non-blocking. Does not check. * Fails if check or update already in progress. From 226bee64ef8aabd14cc7b16907d519e55112f7db Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 9 Jun 2015 03:44:34 +0000 Subject: [PATCH 045/258] Added more variants of isUpdateInProgress to UpdateManager. --- .../src/net/i2p/update/UpdateManager.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index 0a7086010..88d116743 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -146,11 +146,28 @@ public interface UpdateManager { public String checkAvailable(UpdateType type, String id, long maxWait); /** - * Is any download in progress? - * Does not include checks. + * Is a router update being downloaded? + * @return true iff router update is being downloaded + * @since 0.9.21 */ public boolean isUpdateInProgress(); + /** + * Is a router update being downloaded? + * @param type the UpdateType of this request + * @return true iff router update is being downloaded + * @since 0.9.21 + */ + public boolean isUpdateInProgress(UpdateType type); + + /** + * Is a router update being downloaded? + * @param type the UpdateType of this request + * @param id of this request + * @return true iff router update is being downloaded + * @since 0.9.21 + */ + public boolean isUpdateInProgress(UpdateType type, String id); /** * Non-blocking. Does not check. * Fails if check or update already in progress. From e067761947ae22a47280ce81a08abd98698196dc Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 9 Jun 2015 03:57:44 +0000 Subject: [PATCH 046/258] Added a new flavour of checkAvailable() to UpdateManager interface. --- .../router/update/ConsoleUpdateManager.java | 26 ++++++++++++++++++- .../src/net/i2p/update/UpdateManager.java | 10 +++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index ea153725c..93b0157e0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -275,7 +275,29 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { public String getStatus() { return _status; } - + + /** + * Is an update available? + * Blocking. + * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @param id id of this request + * @param maxWait max time to block + * @return new version or null if nothing newer is available + * @since 0.9.21 + */ + public String checkAvailable(UpdateType type) { + return checkAvailable(type, "", DEFAULT_CHECK_TIME); + } + + /** + * Is an update available? + * Blocking. + * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @param maxWait max time to block + * @return new version or null if nothing newer is available + */ public String checkAvailable(UpdateType type, long maxWait) { return checkAvailable(type, "", maxWait); } @@ -284,6 +306,8 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { * Is an update available? * Blocking. * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @param id id of this request * @param maxWait max time to block * @return new version or null if nothing newer is available */ diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index 88d116743..0cc3c79e4 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -122,6 +122,16 @@ public interface UpdateManager { */ public boolean notifyComplete(UpdateTask task, String actualVersion, File file); + /** + * Is an update available? + * Blocking. + * An available update may still have a constraint or lack sources. + * @param type the UpdateType of this request + * @return new version or null if nothing newer is available + * @since 0.9.21 + */ + public String checkAvailable(UpdateType type); + /** * Is an update available? * Blocking. From c666f8a4f9b6533de811ae8cc541a4f5f3418ffa Mon Sep 17 00:00:00 2001 From: dev Date: Tue, 9 Jun 2015 14:30:42 +0000 Subject: [PATCH 047/258] Javadoc fixes. --- .../java/src/net/i2p/router/update/ConsoleUpdateManager.java | 2 -- core/java/src/net/i2p/update/UpdateManager.java | 1 - 2 files changed, 3 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index 93b0157e0..04a8d779f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -281,8 +281,6 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { * Blocking. * An available update may still have a constraint or lack sources. * @param type the UpdateType of this request - * @param id id of this request - * @param maxWait max time to block * @return new version or null if nothing newer is available * @since 0.9.21 */ diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index 0cc3c79e4..b5035ec95 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -183,7 +183,6 @@ public interface UpdateManager { * Fails if check or update already in progress. * If returns true, then call isUpdateInProgress() in a loop * @param type the UpdateType of this request - * @param maxTime not honored by all Updaters * @return true if task started * @since 0.9.21 */ From 7b84676f4a744bbeea8c4b0c818fb87dc143c8fc Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 12:37:19 +0000 Subject: [PATCH 048/258] remove session ref from PacketQueue --- .../net/i2p/client/streaming/impl/ConnectionManager.java | 4 ++-- .../src/net/i2p/client/streaming/impl/PacketQueue.java | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index 077c6a1e9..e712cd1ca 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -88,7 +88,7 @@ class ConnectionManager { // As of 0.9.1, listen on configured port (default 0 = all) int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY; _session.addMuxedSessionListener(_messageHandler, protocol, defaultOptions.getLocalPort()); - _outboundQueue = new PacketQueue(_context, _session); + _outboundQueue = new PacketQueue(_context); _recentlyClosed = new LHMCache(32); /** Socket timeout for accept() */ _soTimeout = -1; @@ -893,7 +893,7 @@ class ConnectionManager { } /** - * @since 0.9.20 + * @since 0.9.21 */ @Override public String toString() { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 2039e5268..073ce3d15 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -28,7 +28,6 @@ import net.i2p.util.SimpleTimer2; class PacketQueue implements SendMessageStatusListener { private final I2PAppContext _context; private final Log _log; - private final I2PSession _session; private final ByteCache _cache = ByteCache.getInstance(64, 36*1024); private final Map _messageStatusMap; private volatile boolean _dead; @@ -45,9 +44,8 @@ class PacketQueue implements SendMessageStatusListener { private static final long REMOVE_EXPIRED_TIME = 67*1000; private static final boolean ENABLE_STATUS_LISTEN = true; - public PacketQueue(I2PAppContext context, I2PSession session) { + public PacketQueue(I2PAppContext context) { _context = context; - _session = session; _log = context.logManager().getLog(PacketQueue.class); _messageStatusMap = new ConcurrentHashMap(16); new RemoveExpired(); @@ -153,14 +151,15 @@ class PacketQueue implements SendMessageStatusListener { options.setTagThreshold(thresh); } } + I2PSession session = packet.getSession(); if (listenForStatus) { - long id = _session.sendMessage(packet.getTo(), buf, 0, size, + long id = session.sendMessage(packet.getTo(), buf, 0, size, I2PSession.PROTO_STREAMING, packet.getLocalPort(), packet.getRemotePort(), options, this); _messageStatusMap.put(Long.valueOf(id), packet.getConnection()); sent = true; } else { - sent = _session.sendMessage(packet.getTo(), buf, 0, size, + sent = session.sendMessage(packet.getTo(), buf, 0, size, I2PSession.PROTO_STREAMING, packet.getLocalPort(), packet.getRemotePort(), options); } From f341e5566b3efdf3d51c4eebc6fd238b5d0e91f8 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 19:14:33 +0000 Subject: [PATCH 049/258] Pass session in connect(); Store the session in Connection; Don't create a new ConnectionManager for a subsession, now that all components track the session properly. @since updates --- .../i2p/client/streaming/impl/Connection.java | 7 +- .../streaming/impl/ConnectionManager.java | 13 +++- .../streaming/impl/I2PSocketManagerFull.java | 75 ++++++++++++------- 3 files changed, 62 insertions(+), 33 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java index 83fd80229..1d43a6cef 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java @@ -28,6 +28,7 @@ class Connection { private final I2PAppContext _context; private final Log _log; private final ConnectionManager _connectionManager; + private final I2PSession _session; private Destination _remotePeer; private final AtomicLong _sendStreamId = new AtomicLong(); private final AtomicLong _receiveStreamId = new AtomicLong(); @@ -112,12 +113,14 @@ class Connection { /** * @param opts may be null */ - public Connection(I2PAppContext ctx, ConnectionManager manager, SchedulerChooser chooser, + public Connection(I2PAppContext ctx, ConnectionManager manager, + I2PSession session, SchedulerChooser chooser, SimpleTimer2 timer, PacketQueue queue, ConnectionPacketHandler handler, ConnectionOptions opts, boolean isInbound) { _context = ctx; _connectionManager = manager; + _session = session; _chooser = chooser; _outboundQueue = queue; _handler = handler; @@ -877,7 +880,7 @@ class Connection { /** @since 0.9.21 */ public ConnectionManager getConnectionManager() { return _connectionManager; } - public I2PSession getSession() { return _connectionManager.getSession(); } + public I2PSession getSession() { return _session; } public I2PSocketFull getSocket() { return _socket; } public void setSocket(I2PSocketFull socket) { _socket = socket; } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index e712cd1ca..c55c8a67d 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -214,7 +214,8 @@ class ConnectionManager { ConnectionOptions opts = new ConnectionOptions(_defaultOptions); opts.setPort(synPacket.getRemotePort()); opts.setLocalPort(synPacket.getLocalPort()); - Connection con = new Connection(_context, this, _schedulerChooser, _timer, _outboundQueue, _conPacketHandler, opts, true); + Connection con = new Connection(_context, this, synPacket.getSession(), _schedulerChooser, + _timer, _outboundQueue, _conPacketHandler, opts, true); _tcbShare.updateOptsFromShare(con); boolean reject = false; int active = 0; @@ -393,9 +394,10 @@ class ConnectionManager { * * @param peer Destination to contact * @param opts Connection's options + * @param session generally the session from the constructor, but could be a subsession * @return new connection, or null if we have exceeded our limit */ - public Connection connect(Destination peer, ConnectionOptions opts) { + public Connection connect(Destination peer, ConnectionOptions opts, I2PSession session) { Connection con = null; long expiration = _context.clock().now(); long tmout = opts.getConnectTimeout(); @@ -429,7 +431,7 @@ class ConnectionManager { // try { _connectionLock.wait(remaining); } catch (InterruptedException ie) {} try { Thread.sleep(remaining/4); } catch (InterruptedException ie) {} } else { - con = new Connection(_context, this, _schedulerChooser, _timer, + con = new Connection(_context, this, session, _schedulerChooser, _timer, _outboundQueue, _conPacketHandler, opts, false); con.setRemotePeer(peer); assignReceiveStreamId(con); @@ -591,7 +593,12 @@ class ConnectionManager { public MessageHandler getMessageHandler() { return _messageHandler; } public PacketHandler getPacketHandler() { return _packetHandler; } + + /** + * This is the primary session only + */ public I2PSession getSession() { return _session; } + public void updateOptsFromShare(Connection con) { _tcbShare.updateOptsFromShare(con); } public void updateShareOpts(Connection con) { _tcbShare.updateShareOpts(con); } // Both of these methods are diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 7ea8c90bd..452f715db 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -35,6 +34,7 @@ import net.i2p.data.PrivateKey; import net.i2p.data.PublicKey; import net.i2p.data.SimpleDataStructure; import net.i2p.util.ConvertToHash; +import net.i2p.util.ConcurrentHashSet; import net.i2p.util.Log; /** @@ -51,7 +51,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final I2PAppContext _context; private final Log _log; private final I2PSession _session; - private final ConcurrentHashMap _subsessions; + private final Set _subsessions; private final I2PServerSocketFull _serverSocket; private StandardServerSocket _realServerSocket; private final ConnectionOptions _defaultOptions; @@ -61,7 +61,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { private final ConnectionManager _connectionManager; private final AtomicBoolean _isDestroyed = new AtomicBoolean(); - /** @since 0.9.20 */ + /** @since 0.9.21 */ private static final Set _dsaOnly = new HashSet(16); private static final String[] DSA_ONLY_HASHES = { // list from http://zzz.i2p/topics/1682?page=1#p8414 @@ -140,7 +140,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { public I2PSocketManagerFull(I2PAppContext context, I2PSession session, Properties opts, String name) { _context = context; _session = session; - _subsessions = new ConcurrentHashMap(4); + _subsessions = new ConcurrentHashSet(4); _log = _context.logManager().getLog(I2PSocketManagerFull.class); _name = name + " " + (__managerId.incrementAndGet()); @@ -186,7 +186,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { if (privateKeyStream == null) { @@ -214,15 +214,15 @@ public class I2PSocketManagerFull implements I2PSocketManager { privateKeyStream = new ByteArrayInputStream(keyStream.toByteArray()); } I2PSession rv = _session.addSubsession(privateKeyStream, opts); - ConnectionOptions defaultOptions = new ConnectionOptions(opts); - ConnectionManager connectionManager = new ConnectionManager(_context, rv, defaultOptions); - ConnectionManager old = _subsessions.putIfAbsent(rv, connectionManager); - if (old != null) { + boolean added = _subsessions.add(rv); + if (!added) { // shouldn't happen _session.removeSubsession(rv); - connectionManager.shutdown(); throw new I2PSessionException("dup"); } + ConnectionOptions defaultOptions = new ConnectionOptions(opts); + int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY; + rv.addMuxedSessionListener(_connectionManager.getMessageHandler(), protocol, defaultOptions.getLocalPort()); if (_log.shouldLog(Log.WARN)) _log.warn("Added subsession " + rv); return rv; @@ -230,7 +230,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * @param opts may be null - * @since 0.9.20 copied from I2PSocketManagerFactory + * @since 0.9.21 copied from I2PSocketManagerFactory */ private SigType getSigType(Properties opts) { if (opts != null) { @@ -252,13 +252,12 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * Remove the subsession * - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session) { _session.removeSubsession(session); - ConnectionManager cm = _subsessions.remove(session); - if (cm != null) { - cm.shutdown(); + boolean removed = _subsessions.remove(session); + if (removed) { if (_log.shouldLog(Log.WARN)) _log.warn("Removeed subsession " + session); } else { @@ -269,7 +268,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions() { return _session.getSubsessions(); @@ -282,6 +281,9 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * The accept() call. * + * This only listens on the primary session. There is no way to get + * incoming connections on a subsession. + * * @return connected I2PSocket, or null through 0.9.16, non-null as of 0.9.17 * @throws I2PException if session is closed * @throws ConnectException (since 0.9.17; I2PServerSocket interface always declared it) @@ -301,6 +303,8 @@ public class I2PSocketManagerFull implements I2PSocketManager { * * Uses the ports from the default options. * + * TODO There is no way to ping on a subsession. + * * @param peer * @param timeoutMs timeout in ms, greater than zero * @return true on success, false on failure @@ -318,6 +322,8 @@ public class I2PSocketManagerFull implements I2PSocketManager { * the timeout specified, false otherwise. This call blocks. * * Uses the ports specified. + * + * TODO There is no way to ping on a subsession. * * @param peer Destination to ping * @param localPort 0 - 65535 @@ -341,6 +347,8 @@ public class I2PSocketManagerFull implements I2PSocketManager { * the timeout specified, false otherwise. This call blocks. * * Uses the ports specified. + * + * TODO There is no way to ping on a subsession. * * @param peer Destination to ping * @param localPort 0 - 65535 @@ -374,6 +382,8 @@ public class I2PSocketManagerFull implements I2PSocketManager { * Parameters in the I2PSocketOptions interface may be changed directly * with the setters; no need to use this method for those. * This does NOT update the underlying I2CP or tunnel options; use getSession().updateOptions() for that. + * + * TODO There is no way to update the options on a subsession. * * @param options as created from a call to buildOptions(properties), non-null */ @@ -388,6 +398,8 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * Current options, not a copy, setters may be used to make changes. + * + * TODO There is no facility to specify the session. */ public I2PSocketOptions getDefaultOptions() { return _defaultOptions; @@ -397,6 +409,9 @@ public class I2PSocketManagerFull implements I2PSocketManager { * Returns non-null socket. * This method does not throw exceptions, but methods on the returned socket * may throw exceptions if the socket or socket manager is closed. + * + * This only listens on the primary session. There is no way to get + * incoming connections on a subsession. * * @return non-null */ @@ -407,6 +422,10 @@ public class I2PSocketManagerFull implements I2PSocketManager { /** * Like getServerSocket but returns a real ServerSocket for easier porting of apps. + * + * This only listens on the primary session. There is no way to get + * incoming connections on a subsession. + * * @since 0.8.4 */ public synchronized ServerSocket getStandardServerSocket() throws IOException { @@ -417,16 +436,16 @@ public class I2PSocketManagerFull implements I2PSocketManager { } private void verifySession() throws I2PException { - verifySession(_connectionManager); + verifySession(_connectionManager.getSession()); } - /** @since 0.9.20 */ - private void verifySession(ConnectionManager cm) throws I2PException { + /** @since 0.9.21 */ + private void verifySession(I2PSession session) throws I2PException { if (_isDestroyed.get()) throw new I2PException("Session was closed"); - if (!cm.getSession().isClosed()) + if (!session.isClosed()) return; - cm.getSession().connect(); + session.connect(); } /** @@ -457,22 +476,22 @@ public class I2PSocketManagerFull implements I2PSocketManager { _log.info("Connecting to " + peer.calculateHash().toBase64().substring(0,6) + " with options: " + opts); // pick the subsession here - ConnectionManager cm = _connectionManager; + I2PSession session = _session; if (!_subsessions.isEmpty()) { Hash h = peer.calculateHash(); if (_dsaOnly.contains(h)) { // FIXME just taking the first one for now - for (Map.Entry e : _subsessions.entrySet()) { - if (e.getKey().getMyDestination().getSigType() == SigType.DSA_SHA1) { - cm = e.getValue(); + for (I2PSession sess : _subsessions) { + if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1) { + session = sess; break; } } } } - verifySession(cm); + verifySession(session); // the following blocks unless connect delay > 0 - Connection con = cm.connect(peer, opts); + Connection con = _connectionManager.connect(peer, opts, session); if (con == null) throw new TooManyStreamsException("Too many streams, max " + _defaultOptions.getMaxConns()); I2PSocketFull socket = new I2PSocketFull(con,_context); @@ -556,7 +575,7 @@ public class I2PSocketManagerFull implements I2PSocketManager { _connectionManager.setAllowIncomingConnections(false); _connectionManager.shutdown(); if (!_subsessions.isEmpty()) { - for (I2PSession sess : _subsessions.keySet()) { + for (I2PSession sess : _subsessions) { removeSubsession(sess); } } From 605602e001e98158966c0d2f017314f982f60a22 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 19:15:01 +0000 Subject: [PATCH 050/258] @since updates --- .../client/streaming/I2PSocketManager.java | 6 ++-- core/java/src/net/i2p/client/I2PSession.java | 6 ++-- .../src/net/i2p/client/I2PSessionImpl.java | 12 ++++---- .../src/net/i2p/client/I2PSessionImpl2.java | 2 +- .../net/i2p/client/I2PSessionMuxedImpl.java | 2 +- .../client/RequestLeaseSetMessageHandler.java | 2 +- core/java/src/net/i2p/client/SubSession.java | 5 +--- .../router/client/ClientConnectionRunner.java | 28 +++++++++---------- .../net/i2p/router/client/ClientManager.java | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java index 3c2a37325..a969581bd 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java @@ -42,18 +42,18 @@ public interface I2PSocketManager { * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; /** - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session); /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions(); diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java index dc79a1f4f..016293ea7 100644 --- a/core/java/src/net/i2p/client/I2PSession.java +++ b/core/java/src/net/i2p/client/I2PSession.java @@ -255,19 +255,19 @@ public interface I2PSession { * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session); /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions(); diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 035536c6c..429459d7b 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -226,7 +226,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { this(primary.getContext(), options, primary.getHandlerMap(), primary.getProducer(), true); @@ -307,7 +307,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 * @param privateKeyStream null for transient, if non-null must have same encryption keys as primary session * and different signing keys * @param opts subsession options if any, may be null - * @since 0.9.19 + * @since 0.9.21 */ public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException { if (!_routerSupportsSubsessions) @@ -335,7 +335,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 } /** - * @since 0.9.19 + * @since 0.9.21 */ public void removeSubsession(I2PSession session) { if (!(session instanceof SubSession)) @@ -355,7 +355,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 /** * @return a list of subsessions, non-null, does not include the primary session - * @since 0.9.19 + * @since 0.9.21 */ public List getSubsessions() { synchronized(_subsessionLock) { @@ -985,13 +985,13 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 /** * For Subsessions - * @since 0.9.19 + * @since 0.9.21 */ I2PClientMessageHandlerMap getHandlerMap() { return _handlerMap; } /** * For Subsessions - * @since 0.9.19 + * @since 0.9.21 */ I2PAppContext getContext() { return _context; } diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/I2PSessionImpl2.java index 4002bab80..d6fe3ad36 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl2.java @@ -102,7 +102,7 @@ class I2PSessionImpl2 extends I2PSessionImpl { * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionImpl2(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { super(primary, destKeyStream, options); diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java index f4ae207e1..653fddc9a 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java @@ -89,7 +89,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 { * @param destKeyStream stream containing the private key data, * format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile} * @param options set of options to configure the router with, if null will use System properties - * @since 0.9.19 + * @since 0.9.21 */ protected I2PSessionMuxedImpl(I2PSessionImpl primary, InputStream destKeyStream, Properties options) throws I2PSessionException { super(primary, destKeyStream, options); diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java index e6729a2e4..68f8f07b8 100644 --- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java @@ -225,7 +225,7 @@ class RequestLeaseSetMessageHandler extends HandlerImpl { /** * Existing crypto key, new signing key - * @since 0.9.20 + * @since 0.9.21 */ public LeaseInfo(PrivateKey privKey, Destination dest) { SimpleDataStructure signKeys[]; diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index 2a2882335..e115099b4 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -43,7 +43,7 @@ import net.i2p.util.I2PAppThread; * While the I2CP protocol, in theory, allows for fully independent sessions * over the same I2CP connection, this is not currently supported by the router. * - * @since 0.9.19 + * @since 0.9.21 */ class SubSession extends I2PSessionMuxedImpl { private final I2PSessionMuxedImpl _primary; @@ -64,7 +64,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * @throws UnsupportedOperationException always - * @since 0.9.19 */ @Override public I2PSession addSubsession(InputStream destKeyStream, Properties opts) throws I2PSessionException { @@ -74,7 +73,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * Does nothing. - * @since 0.9.19 */ @Override public void removeSubsession(I2PSession session) {} @@ -82,7 +80,6 @@ class SubSession extends I2PSessionMuxedImpl { /** * Unsupported in a subsession. * @return empty list always - * @since 0.9.19 */ @Override public List getSubsessions() { diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index 9cfa4da19..aaa106a78 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -115,7 +115,7 @@ class ClientConnectionRunner { /** * For multisession - * @since 0.9.19 + * @since 0.9.21 */ private static class SessionParams { final Destination dest; @@ -213,7 +213,7 @@ class ClientConnectionRunner { * Current client's config, * will be null if session not found * IS subsession aware. - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ public SessionConfig getConfig(Hash h) { SessionParams sp = _sessions.get(h); @@ -226,7 +226,7 @@ class ClientConnectionRunner { * Current client's config, * will be null if session not found * IS subsession aware. - * @since 0.9.19 added id param + * @since 0.9.21 added id param */ public SessionConfig getConfig(SessionId id) { for (SessionParams sp : _sessions.values()) { @@ -239,7 +239,7 @@ class ClientConnectionRunner { /** * Primary client's config, * will be null if session not set up - * @since 0.9.19 + * @since 0.9.21 */ public SessionConfig getPrimaryConfig() { for (SessionParams sp : _sessions.values()) { @@ -273,7 +273,7 @@ class ClientConnectionRunner { * Currently allocated leaseSet. * IS subsession aware. Returns primary leaseset only. * @return leaseSet or null if not yet set or unknown hash - * @since 0.9.19 added hash parameter + * @since 0.9.21 added hash parameter */ public LeaseSet getLeaseSet(Hash h) { SessionParams sp = _sessions.get(h); @@ -312,7 +312,7 @@ class ClientConnectionRunner { /** * Return the hash for the given ID * @return hash or null if unknown - * @since 0.9.19 + * @since 0.9.21 */ public Hash getDestHash(SessionId id) { for (Map.Entry e : _sessions.entrySet()) { @@ -325,7 +325,7 @@ class ClientConnectionRunner { /** * Return the dest for the given ID * @return dest or null if unknown - * @since 0.9.19 + * @since 0.9.21 */ public Destination getDestination(SessionId id) { for (SessionParams sp : _sessions.values()) { @@ -340,7 +340,7 @@ class ClientConnectionRunner { * * @param h the local target * @return current client's sessionId or null if not yet set or not a valid hash - * @since 0.9.19 + * @since 0.9.21 */ SessionId getSessionId(Hash h) { SessionParams sp = _sessions.get(h); @@ -353,7 +353,7 @@ class ClientConnectionRunner { * Subsession aware. * * @return all current client's sessionIds, non-null - * @since 0.9.19 + * @since 0.9.21 */ List getSessionIds() { List rv = new ArrayList(_sessions.size()); @@ -369,7 +369,7 @@ class ClientConnectionRunner { * Subsession aware. * * @return all current client's destinations, non-null - * @since 0.9.19 + * @since 0.9.21 */ List getDestinations() { List rv = new ArrayList(_sessions.size()); @@ -384,7 +384,7 @@ class ClientConnectionRunner { * * @param hash for the session * @throws IllegalStateException if already set - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ void setSessionId(Hash hash, SessionId id) { if (hash == null) @@ -398,7 +398,7 @@ class ClientConnectionRunner { /** * Kill the session. Caller must kill runner if none left. * - * @since 0.9.19 + * @since 0.9.21 */ void removeSession(SessionId id) { boolean isPrimary = false; @@ -430,7 +430,7 @@ class ClientConnectionRunner { /** * Data for the current leaseRequest, or null if there is no active leaseSet request. * Not subsession aware. Returns primary ID only. - * @since 0.9.19 added hash param + * @since 0.9.21 added hash param */ LeaseRequestState getLeaseRequest(Hash h) { SessionParams sp = _sessions.get(h); @@ -720,7 +720,7 @@ class ClientConnectionRunner { * * @param toHash non-null * @param fromDest generally null when from remote, non-null if from local - * @since 0.9.20 + * @since 0.9.21 */ void receiveMessage(Hash toHash, Destination fromDest, Payload payload) { SessionParams sp = _sessions.get(toHash); diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index d9d4a3bd2..ea35681f9 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -242,7 +242,7 @@ class ClientManager { /** * Remove only the following session. Does not remove the runner if it has more. * - * @since 0.9.19 + * @since 0.9.21 */ public void unregisterSession(SessionId id, Destination dest) { if (_log.shouldLog(Log.WARN)) From 8962bfb6bce1c186c83e90ad02d89f62c8708a38 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 19:23:26 +0000 Subject: [PATCH 051/258] more @since updates --- core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java | 5 +++++ core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/HostLookupMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/HostReplyMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/I2CPMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java | 2 +- core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java | 2 +- .../src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java | 2 +- .../src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java | 2 +- .../src/net/i2p/data/i2cp/ReconfigureSessionMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java | 2 +- .../net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/SendMessageMessage.java | 2 +- core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java | 2 +- router/java/src/net/i2p/router/TunnelPoolSettings.java | 6 +++--- .../src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java | 2 +- .../src/net/i2p/router/tunnel/pool/TunnelPoolManager.java | 4 ++-- 19 files changed, 26 insertions(+), 21 deletions(-) diff --git a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java index 0cbb854ff..d7c55e53b 100644 --- a/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/CreateLeaseSetMessage.java @@ -38,6 +38,11 @@ public class CreateLeaseSetMessage extends I2CPMessageImpl { return _sessionId; } + /** + * Return the SessionId for this message. + * + * @since 0.9.21 + */ @Override public SessionId sessionId() { return _sessionId; diff --git a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java index 4275863e1..67090011f 100644 --- a/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/DestroySessionMessage.java @@ -35,7 +35,7 @@ public class DestroySessionMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java index c4405f90a..66835ef9f 100644 --- a/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java +++ b/core/java/src/net/i2p/data/i2cp/HostLookupMessage.java @@ -79,7 +79,7 @@ public class HostLookupMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java index b350f225a..ad182d6a6 100644 --- a/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java +++ b/core/java/src/net/i2p/data/i2cp/HostReplyMessage.java @@ -76,7 +76,7 @@ public class HostReplyMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java index 58d312013..3cc7da503 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessage.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessage.java @@ -73,7 +73,7 @@ public interface I2CPMessage extends DataStructure { * some return a long, so we define a new method here. * * @return SessionId or null if this message type does not include a SessionId - * @since 0.9.19 + * @since 0.9.21 */ public SessionId sessionId(); } diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java index 19b8d1cc3..ff597559f 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java @@ -135,7 +135,7 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM * some return a long, so we define a new method here. * * @return null always. Extending classes with a SessionId must override. - * @since 0.9.19 + * @since 0.9.21 */ public SessionId sessionId() { return null; } } diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java index e5969a0a8..c7b78c460 100644 --- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java @@ -40,7 +40,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java index 182caca9e..401fa96f0 100644 --- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java @@ -196,7 +196,7 @@ public class MessageStatusMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java index 744dfd356..03e3e4aae 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java @@ -39,7 +39,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java index 5be2bbfeb..accf9dbe3 100644 --- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageEndMessage.java @@ -38,7 +38,7 @@ public class ReceiveMessageEndMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java index 8f80f531b..7532af358 100644 --- a/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReconfigureSessionMessage.java @@ -36,7 +36,7 @@ public class ReconfigureSessionMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java index cfdbd6cfe..4118ac322 100644 --- a/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java +++ b/core/java/src/net/i2p/data/i2cp/ReportAbuseMessage.java @@ -38,7 +38,7 @@ public class ReportAbuseMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java index 15d9b70ec..b972fab38 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestLeaseSetMessage.java @@ -48,7 +48,7 @@ public class RequestLeaseSetMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java index 3edd06171..6d172c919 100644 --- a/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java +++ b/core/java/src/net/i2p/data/i2cp/RequestVariableLeaseSetMessage.java @@ -58,7 +58,7 @@ public class RequestVariableLeaseSetMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public 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 4515f3872..0a6e69b3a 100644 --- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java @@ -41,7 +41,7 @@ public class SendMessageMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java index 122cf5d1e..49509a552 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java +++ b/core/java/src/net/i2p/data/i2cp/SessionStatusMessage.java @@ -45,7 +45,7 @@ public class SessionStatusMessage extends I2CPMessageImpl { /** * Return the SessionId for this message. * - * @since 0.9.19 + * @since 0.9.21 */ @Override public SessionId sessionId() { diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java index 315aeefb8..b7984c085 100644 --- a/router/java/src/net/i2p/router/TunnelPoolSettings.java +++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java @@ -218,7 +218,7 @@ public class TunnelPoolSettings { /** * Other destinations that use the same tunnel (or null if exploratory) * Modifiable, concurrent, not a copy - * @since 0.9.19 + * @since 0.9.21 */ public Set getAliases() { return _aliases; @@ -227,7 +227,7 @@ public class TunnelPoolSettings { /** * Other destination that this is an alias of (or null). * If non-null, don't build tunnels. - * @since 0.9.19 + * @since 0.9.21 */ public Hash getAliasOf() { return _aliasOf; @@ -237,7 +237,7 @@ public class TunnelPoolSettings { /** * Set other destination that this is an alias of (or null). * If non-null, don't build tunnels. - * @since 0.9.19 + * @since 0.9.21 */ public void setAliasOf(Hash h) { _aliasOf = h; diff --git a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java index 03b8f0563..1dc45eb61 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/AliasedTunnelPool.java @@ -15,7 +15,7 @@ import net.i2p.util.Log; * A tunnel pool with its own settings and Destination, * but uses another pool for its tunnels. * - * @since 0.9.20 + * @since 0.9.21 */ public class AliasedTunnelPool extends TunnelPool { 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 f318b479d..e2e54e6e1 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -441,7 +441,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { * Must have same encryption key an a different signing key. * @throws IllegalArgumentException if not * @return success - * @since 0.9.19 + * @since 0.9.21 */ public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient) { if (dest.getSigningPublicKey().equals(existingClient.getSigningPublicKey())) @@ -485,7 +485,7 @@ public class TunnelPoolManager implements TunnelManagerFacade { /** * Remove a destination for the same tunnels as another. - * @since 0.9.19 + * @since 0.9.21 */ public void removeAlias(Destination dest) { Hash h = dest.calculateHash(); From 013b5fd85bcc0bc72b3b574ff3268e5e716aaac2 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 19:24:20 +0000 Subject: [PATCH 052/258] more @since updates --- router/java/src/net/i2p/router/TunnelManagerFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index a95fbd1f1..208ae81c2 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -152,13 +152,13 @@ public interface TunnelManagerFacade extends Service { * Must have same encryption key an a different signing key. * @throws IllegalArgumentException if not * @return success - * @since 0.9.19 + * @since 0.9.21 */ public boolean addAlias(Destination dest, ClientTunnelSettings settings, Destination existingClient); /** * Remove another destination to the same tunnels. - * @since 0.9.19 + * @since 0.9.21 */ public void removeAlias(Destination dest); From 09f68e44ca913cffd4beeca8888d62303173d65a Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 10 Jun 2015 23:24:38 +0000 Subject: [PATCH 053/258] enable ECDSA by default for shared clients --- .../java/src/net/i2p/i2ptunnel/TunnelController.java | 6 +++--- .../java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 2066911ad..d5ca354c5 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -651,9 +651,9 @@ public class TunnelController implements Logging { } // same default logic as in EditBean.getSigType() if (!isClient(type) || - ((type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) || - type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT)) - && !Boolean.valueOf(getSharedClient()))) { + type.equals(TYPE_IRC_CLIENT) || type.equals(TYPE_STD_CLIENT) || + type.equals(TYPE_SOCKS_IRC) || type.equals(TYPE_STREAMR_CLIENT) || + (type.equals(TYPE_HTTP_CLIENT) && Boolean.valueOf(getSharedClient()))) { if (!_config.containsKey(OPT_SIG_TYPE)) _config.setProperty(OPT_SIG_TYPE, PREFERRED_SIGTYPE.name()); } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java index 2073efdf2..0cc4e5278 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java @@ -439,12 +439,12 @@ public class GeneralHelper { } if (type == null) { // same default logic as in TunnelController.setConfig() - if ((!TunnelController.isClient(ttype) || - ((TunnelController.TYPE_IRC_CLIENT.equals(ttype) || - TunnelController.TYPE_SOCKS_IRC.equals(ttype) || - TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) || - TunnelController.TYPE_STD_CLIENT.equals(ttype)) && - !isShared))) + if (!TunnelController.isClient(ttype) || + TunnelController.TYPE_IRC_CLIENT.equals(ttype) || + TunnelController.TYPE_SOCKS_IRC.equals(ttype) || + TunnelController.TYPE_STREAMR_CLIENT.equals(ttype) || + TunnelController.TYPE_STD_CLIENT.equals(ttype) || + (TunnelController.TYPE_HTTP_CLIENT.equals(ttype) && isShared)) type = TunnelController.PREFERRED_SIGTYPE; else type = SigType.DSA_SHA1; From b9e07bc9aaaf2a74ef0f4fa1ebad1c7539d9c732 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 13 Jun 2015 14:20:08 +0000 Subject: [PATCH 054/258] i2psnark: Fix NPE (ticket #1602) --- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 62f66f68f..84949d794 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1738,7 +1738,7 @@ public class SnarkManager implements CompleteListener { int totalDeleted = 0; synchronized (_snarks) { for (Snark snark : _snarks.values()) { - torrents.add(new SHA1Hash(snark.getMetaInfo().getInfoHash())); + torrents.add(new SHA1Hash(snark.getInfoHash())); } synchronized (_configLock) { for (int i = 0; i < B64.length(); i++) { From 25f6c3d9e1e6ed17f09a92b54e2a2f374d4c787b Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 13 Jun 2015 15:05:28 +0000 Subject: [PATCH 055/258] apparmor: tweaks to TMPDIR rules --- debian/apparmor/i2p | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p index 5d4ad3403..f0b7b77ef 100644 --- a/debian/apparmor/i2p +++ b/debian/apparmor/i2p @@ -51,11 +51,16 @@ # 'm' is needed by the I2P-Bote plugin /{,lib/live/mount/overlay/}tmp/ rwm, + owner /{,lib/live/mount/overlay/}tmp/hsperfdata_i2psvc/ rwk, + owner /{,lib/live/mount/overlay/}tmp/hsperfdata_i2psvc/** rw, + owner /{,lib/live/mount/overlay/}tmp/wrapper[0-9]*.tmp rwk, + owner /{,lib/live/mount/overlay/}tmp/wrapper[0-9]*.tmp/** rw, owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/ rwm, owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/** rwklm, # Prevent spamming the logs deny /dev/tty rw, + deny /{,lib/live/mount/overlay/}var/tmp/ r, deny @{PROC}/[0-9]*/fd/ r, deny /usr/sbin/ r, deny /var/cache/fontconfig/ wk, From 93c7860d2be3038c44d9343e749322b644c1281c Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 13 Jun 2015 15:13:35 +0000 Subject: [PATCH 056/258] NetDB: Improve routing of DatabaseStoreMessage acks Send our own RI unsolicited in reply if we aren't floodfill Don't ack or flood a store of an unknown type PeerTestJob: Don't generate zero reply token Tunnels: More checks of messages received down exploratory tunnels javadocs and comments --- history.txt | 18 ++++ .../src/net/i2p/router/RouterVersion.java | 2 +- .../router/message/SendMessageDirectJob.java | 22 ++++- ...andleFloodfillDatabaseStoreMessageJob.java | 87 ++++++++++++++----- .../i2p/router/peermanager/PeerTestJob.java | 13 ++- .../tunnel/InboundMessageDistributor.java | 31 ++++++- .../i2p/router/tunnel/TunnelDispatcher.java | 3 +- 7 files changed, 146 insertions(+), 30 deletions(-) diff --git a/history.txt b/history.txt index 237a51474..ca5af725a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,12 @@ +2015-06-13 zzz + * i2psnark: Fix NPE (ticket #1602) + * NetDB: + - Improve routing of DatabaseStoreMessage acks + - Send our own RI unsolicited in reply if we aren't floodfill + - Don't ack or flood a store of an unknown type + * PeerTestJob: Don't generate zero reply token + * Tunnels: More checks of messages received down exploratory tunnels + 2015-06-08 dg * Language fixes * Make netDb.storeFloodNew graphable for testing (#1195) @@ -6,6 +15,15 @@ * Silence Irc{Inbound,Outbound}Filter warnings about 'no streams' when we can't connect to an IRC server. Change to WARN. +2015-06-07 zzz + * Logs: Correct wrapper.config location when running as a service + * NetDB: Fix early NPE + * SSU: Possible fix for NPE in establisher + +2015-06-06 zzz + * Console: Add indication of current ff status on /configadvanced, + change immediately when config changes, force republish + 2015-06-06 str4d * newsxml: Don't use XXX for parsing dates on Android diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5..4e28a2c8d 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 = ""; diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java index aeeb3d1e1..6a4871e6c 100644 --- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java +++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java @@ -43,15 +43,33 @@ public class SendMessageDirectJob extends JobImpl { private boolean _sent; private long _searchOn; + /** + * @param toPeer may be ourselves + */ public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, int timeoutMs, int priority) { this(ctx, message, toPeer, null, null, null, null, timeoutMs, priority); } - public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, ReplyJob onSuccess, Job onFail, MessageSelector selector, int timeoutMs, int priority) { + /** + * @param toPeer may be ourselves + * @param onSuccess may be null + * @param onFail may be null + * @param selector be null + */ + public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, ReplyJob onSuccess, + Job onFail, MessageSelector selector, int timeoutMs, int priority) { this(ctx, message, toPeer, null, onSuccess, onFail, selector, timeoutMs, priority); } - public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, Job onSend, ReplyJob onSuccess, Job onFail, MessageSelector selector, int timeoutMs, int priority) { + /** + * @param toPeer may be ourselves + * @param onSend may be null + * @param onSuccess may be null + * @param onFail may be null + * @param selector be null + */ + public SendMessageDirectJob(RouterContext ctx, I2NPMessage message, Hash toPeer, Job onSend, ReplyJob onSuccess, + Job onFail, MessageSelector selector, int timeoutMs, int priority) { super(ctx); _log = getContext().logManager().getLog(SendMessageDirectJob.class); _message = message; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index 8e8f9663e..322ad4bbb 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -14,14 +14,19 @@ import java.util.Date; import net.i2p.data.DatabaseEntry; import net.i2p.data.Hash; import net.i2p.data.LeaseSet; +import net.i2p.data.TunnelId; import net.i2p.data.router.RouterAddress; import net.i2p.data.router.RouterIdentity; import net.i2p.data.router.RouterInfo; import net.i2p.data.i2np.DatabaseStoreMessage; import net.i2p.data.i2np.DeliveryStatusMessage; +import net.i2p.data.i2np.TunnelGatewayMessage; +import net.i2p.router.Job; import net.i2p.router.JobImpl; +import net.i2p.router.OutNetMessage; import net.i2p.router.RouterContext; import net.i2p.router.TunnelInfo; +import net.i2p.router.message.SendMessageDirectJob; import net.i2p.util.Log; /** @@ -34,8 +39,15 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { private final RouterIdentity _from; private Hash _fromHash; private final FloodfillNetworkDatabaseFacade _facade; + private final static int REPLY_TIMEOUT = 60*1000; + private final static int MESSAGE_PRIORITY = OutNetMessage.PRIORITY_NETDB_REPLY; - public HandleFloodfillDatabaseStoreMessageJob(RouterContext ctx, DatabaseStoreMessage receivedMessage, RouterIdentity from, Hash fromHash, FloodfillNetworkDatabaseFacade facade) { + /** + * @param receivedMessage must never have reply token set if it came down a tunnel + */ + public HandleFloodfillDatabaseStoreMessageJob(RouterContext ctx, DatabaseStoreMessage receivedMessage, + RouterIdentity from, Hash fromHash, + FloodfillNetworkDatabaseFacade facade) { super(ctx); _log = ctx.logManager().getLog(getClass()); _message = receivedMessage; @@ -136,6 +148,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { // somebody has our keys... if (getContext().routerHash().equals(key)) { //getContext().statManager().addRateData("netDb.storeLocalRouterInfoAttempt", 1, 0); + // This is initiated by PeerTestJob from another peer // throw rather than return, so that we send the ack below (prevent easy attack) dontBlamePeer = true; throw new IllegalArgumentException("Peer attempted to store our RouterInfo"); @@ -170,15 +183,18 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { if (_log.shouldLog(Log.ERROR)) _log.error("Invalid DatabaseStoreMessage data type - " + entry.getType() + ": " + _message); + // don't ack or flood + return; } long recvEnd = System.currentTimeMillis(); getContext().statManager().addRateData("netDb.storeRecvTime", recvEnd-recvBegin); - // ack even if invalid or unsupported + // ack even if invalid + // in particular, ack our own RI (from PeerTestJob) // TODO any cases where we shouldn't? if (_message.getReplyToken() > 0) - sendAck(); + sendAck(key); long ackEnd = System.currentTimeMillis(); if (_from != null) @@ -223,7 +239,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { } } - private void sendAck() { + private void sendAck(Hash storedKey) { DeliveryStatusMessage msg = new DeliveryStatusMessage(getContext()); msg.setMessageId(_message.getReplyToken()); // Randomize for a little protection against clock-skew fingerprinting. @@ -231,31 +247,62 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { // TODO just set to 0? // TODO we have no session to garlic wrap this with, needs new message msg.setArrival(getContext().clock().now() - getContext().random().nextInt(3*1000)); - /* - if (FloodfillNetworkDatabaseFacade.floodfillEnabled(getContext())) { - // no need to do anything but send it where they ask + // may be null + TunnelId replyTunnel = _message.getReplyTunnel(); + // A store of our own RI, only if we are not FF + DatabaseStoreMessage msg2; + if (getContext().netDb().floodfillEnabled() || + storedKey.equals(getContext().routerHash())) { + // don't send our RI if the store was our RI (from PeerTestJob) + msg2 = null; + } else { + // we aren't ff, send a go-away message + msg2 = new DatabaseStoreMessage(getContext()); + RouterInfo me = getContext().router().getRouterInfo(); + msg2.setEntry(me); + if (_log.shouldWarn()) + _log.warn("Got a store w/ reply token, but we aren't ff: from: " + _from + + " fromHash: " + _fromHash + " msg: " + _message, new Exception()); + } + Hash toPeer = _message.getReplyGateway(); + boolean toUs = getContext().routerHash().equals(toPeer); + // to reduce connection congestion, send directly if connected already, + // else through an exploratory tunnel. + if (toUs && replyTunnel != null) { + // if we are the gateway, act as if we received it TunnelGatewayMessage tgm = new TunnelGatewayMessage(getContext()); tgm.setMessage(msg); - tgm.setTunnelId(_message.getReplyTunnel()); + tgm.setTunnelId(replyTunnel); tgm.setMessageExpiration(msg.getMessageExpiration()); - - getContext().jobQueue().addJob(new SendMessageDirectJob(getContext(), tgm, _message.getReplyGateway(), 10*1000, 200)); + getContext().tunnelDispatcher().dispatch(tgm); + if (msg2 != null) { + TunnelGatewayMessage tgm2 = new TunnelGatewayMessage(getContext()); + tgm2.setMessage(msg2); + tgm2.setTunnelId(replyTunnel); + tgm2.setMessageExpiration(msg.getMessageExpiration()); + getContext().tunnelDispatcher().dispatch(tgm2); + } + } else if (toUs || getContext().commSystem().isEstablished(toPeer)) { + Job send = new SendMessageDirectJob(getContext(), msg, toPeer, REPLY_TIMEOUT, MESSAGE_PRIORITY); + send.runJob(); + if (msg2 != null) { + Job send2 = new SendMessageDirectJob(getContext(), msg2, toPeer, REPLY_TIMEOUT, MESSAGE_PRIORITY); + send2.runJob(); + } } else { - */ - TunnelInfo outTunnel = selectOutboundTunnel(); + // pick tunnel with endpoint closest to toPeer + TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(toPeer); if (outTunnel == null) { if (_log.shouldLog(Log.WARN)) _log.warn("No outbound tunnel could be found"); return; - } else { - getContext().tunnelDispatcher().dispatchOutbound(msg, outTunnel.getSendTunnelId(0), - _message.getReplyTunnel(), _message.getReplyGateway()); } - //} - } - - private TunnelInfo selectOutboundTunnel() { - return getContext().tunnelManager().selectOutboundTunnel(); + getContext().tunnelDispatcher().dispatchOutbound(msg, outTunnel.getSendTunnelId(0), + replyTunnel, toPeer); + if (msg2 != null) + getContext().tunnelDispatcher().dispatchOutbound(msg2, outTunnel.getSendTunnelId(0), + replyTunnel, toPeer); + } } public String getName() { return "Handle Database Store Message"; } diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index 456f6aadd..903386189 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -24,7 +24,8 @@ import net.i2p.util.Log; * selection to the peer manager and tests the peer by sending it a useless * database store message * - * TODO - What's the point? Disable this? See also notes in PeerManager.selectPeers() + * TODO - What's the point? Disable this? See also notes in PeerManager.selectPeers(). + * TODO - Use something besides sending the peer's RI to itself? */ public class PeerTestJob extends JobImpl { private final Log _log; @@ -82,6 +83,7 @@ public class PeerTestJob extends JobImpl { /** * Retrieve a group of 0 or more peers that we want to test. + * Returned list will not include ourselves. * * @return set of RouterInfo structures */ @@ -110,7 +112,8 @@ public class PeerTestJob extends JobImpl { /** * Fire off the necessary jobs and messages to test the given peer - * + * The message is a store of the peer's RI to itself, + * with a reply token. */ private void testPeer(RouterInfo peer) { TunnelInfo inTunnel = getInboundTunnelId(); @@ -130,7 +133,7 @@ public class PeerTestJob extends JobImpl { int timeoutMs = getTestTimeout(); long expiration = getContext().clock().now() + timeoutMs; - long nonce = getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE); + long nonce = 1 + getContext().random().nextLong(I2NPMessage.MAX_ID_VALUE - 1); DatabaseStoreMessage msg = buildMessage(peer, inTunnelId, inGateway.getIdentity().getHash(), nonce, expiration); TunnelInfo outTunnel = getOutboundTunnelId(); @@ -172,7 +175,9 @@ public class PeerTestJob extends JobImpl { } /** - * Build a message to test the peer with + * Build a message to test the peer with. + * The message is a store of the peer's RI to itself, + * with a reply token. */ private DatabaseStoreMessage buildMessage(RouterInfo peer, TunnelId replyTunnel, Hash replyGateway, long nonce, long expiration) { DatabaseStoreMessage msg = new DatabaseStoreMessage(getContext()); diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index bdfa92773..dfe81abce 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -117,8 +117,8 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { } return; } else if (dsm.getReplyToken() != 0) { - if (_log.shouldLog(Log.WARN)) - _log.warn("Dropping LS DSM w/ reply token down a tunnel for " + _client + ": " + msg); + _context.statManager().addRateData("tunnel.dropDangerousClientTunnelMessage", 1, type); + _log.error("Dropping LS DSM w/ reply token down a tunnel for " + _client + ": " + msg); return; } else { // allow DSM of our own key (used by FloodfillVerifyStoreJob) @@ -143,6 +143,33 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { return; } // switch + } else { + // expl. tunnel + switch (type) { + case DatabaseStoreMessage.MESSAGE_TYPE: + DatabaseStoreMessage dsm = (DatabaseStoreMessage) msg; + if (dsm.getReplyToken() != 0) { + _context.statManager().addRateData("tunnel.dropDangerousExplTunnelMessage", 1, type); + _log.error("Dropping DSM w/ reply token down a expl. tunnel: " + msg); + return; + } + if (dsm.getEntry().getType() == DatabaseEntry.KEY_TYPE_LEASESET) + ((LeaseSet)dsm.getEntry()).setReceivedAsReply(); + break; + + case DatabaseSearchReplyMessage.MESSAGE_TYPE: + case DeliveryStatusMessage.MESSAGE_TYPE: + case GarlicMessage.MESSAGE_TYPE: + case TunnelBuildReplyMessage.MESSAGE_TYPE: + case VariableTunnelBuildReplyMessage.MESSAGE_TYPE: + // these are safe, handled below + break; + + default: + _context.statManager().addRateData("tunnel.dropDangerousExplTunnelMessage", 1, type); + _log.error("Dropped dangerous message down expl tunnel: " + msg, new Exception("cause")); + return; + } // switch } // client != null if ( (target == null) || ( (tunnel == null) && (_context.routerHash().equals(target) ) ) ) { diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java index a9c8b667e..4e945b9db 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java @@ -211,7 +211,8 @@ public class TunnelDispatcher implements Service { ctx.statManager().createRequiredRateStat("tunnel.corruptMessage", "Corrupt messages received", "Tunnels", RATES); // following are for InboundMessageDistributor - ctx.statManager().createRateStat("tunnel.dropDangerousClientTunnelMessage", "How many tunnel messages come down a client tunnel that we shouldn't expect (lifetime is the 'I2NP type')", "Tunnels", new long[] { 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.dropDangerousClientTunnelMessage", "(lifetime is the I2NP type)", "Tunnels", new long[] { 60*60*1000 }); + ctx.statManager().createRateStat("tunnel.dropDangerousExplTunnelMessage", "(lifetime is the I2NP type)", "Tunnels", new long[] { 60*60*1000 }); ctx.statManager().createRateStat("tunnel.handleLoadClove", "When do we receive load test cloves", "Tunnels", new long[] { 60*60*1000 }); // following is for PumpedTunnelGateway ctx.statManager().createRateStat("tunnel.dropGatewayOverflow", "Dropped message at GW, queue full", "Tunnels", new long[] { 60*60*1000 }); From 2b9ffc1270ef6c12e7444450073cdfd725feb367 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 13 Jun 2015 15:14:21 +0000 Subject: [PATCH 057/258] javadoc fixes after review --- core/java/src/net/i2p/client/I2PSessionImpl.java | 2 +- core/java/src/net/i2p/client/SubSession.java | 14 ++------------ .../src/net/i2p/router/TunnelManagerFacade.java | 2 +- .../i2p/router/client/ClientConnectionRunner.java | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index 429459d7b..aeaea7d34 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -882,7 +882,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 * a subsession: * BandwidthLimitsMessage, DestReplyMessage * - * The following types may not ontain a valid session ID + * The following types may not contain a valid session ID * even when intended for a subsession, so we must take special care: * SessionStatusMessage * diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index e115099b4..eb2a2364f 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -1,14 +1,5 @@ package net.i2p.client; -/* - * free (adj.): unencumbered; not under the control of others - * Written by jrandom in 2003 and released into the public domain - * with no warranty of any kind, either expressed or implied. - * It probably won't make your computer catch on fire, or eat - * your children, but it might. Use at your own risk. - * - */ - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -126,7 +117,6 @@ class SubSession extends I2PSessionMuxedImpl { */ @Override public boolean isClosed() { - // FIXME return super.isClosed() || _primary.isClosed(); } @@ -293,8 +283,8 @@ class SubSession extends I2PSessionMuxedImpl { } /** - * This may not work???????????, as the reply does not contain a session ID, so - * it won't be routed back to us? + * This won't be called, as the reply does not contain a session ID, so + * it won't be routed back to us */ @Override public int[] bandwidthLimits() throws I2PSessionException { diff --git a/router/java/src/net/i2p/router/TunnelManagerFacade.java b/router/java/src/net/i2p/router/TunnelManagerFacade.java index 208ae81c2..5b3e000ac 100644 --- a/router/java/src/net/i2p/router/TunnelManagerFacade.java +++ b/router/java/src/net/i2p/router/TunnelManagerFacade.java @@ -149,7 +149,7 @@ public interface TunnelManagerFacade extends Service { /** * Add another destination to the same tunnels. - * Must have same encryption key an a different signing key. + * Must have same encryption key and a different signing key. * @throws IllegalArgumentException if not * @return success * @since 0.9.21 diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index aaa106a78..b58f06462 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -53,7 +53,7 @@ import net.i2p.util.SimpleTimer; /** * Bridge the router and the client - managing state for a client. * - * As of release 0.9.19, multiple sessions are supported on a single + * As of release 0.9.21, multiple sessions are supported on a single * I2CP connection. These sessions share tunnels and some configuration. * * @author jrandom From 0ad34a4b00abe04d257d4fff9fac0fb70fdc2657 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 13 Jun 2015 16:25:58 +0000 Subject: [PATCH 058/258] Timestamper: Reduce NTP timeouts to shorten startup time when NTP is blocked --- .../src/net/i2p/router/time/NtpClient.java | 13 +++++++------ .../net/i2p/router/time/RouterTimestamper.java | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/router/java/src/net/i2p/router/time/NtpClient.java b/router/java/src/net/i2p/router/time/NtpClient.java index 68c325f94..d5fecdc2d 100644 --- a/router/java/src/net/i2p/router/time/NtpClient.java +++ b/router/java/src/net/i2p/router/time/NtpClient.java @@ -55,7 +55,8 @@ class NtpClient { /** difference between the unix epoch and jan 1 1900 (NTP uses that) */ private final static double SECONDS_1900_TO_EPOCH = 2208988800.0; private final static int NTP_PORT = 123; - + private static final int DEFAULT_TIMEOUT = 10*1000; + /** * Query the ntp servers, returning the current time from first one we find * @@ -84,7 +85,7 @@ class NtpClient { * @throws IllegalArgumentException if none of the servers are reachable * @since 0.7.12 */ - public static long[] currentTimeAndStratum(String serverNames[]) { + public static long[] currentTimeAndStratum(String serverNames[], int perServerTimeout) { if (serverNames == null) throw new IllegalArgumentException("No NTP servers specified"); ArrayList names = new ArrayList(serverNames.length); @@ -92,7 +93,7 @@ class NtpClient { names.add(serverNames[i]); Collections.shuffle(names); for (int i = 0; i < names.size(); i++) { - long[] rv = currentTimeAndStratum(names.get(i)); + long[] rv = currentTimeAndStratum(names.get(i), perServerTimeout); if (rv != null && rv[0] > 0) return rv; } @@ -105,7 +106,7 @@ class NtpClient { * @return milliseconds since january 1, 1970 (UTC), or -1 on error */ public static long currentTime(String serverName) { - long[] la = currentTimeAndStratum(serverName); + long[] la = currentTimeAndStratum(serverName, DEFAULT_TIMEOUT); if (la != null) return la[0]; return -1; @@ -116,7 +117,7 @@ class NtpClient { * @return time in rv[0] and stratum in rv[1], or null for error * @since 0.7.12 */ - private static long[] currentTimeAndStratum(String serverName) { + private static long[] currentTimeAndStratum(String serverName, int timeout) { DatagramSocket socket = null; try { // Send request @@ -135,7 +136,7 @@ class NtpClient { // Get response packet = new DatagramPacket(buf, buf.length); - socket.setSoTimeout(10*1000); + socket.setSoTimeout(timeout); socket.receive(packet); // Immediately record the incoming timestamp diff --git a/router/java/src/net/i2p/router/time/RouterTimestamper.java b/router/java/src/net/i2p/router/time/RouterTimestamper.java index 4d8892442..cde08d093 100644 --- a/router/java/src/net/i2p/router/time/RouterTimestamper.java +++ b/router/java/src/net/i2p/router/time/RouterTimestamper.java @@ -43,6 +43,8 @@ public class RouterTimestamper extends Timestamper { /** how many times do we have to query if we are changing the clock? */ private static final int DEFAULT_CONCURRING_SERVERS = 3; private static final int MAX_CONSECUTIVE_FAILS = 10; + private static final int DEFAULT_TIMEOUT = 10*1000; + private static final int SHORT_TIMEOUT = 5*1000; public static final String PROP_QUERY_FREQUENCY = "time.queryFrequencyMs"; public static final String PROP_SERVER_LIST = "time.sntpServerList"; @@ -177,7 +179,7 @@ public class RouterTimestamper extends Timestamper { if (_log != null && _log.shouldDebug()) _log.debug("Querying servers " + servers); try { - lastFailed = !queryTime(servers.toArray(new String[servers.size()])); + lastFailed = !queryTime(servers.toArray(new String[servers.size()]), SHORT_TIMEOUT); } catch (IllegalArgumentException iae) { if (!lastFailed && _log != null && _log.shouldWarn()) _log.warn("Unable to reach any regional NTP servers: " + servers); @@ -192,7 +194,7 @@ public class RouterTimestamper extends Timestamper { if (_log != null && _log.shouldDebug()) _log.debug("Querying servers " + _servers); try { - lastFailed = !queryTime(_servers.toArray(new String[_servers.size()])); + lastFailed = !queryTime(_servers.toArray(new String[_servers.size()]), DEFAULT_TIMEOUT); } catch (IllegalArgumentException iae) { lastFailed = true; } @@ -259,18 +261,18 @@ public class RouterTimestamper extends Timestamper { /** * True if the time was queried successfully, false if it couldn't be */ - private boolean queryTime(String serverList[]) throws IllegalArgumentException { + private boolean queryTime(String serverList[], int perServerTimeout) throws IllegalArgumentException { long found[] = new long[_concurringServers]; long now = -1; int stratum = -1; long expectedDelta = 0; _wellSynced = false; for (int i = 0; i < _concurringServers; i++) { - if (i > 0) { - // this delays startup when net is disconnected or the timeserver list is bad, don't make it too long - try { Thread.sleep(2*1000); } catch (InterruptedException ie) {} - } - long[] timeAndStratum = NtpClient.currentTimeAndStratum(serverList); + //if (i > 0) { + // // this delays startup when net is disconnected or the timeserver list is bad, don't make it too long + // try { Thread.sleep(2*1000); } catch (InterruptedException ie) {} + //} + long[] timeAndStratum = NtpClient.currentTimeAndStratum(serverList, perServerTimeout); now = timeAndStratum[0]; stratum = (int) timeAndStratum[1]; long delta = now - _context.clock().now(); From 3a774b7c37d0a912b1754d2ca529ee1b3aaa18d2 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 14 Jun 2015 20:07:35 +0000 Subject: [PATCH 059/258] Rename i2p.mooo.com2.crt to i2p.mooo.com.crt, certificate has been switched out on the server --- .../certificates/ssl/i2p.mooo.com.crt | 42 +++++++++---------- .../certificates/ssl/i2p.mooo.com2.crt | 23 ---------- installer/resources/deletelist.txt | 1 + 3 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 installer/resources/certificates/ssl/i2p.mooo.com2.crt diff --git a/installer/resources/certificates/ssl/i2p.mooo.com.crt b/installer/resources/certificates/ssl/i2p.mooo.com.crt index ac10e1ff4..839767b3b 100644 --- a/installer/resources/certificates/ssl/i2p.mooo.com.crt +++ b/installer/resources/certificates/ssl/i2p.mooo.com.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDvjCCAyegAwIBAgICZhcwDQYJKoZIhvcNAQEFBQAwdTELMAkGA1UEBhMCVVMx -DTALBgNVBAgMBG5vbmUxDTALBgNVBAcMBG5vbmUxDTALBgNVBAoMBG5vbmUxDTAL -BgNVBAsMBG5vbmUxFTATBgNVBAMMDGkycC5tb29vLmNvbTETMBEGCSqGSIb3DQEJ -ARYEbm9uZTAeFw0xMTEwMjMyMTM2NDFaFw0xOTEwMjMyMTM2NDFaMGYxCzAJBgNV -BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQKDARub25lMQ0wCwYDVQQLDARu -b25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkqhkiG9w0BCQEWBG5vbmUw -ggGPMA0GCSqGSIb3DQEBAQUAA4IBfAAwggF3AoIBbgMG1O7HRVa7UoiKbQTmKy5m -x79Na8vjD3etcOwfc4TSenQFvn+GbAWkJwKpM8uvOcgj1CxNeHWdSaeTFH1OwJsw -vl3leJ7clMdo3hpQDhPeGzBLyOiWwFHVn15YKa9xcM7S9Op5Q6rKBHUyyx1vGSz+ -/NBmkktpI6rcGFfP3ISRL0auR+db+adWv4TS6W8YiwQIVZNbSlKP6FNO9Mv1kxQZ -KoHPn8vT/LtAh1fcI6ryBuy3F5oHfbGumIwsS5dpowryFxQzwg5vtMA7AMCMKyXv -hP/W6OuaaEP5MCIxkWjQs35gOYa8eF1dLoy3AD9yVVhoNrA8Bc5FnVFJ32Qv7agy -qRY85cXBA6hT/Qzs/wWwp7WrrnZuifaSv/u/Ayi5vX42/bf86PSM2IRNIESoA98A -NFz4U2KGq9s1K2JbkQmnFy8IU0w7CMq6PvNEm/uNjSk6OE1rcCXML+EuX0zmXy8d -PjRbLzC9csSg2CqMtQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf -Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUdjuOczdG -hUpYzH0UXqKrOleT8GkwHwYDVR0jBBgwFoAU+SKWC49cM5sCodv89AFin3pkS0Yw -DQYJKoZIhvcNAQEFBQADgYEAKYyWlDIStjjbn/ZzVScKR174I8whTbdqrX/vp9dr -2hMv5m4F+aswX4Jr58WneKg2LvRaL6xEhoL7OAQ6aB/7xVSpDjIrrBLZd513NAam -X6bOPYJ6IH7Vw9ClFY3AlfzsNlgRMXno7rySKKzhg24kusNwKDH2yCphZy4BgjMn -y6A= +MIIDvTCCAqWgAwIBAgIJAOeW0ejPrHimMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV +BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQHDARub25lMQ0wCwYDVQQKDARu +b25lMQ0wCwYDVQQLDARub25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkq +hkiG9w0BCQEWBG5vbmUwHhcNMTUwMjA4MTczMzA5WhcNMTkwMzE5MTczMzA5WjB1 +MQswCQYDVQQGEwJVUzENMAsGA1UECAwEbm9uZTENMAsGA1UEBwwEbm9uZTENMAsG +A1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTEVMBMGA1UEAwwMaTJwLm1vb28uY29t +MRMwEQYJKoZIhvcNAQkBFgRub25lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB +CgKCAQEAqxej7oRl9GOb8benIBCENrJXoow1iWhI9M+2nU0SaonrCDql5M2YMlwd +HzYUWtFbRjz2NinjB0fgFq9cfzHfr1Sc8k/OeGg1jvNfqt8wWo9tryQNjiHtDQUZ +6lQ5T13I+lj0CBasowgbApKQfrYjvaeuTaVYTfP8IVA60hoUQ+sy9JN+Unsx3/0Y +PLLd98+bT27qYuBNRB1g/ifUTd9Wosj2PevGBlCxYDaUjmCG4Q8kcQr87KvM6RTu +3AV61s/Wyy1j2YemlGG/ZhJ44YnlVMSu1vTjt9HInVf3lRRx/+RzbQO3lqeVC8LC +Bq3KbSlfJVx4vHslfHwBFw9A4rmD1QIDAQABo1AwTjAdBgNVHQ4EFgQUsSUvX0ED +yivB67iksVwZ+b8vLtQwHwYDVR0jBBgwFoAUsSUvX0EDyivB67iksVwZ+b8vLtQw +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAde4wts7Q8TylFEc38ftJ +2f285fFIR7P1SSbBcHPK2eBwLEg0zJyFrCeiHuEpPrn+d5GqL2zOskjfcESGmDBT +aFajj8jPBJj/AmpkdWJG6a1YKro5tu9wrlenGwHOHu2/Cl0IJvafxrOs2x4G+2Nl +5Hcw/FIy8mK7eIch4pACfi0zNMZ6KMCKfX9bxPrQo78WdBfVjbrIBlgyOQJ5NJEF +JlWvS7Butv7eERi4I2huN5VRJSCFzjbuO+tjP3I8IB6WgdBmTeqq8ObtXRgahBuD +ZmkvqVSfIzK5JN4GjO8FOdCBomuwm9A92kgmAptwQwAHM9qCDJpH8L07/7poxlGb +iA== -----END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/i2p.mooo.com2.crt b/installer/resources/certificates/ssl/i2p.mooo.com2.crt deleted file mode 100644 index 839767b3b..000000000 --- a/installer/resources/certificates/ssl/i2p.mooo.com2.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDvTCCAqWgAwIBAgIJAOeW0ejPrHimMA0GCSqGSIb3DQEBCwUAMHUxCzAJBgNV -BAYTAlVTMQ0wCwYDVQQIDARub25lMQ0wCwYDVQQHDARub25lMQ0wCwYDVQQKDARu -b25lMQ0wCwYDVQQLDARub25lMRUwEwYDVQQDDAxpMnAubW9vby5jb20xEzARBgkq -hkiG9w0BCQEWBG5vbmUwHhcNMTUwMjA4MTczMzA5WhcNMTkwMzE5MTczMzA5WjB1 -MQswCQYDVQQGEwJVUzENMAsGA1UECAwEbm9uZTENMAsGA1UEBwwEbm9uZTENMAsG -A1UECgwEbm9uZTENMAsGA1UECwwEbm9uZTEVMBMGA1UEAwwMaTJwLm1vb28uY29t -MRMwEQYJKoZIhvcNAQkBFgRub25lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAqxej7oRl9GOb8benIBCENrJXoow1iWhI9M+2nU0SaonrCDql5M2YMlwd -HzYUWtFbRjz2NinjB0fgFq9cfzHfr1Sc8k/OeGg1jvNfqt8wWo9tryQNjiHtDQUZ -6lQ5T13I+lj0CBasowgbApKQfrYjvaeuTaVYTfP8IVA60hoUQ+sy9JN+Unsx3/0Y -PLLd98+bT27qYuBNRB1g/ifUTd9Wosj2PevGBlCxYDaUjmCG4Q8kcQr87KvM6RTu -3AV61s/Wyy1j2YemlGG/ZhJ44YnlVMSu1vTjt9HInVf3lRRx/+RzbQO3lqeVC8LC -Bq3KbSlfJVx4vHslfHwBFw9A4rmD1QIDAQABo1AwTjAdBgNVHQ4EFgQUsSUvX0ED -yivB67iksVwZ+b8vLtQwHwYDVR0jBBgwFoAUsSUvX0EDyivB67iksVwZ+b8vLtQw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAde4wts7Q8TylFEc38ftJ -2f285fFIR7P1SSbBcHPK2eBwLEg0zJyFrCeiHuEpPrn+d5GqL2zOskjfcESGmDBT -aFajj8jPBJj/AmpkdWJG6a1YKro5tu9wrlenGwHOHu2/Cl0IJvafxrOs2x4G+2Nl -5Hcw/FIy8mK7eIch4pACfi0zNMZ6KMCKfX9bxPrQo78WdBfVjbrIBlgyOQJ5NJEF -JlWvS7Butv7eERi4I2huN5VRJSCFzjbuO+tjP3I8IB6WgdBmTeqq8ObtXRgahBuD -ZmkvqVSfIzK5JN4GjO8FOdCBomuwm9A92kgmAptwQwAHM9qCDJpH8L07/7poxlGb -iA== ------END CERTIFICATE----- diff --git a/installer/resources/deletelist.txt b/installer/resources/deletelist.txt index 7f22f3548..43212a8e3 100644 --- a/installer/resources/deletelist.txt +++ b/installer/resources/deletelist.txt @@ -95,3 +95,4 @@ certificates/ssl/i2p-netdb.innovatio.no.crt certificates/ssl/jp.reseed.i2p2.no.crt certificates/ssl/ieb9oopo.mooo.com2.crt certificates/ssl/netdb.i2p2.no2.crt +certificates/ssl/i2p.mooo.com2.crt From 863e120204b120af1efe7506e65a8d7c7633fc5a Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 14 Jun 2015 20:12:00 +0000 Subject: [PATCH 060/258] Hard-depend on gmp >> 5. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6e24840d0..afac9f505 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7.0.50~) ,default-jdk | openjdk-7-jdk | openjdk-6-jdk ,dh-apparmor ,gettext - ,libgmp3-dev + ,libgmp-dev (>= 2:5.0.5) # uncomment the next line for official builds # ,libservice-wrapper-java ,libcommons-logging-java From 627f7076b0e0ba407929a0dee8fcaca2069be9cb Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 14 Jun 2015 20:16:16 +0000 Subject: [PATCH 061/258] debian: Add support for setting open file limits to initscript, add comment to explain how to do it with systemd --- debian/i2p.init | 11 ++++++++++- debian/i2p.postinst | 33 +++++++++++++++++---------------- debian/i2p.service | 28 +++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/debian/i2p.init b/debian/i2p.init index eac736f70..3b61904de 100755 --- a/debian/i2p.init +++ b/debian/i2p.init @@ -32,7 +32,6 @@ WRAPPERLOG="/var/log/i2p/wrapper.log" RUN_DAEMON="False" NICE=0 I2PUSER="i2psvc" -USE_AA="yes" I2P_ARGS="/etc/i2p/wrapper.config \ wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \ @@ -67,6 +66,15 @@ if [ -z "$RUN_DAEMON" ]; then exit 1 fi +case "$CONFINE_WITH_APPARMOR" in + [NnFf]*) + USE_AA="no" + ;; + *) + USE_AA="yes" + ;; +esac + case "$RUN_DAEMON" in [NnFf]*) log_action_msg "$DESC daemon disabled in /etc/default/$NAME". @@ -83,6 +91,7 @@ esac do_start() { + [ ! -z $ULIMIT ] && ulimit -n $ULIMIT start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null 2>&1 \ || return 1 [ -d $RUN ] || mkdir $RUN > /dev/null 2>&1 diff --git a/debian/i2p.postinst b/debian/i2p.postinst index 328926704..d612902ba 100755 --- a/debian/i2p.postinst +++ b/debian/i2p.postinst @@ -6,7 +6,7 @@ I2PHOME=/var/lib/i2p I2PSYSUSER=i2psvc conffile="/etc/default/i2p" -#systemdservice="/lib/systemd/system/i2p.service" +systemdservice="/lib/systemd/system/i2p.service" # Source debconf library -- we have a Depends line # to make sure it is there... @@ -25,6 +25,7 @@ case "$1" in echo >> $conffile echo "RUN_DAEMON=" >> $conffile echo "I2PUSER=" >> $conffile + echo "ULIMIT=" >> $conffile echo "CONFINE_WITH_APPARMOR=" >> $conffile echo "# The next value is also wrapper.java.maxmemory in /etc/i2p/wrapper.config" >> $conffile echo "MEMORYLIMIT=" >> $conffile @@ -49,6 +50,8 @@ case "$1" in echo "I2PUSER=" >> $conffile test -z "$MEMORYLIMIT" || grep -Eq '^ *MEMORYLIMIT=' $conffile || \ echo "MEMORYLIMIT=" >> $conffile + test -z "$ULIMIT" || grep -Eq '^ *ULIMIT=' $conffile || \ + echo "ULIMIT=" >> $conffile test -z "$CONFINE_WITH_APPARMOR" || grep -Eq '^ *CONFINE_WITH_APPARMOR=' $conffile || \ echo "CONFINE_WITH_APPARMOR=" >> $conffile @@ -57,8 +60,6 @@ case "$1" in I2PUSER="i2psvc" fi - - sed -e "s/^ *RUN_DAEMON=.*/RUN_DAEMON=\"$RUN_DAEMON\"/" \ -e "s/^ *I2PUSER=.*/I2PUSER=\"$I2PUSER\"/" \ -e "s/^ *MEMORYLIMIT=.*/MEMORYLIMIT=\"$MEMORYLIMIT\"/" \ @@ -66,19 +67,19 @@ case "$1" in < $conffile > $conffile.tmp mv -f $conffile.tmp $conffile -# if [ -e "$systemdservice" ]; then -# sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp" -# mv -f "$systemdservice.tmp" "$systemdservice" -# chmod 0644 -f "$systemdservice" -# if grep -q 'systemd' /proc/1/comm > /dev/null 2>&1; then -# systemctl --system daemon-reload -# if [ $RUN_DAEMON = 'true' ]; then -# systemctl enable i2p.service -# else -# systemctl disable i2p.service -# fi -# fi -# fi + if [ -e "$systemdservice" ]; then + sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp" + mv -f "$systemdservice.tmp" "$systemdservice" + chmod 0644 -f "$systemdservice" + if grep -q 'systemd' /proc/1/comm > /dev/null 2>&1; then + systemctl --system daemon-reload + if [ $RUN_DAEMON = 'true' ]; then + systemctl enable i2p.service + else + systemctl disable i2p.service + fi + fi + fi sed -e "s/^ *wrapper\.java\.maxmemory=.*/wrapper\.java\.maxmemory=$MEMORYLIMIT/" \ < /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp diff --git a/debian/i2p.service b/debian/i2p.service index 6a4c8d3b4..4199e9910 100644 --- a/debian/i2p.service +++ b/debian/i2p.service @@ -1,10 +1,31 @@ +# It's not recommended to modify this file because it will be +# overwritten during package upgrades. If you want to make changes, the +# best way is to create a file "/etc/systemd/system/i2p.service.d/foo.conf" +# and make your changes there. This file will be parsed after the file +# i2p.service itself is parsed. +# +# For more info about custom unit files, see systemd.unit(5) or +# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F + +# For example, if you want to increase I2P's open-files-limit to 10000, +# you need to increase systemd's LimitNOFILE setting, so create a file named +# "/etc/systemd/system/i2p.service.d/limits.conf" containing: +# [Service] +# LimitNOFILE=10000 + +# Don't forget to reload systemd daemon after you change unit configuration: +# root> systemctl --system daemon-reload + [Unit] Description=load-balanced unspoofable packet switching network -After=network.target +After=local-fs.target network.target time-sync.target [Service] Type=forking EnvironmentFile=/etc/default/i2p +RuntimeDirectory=i2p +RuntimeDirectoryMode=750 +PIDFile=/run/i2p/i2p.pid Environment="I2P_ARGS=/etc/i2p/wrapper.config \ wrapper.java.additional.1=-DloggerFilenameOverride=/var/log/i2p/log-router-@.txt \ wrapper.java.additional.10=-Dwrapper.logfile=/var/log/i2p/wrapper.log \ @@ -16,11 +37,12 @@ Environment="I2P_ARGS=/etc/i2p/wrapper.config \ wrapper.daemonize=TRUE" TZ=UTC User=i2psvc PermissionsStartOnly=true -ExecStartPre=/bin/mkdir -p /run/i2p /tmp/i2p-daemon +AppArmorProfile=system_i2p +ExecStartPre=/bin/mkdir -p /tmp/i2p-daemon ExecStartPre=/bin/chown -R ${I2PUSER}:${I2PUSER} /var/log/i2p /run/i2p /tmp/i2p-daemon ExecStartPre=/bin/chmod 750 /var/log/i2p ExecStart=/usr/sbin/wrapper "$I2P_ARGS" -ExecStopPost=/bin/rm -rf /run/i2p /tmp/i2p-daemon +ExecStopPost=/bin/rm -rf /run/i2p [Install] WantedBy=multi-user.target From bc85543ef2309f1a3d1eb8280f61623ede69f352 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 15 Jun 2015 14:35:15 +0000 Subject: [PATCH 062/258] Fix removal of subsession aliases from tunnel manager on I2CP connection shutdown Sort tweaks for shared clients in summary bar --- .../java/src/net/i2p/router/web/SummaryHelper.java | 6 ++++-- .../i2p/router/client/ClientConnectionRunner.java | 12 ++++++++++-- .../src/net/i2p/router/client/ClientManager.java | 4 ++-- .../router/client/ClientMessageEventListener.java | 2 -- 4 files changed, 16 insertions(+), 8 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 f0ef33f9e..1cd207e45 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -491,9 +491,11 @@ public class SummaryHelper extends HelperBase { public int compare(Destination lhs, Destination rhs) { String lname = getName(lhs); String rname = getName(rhs); - if (lname.equals(xsc)) + boolean lshared = lname.startsWith("shared clients") || lname.startsWith(xsc); + boolean rshared = rname.startsWith("shared clients") || rname.startsWith(xsc); + if (lshared && !rshared) return -1; - if (rname.equals(xsc)) + if (rshared && !lshared) return 1; return Collator.getInstance().compare(lname, rname); } diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index b58f06462..bc92e33be 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -202,6 +202,8 @@ class ClientConnectionRunner { LeaseSet ls = sp.currentLeaseSet; if (ls != null) _context.netDb().unpublish(ls); + if (!sp.isPrimary) + _context.tunnelManager().removeAlias(sp.dest); } synchronized (_alreadyProcessed) { _alreadyProcessed.clear(); @@ -414,15 +416,21 @@ class ClientConnectionRunner { if (ls != null) _context.netDb().unpublish(ls); isPrimary = sp.isPrimary; + if (!isPrimary) + _context.tunnelManager().removeAlias(sp.dest); + break; } } - if (isPrimary) { + if (isPrimary && !_sessions.isEmpty()) { // kill all the others also for (SessionParams sp : _sessions.values()) { - _manager.unregisterSession(id, sp.dest); + if (_log.shouldLog(Log.INFO)) + _log.info("Destroying remaining client subsession " + sp.sessionId); + _manager.unregisterSession(sp.sessionId, sp.dest); LeaseSet ls = sp.currentLeaseSet; if (ls != null) _context.netDb().unpublish(ls); + _context.tunnelManager().removeAlias(sp.dest); } } } diff --git a/router/java/src/net/i2p/router/client/ClientManager.java b/router/java/src/net/i2p/router/client/ClientManager.java index ea35681f9..6665409a0 100644 --- a/router/java/src/net/i2p/router/client/ClientManager.java +++ b/router/java/src/net/i2p/router/client/ClientManager.java @@ -220,14 +220,14 @@ class ClientManager { * Remove all sessions for this runner. */ public void unregisterConnection(ClientConnectionRunner runner) { - if (_log.shouldLog(Log.WARN)) - _log.warn("Unregistering (dropping) a client connection"); synchronized (_pendingRunners) { _pendingRunners.remove(runner); } List ids = runner.getSessionIds(); List dests = runner.getDestinations(); + if (_log.shouldLog(Log.WARN)) + _log.warn("Unregistering (dropping) a client connection with ids: " + ids); synchronized (_runners) { for (SessionId id : ids) { _runnerSessionIds.remove(id); diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index 628d8b0a5..7bfd342b1 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -426,8 +426,6 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi if (left <= 0) { _runner.stopRunning(); } else { - if (cfg != null) - _context.tunnelManager().removeAlias(cfg.getDestination()); if (_log.shouldLog(Log.INFO)) _log.info("Still " + left + " sessions left"); } From 036b77746bc384692bb63a1ea7a5efb30768fb58 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Jun 2015 02:16:06 +0000 Subject: [PATCH 063/258] Catch uncaught exceptions in ClientConnectionRunner and stop connection Catch null SessionId in messages and stop connection instead of NPE Wait for LS in SubSession in connect() so we don't send data w/o a session ID and leaseset Log tweaks --- .../src/net/i2p/client/I2PSessionImpl.java | 4 +-- core/java/src/net/i2p/client/SubSession.java | 36 +++++++++++++++---- .../net/i2p/data/i2cp/I2CPMessageReader.java | 14 ++++++++ .../i2p/internal/QueuedI2CPMessageReader.java | 2 +- .../router/client/ClientConnectionRunner.java | 17 +++++++-- .../client/ClientMessageEventListener.java | 28 ++++++++------- 6 files changed, 78 insertions(+), 23 deletions(-) diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index aeaea7d34..bc34f88f0 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -81,7 +81,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 /** this session's Id */ private SessionId _sessionId; /** currently granted lease set, or null */ - private volatile LeaseSet _leaseSet; + protected volatile LeaseSet _leaseSet; // subsession stuff // registered subsessions @@ -130,7 +130,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 protected final I2PAppContext _context; /** monitor for waiting until a lease set has been granted */ - private final Object _leaseSetWait = new Object(); + protected final Object _leaseSetWait = new Object(); /** * @since 0.9.8 diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/SubSession.java index eb2a2364f..0e2fca90b 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/SubSession.java @@ -101,12 +101,36 @@ class SubSession extends I2PSessionMuxedImpl { _state = State.OPENING; } } - _primary.connect(); - synchronized(_stateLock) { - if (_state != State.OPEN) { - Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true); - notifier.start(); - _state = State.OPEN; + boolean success = false; + try { + _primary.connect(); + // wait until we have created a lease set + int waitcount = 0; + while (_leaseSet == null) { + if (waitcount++ > 5*60) { + throw new IOException("No tunnels built after waiting 5 minutes. Your network connection may be down, or there is severe network congestion."); + } + synchronized (_leaseSetWait) { + // InterruptedException caught below + _leaseSetWait.wait(1000); + } + } + synchronized(_stateLock) { + if (_state != State.OPEN) { + Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true); + notifier.start(); + _state = State.OPEN; + } + } + success = true; + } catch (InterruptedException ie) { + throw new I2PSessionException("Interrupted", ie); + } catch (IOException ioe) { + throw new I2PSessionException(getPrefix() + "Cannot connect to the router on " + _hostname + ':' + _portNum, ioe); + } finally { + if (!success) { + _availabilityNotifier.stopNotifying(); + changeState(State.CLOSED); } } } diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java index 72148a55d..4dfbb8501 100644 --- a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java +++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java @@ -158,6 +158,20 @@ public class I2CPMessageReader { } public void run() { + try { + run2(); + } catch (Exception e) { + _log.log(Log.CRIT, "Uncaught I2CP error", e); + _listener.readError(I2CPMessageReader.this, e); + cancelRunner(); + } + } + + /** + * Called by run() + * @since 0.9.21 + */ + protected void run2() { while (_stayAlive) { while (_doRun) { // do read diff --git a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java index 3e87a8e2f..ba218631f 100644 --- a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java +++ b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java @@ -42,7 +42,7 @@ public class QueuedI2CPMessageReader extends I2CPMessageReader { * Pumps messages from the incoming message queue to the listener. */ @Override - public void run() { + protected void run2() { while (_stayAlive) { while (_doRun) { // do read diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index bc92e33be..3e212d081 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -228,9 +228,12 @@ class ClientConnectionRunner { * Current client's config, * will be null if session not found * IS subsession aware. + * Returns null if id is null. * @since 0.9.21 added id param */ public SessionConfig getConfig(SessionId id) { + if (id == null) + return null; for (SessionParams sp : _sessions.values()) { if (id.equals(sp.sessionId)) return sp.config; @@ -317,6 +320,8 @@ class ClientConnectionRunner { * @since 0.9.21 */ public Hash getDestHash(SessionId id) { + if (id == null) + return null; for (Map.Entry e : _sessions.entrySet()) { if (id.equals(e.getValue().sessionId)) return e.getKey(); @@ -330,6 +335,8 @@ class ClientConnectionRunner { * @since 0.9.21 */ public Destination getDestination(SessionId id) { + if (id == null) + return null; for (SessionParams sp : _sessions.values()) { if (id.equals(sp.sessionId)) return sp.dest; @@ -391,6 +398,8 @@ class ClientConnectionRunner { void setSessionId(Hash hash, SessionId id) { if (hash == null) throw new IllegalStateException(); + if (id == null) + throw new NullPointerException(); SessionParams sp = _sessions.get(hash); if (sp == null || sp.sessionId != null) throw new IllegalStateException(); @@ -403,6 +412,8 @@ class ClientConnectionRunner { * @since 0.9.21 */ void removeSession(SessionId id) { + if (id == null) + return; boolean isPrimary = false; for (Iterator iter = _sessions.values().iterator(); iter.hasNext(); ) { SessionParams sp = iter.next(); @@ -813,18 +824,20 @@ class ClientConnectionRunner { synchronized (this) { state = sp.leaseRequest; if (state != null) { - if (_log.shouldLog(Log.DEBUG)) - _log.debug("Already requesting " + state); LeaseSet requested = state.getRequested(); LeaseSet granted = state.getGranted(); long ours = set.getEarliestLeaseDate(); if ( ( (requested != null) && (requested.getEarliestLeaseDate() > ours) ) || ( (granted != null) && (granted.getEarliestLeaseDate() > ours) ) ) { // theirs is newer + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Already requesting, theirs newer, do nothing: " + state); } else { // ours is newer, so wait a few secs and retry set.setDestination(dest); _context.simpleTimer2().addEvent(new Rerequest(set, expirationTime, onCreateJob, onFailedJob), 3*1000); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("Already requesting, ours newer, wait 3 sec: " + state); } // fire onCreated? return; // already requesting diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index 7bfd342b1..d2a6ceeb0 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -80,7 +80,11 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi * */ public void messageReceived(I2CPMessageReader reader, I2CPMessage message) { - if (_runner.isDead()) return; + if (_runner.isDead()) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Received but runner dead: \n" + message); + return; + } if (_log.shouldLog(Log.DEBUG)) _log.debug("Message received: \n" + message); int type = message.getType(); @@ -362,8 +366,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionConfig cfg = _runner.getConfig(sid); if (cfg == null) { if (_log.shouldLog(Log.ERROR)) - _log.error("SendMessage w/o session"); - _runner.disconnectClient("SendMessage w/o session"); + _log.error("SendMessage w/o session: " + sid); + _runner.disconnectClient("SendMessage w/o session: " + sid); return; } if (_log.shouldLog(Log.DEBUG)) @@ -372,10 +376,10 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi MessageId id = _runner.distributeMessage(message); long timeToDistribute = _context.clock().now() - beforeDistribute; // TODO validate session id - _runner.ackSendMessage(message.getSessionId(), id, message.getNonce()); + _runner.ackSendMessage(sid, id, message.getNonce()); _context.statManager().addRateData("client.distributeTime", timeToDistribute); - if ( (timeToDistribute > 50) && (_log.shouldLog(Log.INFO)) ) - _log.info("Took too long to distribute the message (which holds up the ack): " + timeToDistribute); + if ( (timeToDistribute > 50) && (_log.shouldLog(Log.DEBUG)) ) + _log.debug("Took too long to distribute the message (which holds up the ack): " + timeToDistribute); } @@ -386,7 +390,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi private void handleReceiveBegin(ReceiveMessageBeginMessage message) { if (_runner.isDead()) return; if (_log.shouldLog(Log.DEBUG)) - _log.debug("Handling recieve begin: id = " + message.getMessageId()); + _log.debug("Handling receive begin: id = " + message.getMessageId()); MessagePayloadMessage msg = new MessagePayloadMessage(); msg.setMessageId(message.getMessageId()); // TODO validate session id @@ -409,7 +413,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi } /** - * The client told us that the message has been recieved completely. This currently + * The client told us that the message has been received completely. This currently * does not do any security checking prior to removing the message from the * pending queue, though it should. * @@ -443,8 +447,8 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionConfig cfg = _runner.getConfig(id); if (cfg == null) { if (_log.shouldLog(Log.ERROR)) - _log.error("CreateLeaseSet w/o session"); - _runner.disconnectClient("CreateLeaseSet w/o session"); + _log.error("CreateLeaseSet w/o session: " + id); + _runner.disconnectClient("CreateLeaseSet w/o session: " + id); return; } Destination dest = cfg.getDestination(); @@ -533,9 +537,9 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionConfig cfg = _runner.getConfig(id); if (cfg == null) { if (_log.shouldLog(Log.ERROR)) - _log.error("ReconfigureSession w/o session"); + _log.error("ReconfigureSession w/o session: " + id); //sendStatusMessage(id, SessionStatusMessage.STATUS_INVALID); - _runner.disconnectClient("ReconfigureSession w/o session"); + _runner.disconnectClient("ReconfigureSession w/o session: " + id); return; } if (_log.shouldLog(Log.INFO)) From 8d9cced128d12139a9475b12fb299eb2a00c5940 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Jun 2015 16:17:46 +0000 Subject: [PATCH 064/258] history for prop, -6 --- history.txt | 13 +++++++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/history.txt b/history.txt index ca5af725a..f43fa1b52 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,14 @@ +2015-06-17 zzz +Prop from i2p.i2p.zzz.multisess: + * Router, I2CP, Streaming, i2ptunnel: + - Multisession support and multiple destinations in one tunnel pool + - Connections to Hardcoded blacklist of destinations that do not + support ECDSA will use the DSA session + - Change shared clients to ECDSA by default, with a DSA subsession + - Add support for 'aliased' local destinations that use the same tunnel pools + - No UI or config support, no server support, may be added later + - Catch uncaught exceptions in ClientConnectionRunner and stop connection + 2015-06-13 zzz * i2psnark: Fix NPE (ticket #1602) * NetDB: @@ -5,6 +16,8 @@ - Send our own RI unsolicited in reply if we aren't floodfill - Don't ack or flood a store of an unknown type * PeerTestJob: Don't generate zero reply token + * Timestamper: Reduce NTP timeouts to shorten startup time + when NTP is blocked * Tunnels: More checks of messages received down exploratory tunnels 2015-06-08 dg diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4e28a2c8d..c10128fe6 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 = ""; From 7c5dfaee20588ed24164a4a695535cf995206934 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Jun 2015 23:44:12 +0000 Subject: [PATCH 065/258] I2CP: More fixes after prop, w.r.t. restore after close-on-idle - When socket is closed, set sessionID and LS to null, close subsession and set its sessionID and LS to null - Checks on client side for null session ID - Check for null session in Destroy Session message - Don't kill I2CP connection due to a bad session ID in a SendMessage, just drop the message and send a MessageStatusMessage - Log tweaks --- .../net/i2p/client/I2CPMessageProducer.java | 29 ++++++++++-- .../src/net/i2p/client/I2PSessionImpl.java | 22 +++++++-- history.txt | 4 ++ .../client/ClientMessageEventListener.java | 47 +++++++++++++++---- 4 files changed, 85 insertions(+), 17 deletions(-) diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/I2CPMessageProducer.java index c625e7841..bbabc3a11 100644 --- a/core/java/src/net/i2p/client/I2CPMessageProducer.java +++ b/core/java/src/net/i2p/client/I2CPMessageProducer.java @@ -34,6 +34,7 @@ import net.i2p.data.i2cp.ReportAbuseMessage; import net.i2p.data.i2cp.SendMessageMessage; import net.i2p.data.i2cp.SendMessageExpiresMessage; import net.i2p.data.i2cp.SessionConfig; +import net.i2p.data.i2cp.SessionId; import net.i2p.util.Log; /** @@ -154,7 +155,12 @@ class I2CPMessageProducer { } else msg = new SendMessageMessage(); msg.setDestination(dest); - msg.setSessionId(session.getSessionId()); + SessionId sid = session.getSessionId(); + if (sid == null) { + _log.error(session.toString() + " send message w/o session", new Exception()); + return; + } + msg.setSessionId(sid); msg.setNonce(nonce); Payload data = createPayload(dest, payload, null, null, null, null); msg.setPayload(data); @@ -176,7 +182,12 @@ class I2CPMessageProducer { return; SendMessageMessage msg = new SendMessageExpiresMessage(options); msg.setDestination(dest); - msg.setSessionId(session.getSessionId()); + SessionId sid = session.getSessionId(); + if (sid == null) { + _log.error(session.toString() + " send message w/o session", new Exception()); + return; + } + msg.setSessionId(sid); msg.setNonce(nonce); Payload data = createPayload(dest, payload, null, null, null, null); msg.setPayload(data); @@ -352,7 +363,12 @@ class I2CPMessageProducer { msg.setLeaseSet(leaseSet); msg.setPrivateKey(priv); msg.setSigningPrivateKey(signingPriv); - msg.setSessionId(session.getSessionId()); + SessionId sid = session.getSessionId(); + if (sid == null) { + _log.error(session.toString() + " create LS w/o session", new Exception()); + return; + } + msg.setSessionId(sid); session.sendMessage(msg); } @@ -381,7 +397,12 @@ class I2CPMessageProducer { throw new I2PSessionException("Unable to sign the session config", dfe); } msg.setSessionConfig(cfg); - msg.setSessionId(session.getSessionId()); + SessionId sid = session.getSessionId(); + if (sid == null) { + _log.error(session.toString() + " update config w/o session", new Exception()); + return; + } + msg.setSessionId(sid); session.sendMessage(msg); } } diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java index bc34f88f0..6532b1f9f 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/I2PSessionImpl.java @@ -502,6 +502,8 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 } protected void changeState(State state) { + if (_log.shouldInfo()) + _log.info(getPrefix() + "Change state to " + state); synchronized (_stateLock) { _state = state; _stateLock.notifyAll(); @@ -891,8 +893,9 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 public void messageReceived(I2CPMessageReader reader, I2CPMessage message) { int type = message.getType(); SessionId id = message.sessionId(); - if (id == null || id.equals(_sessionId) || - (_sessionId == null && id != null && type == SessionStatusMessage.MESSAGE_TYPE)) { + SessionId currId = _sessionId; + if (id == null || id.equals(currId) || + (currId == null && id != null && type == SessionStatusMessage.MESSAGE_TYPE)) { // it's for us I2CPMessageHandler handler = _handlerMap.getHandler(type); if (handler != null) { @@ -1123,6 +1126,13 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 locked_closeSocket(); changeState(State.CLOSED); } + synchronized (_subsessionLock) { + for (SubSession sess : _subsessions) { + sess.changeState(State.CLOSED); + sess.setSessionId(null); + sess.setLeaseSet(null); + } + } } /** @@ -1152,6 +1162,8 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 _socket = null; // so when propogateError calls closeSocket, it doesnt loop } } + setSessionId(null); + setLeaseSet(null); } /** @@ -1238,8 +1250,10 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 buf.append(s); else buf.append(getClass().getSimpleName()); - if (_sessionId != null) - buf.append(" #").append(_sessionId.getSessionId()); + SessionId id = _sessionId; + if (id != null) + buf.append(" #").append(id.getSessionId()); + buf.append(' ').append(_state.toString()); buf.append("]: "); return buf.toString(); } diff --git a/history.txt b/history.txt index f43fa1b52..47c310559 100644 --- a/history.txt +++ b/history.txt @@ -8,6 +8,10 @@ Prop from i2p.i2p.zzz.multisess: - Add support for 'aliased' local destinations that use the same tunnel pools - No UI or config support, no server support, may be added later - Catch uncaught exceptions in ClientConnectionRunner and stop connection + - When socket is closed, set sessionID and LS to null, + close subsession and set its sessionID and LS to null + - Checks on client side for null session ID + - Check for null session in Destroy Session message 2015-06-13 zzz * i2psnark: Fix NPE (ticket #1602) diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index d2a6ceeb0..f0b273c4a 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -8,6 +8,7 @@ package net.i2p.router.client; * */ +import java.util.List; import java.util.Properties; import net.i2p.CoreVersion; @@ -30,6 +31,7 @@ import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessagePayloadMessage; +import net.i2p.data.i2cp.MessageStatusMessage; import net.i2p.data.i2cp.ReceiveMessageBeginMessage; import net.i2p.data.i2cp.ReceiveMessageEndMessage; import net.i2p.data.i2cp.ReconfigureSessionMessage; @@ -365,9 +367,28 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionId sid = message.getSessionId(); SessionConfig cfg = _runner.getConfig(sid); if (cfg == null) { + List current = _runner.getSessionIds(); + String msg = "SendMessage invalid session: " + sid + " current: " + current; if (_log.shouldLog(Log.ERROR)) - _log.error("SendMessage w/o session: " + sid); - _runner.disconnectClient("SendMessage w/o session: " + sid); + _log.error(msg); + // Just drop the message for now, don't kill the whole socket... + // bugs on client side, esp. prior to 0.9.21, may cause sending + // of messages before the session is established + //_runner.disconnectClient(msg); + // do this instead: + if (sid != null && message.getNonce() > 0) { + MessageStatusMessage status = new MessageStatusMessage(); + status.setSessionId(sid.getSessionId()); + status.setSize(0); + status.setNonce(message.getNonce()); + status.setStatus(MessageStatusMessage.STATUS_SEND_FAILURE_BAD_SESSION); + try { + _runner.doSend(status); + } catch (I2CPMessageException ime) { + if (_log.shouldLog(Log.WARN)) + _log.warn("Error writing out the message status message", ime); + } + } return; } if (_log.shouldLog(Log.DEBUG)) @@ -424,10 +445,14 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi private void handleDestroySession(DestroySessionMessage message) { SessionId id = message.getSessionId(); - SessionConfig cfg = _runner.getConfig(id); - _runner.removeSession(id); + if (id != null) { + _runner.removeSession(id); + } else { + if (_log.shouldLog(Log.WARN)) + _log.warn("destroy session with null ID"); + } int left = _runner.getSessionIds().size(); - if (left <= 0) { + if (left <= 0 || id == null) { _runner.stopRunning(); } else { if (_log.shouldLog(Log.INFO)) @@ -446,9 +471,11 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionId id = message.getSessionId(); SessionConfig cfg = _runner.getConfig(id); if (cfg == null) { + List current = _runner.getSessionIds(); + String msg = "CreateLeaseSet invalid session: " + id + " current: " + current; if (_log.shouldLog(Log.ERROR)) - _log.error("CreateLeaseSet w/o session: " + id); - _runner.disconnectClient("CreateLeaseSet w/o session: " + id); + _log.error(msg); + _runner.disconnectClient(msg); return; } Destination dest = cfg.getDestination(); @@ -536,10 +563,12 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi SessionId id = message.getSessionId(); SessionConfig cfg = _runner.getConfig(id); if (cfg == null) { + List current = _runner.getSessionIds(); + String msg = "ReconfigureSession invalid session: " + id + " current: " + current; if (_log.shouldLog(Log.ERROR)) - _log.error("ReconfigureSession w/o session: " + id); + _log.error(msg); //sendStatusMessage(id, SessionStatusMessage.STATUS_INVALID); - _runner.disconnectClient("ReconfigureSession w/o session: " + id); + _runner.disconnectClient(msg); return; } if (_log.shouldLog(Log.INFO)) From 0f4e09500c9764d0ef1e1291d35a167eb5545c77 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 17 Jun 2015 23:46:11 +0000 Subject: [PATCH 066/258] javadocs --- .../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java | 3 +++ .../router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java | 1 + .../net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java | 2 ++ .../java/src/net/i2p/router/networkdb/kademlia/StoreJob.java | 2 ++ router/java/src/net/i2p/router/peermanager/PeerManager.java | 3 ++- .../net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java index 51425cbd0..656b2c0f9 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java @@ -33,6 +33,9 @@ public class I2PTunnelHTTPClientRunner extends I2PTunnelRunner { super(s, i2ps, slock, initialI2PData, null, sockList, onFail); } + /** + * Only call once! + */ @Override protected OutputStream getSocketOut() throws IOException { OutputStream raw = super.getSocketOut(); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java index fb620a1ad..9ac4f7391 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java @@ -21,6 +21,7 @@ import net.i2p.util.Log; * Also called when opting out of ff to call off the hounds ASAP. * Currently floods FNDF.MAX_TO_FLOOD * 2 routers nearest to us. * + * @since 0.9.21 */ class FloodfillRouterInfoFloodJob extends JobImpl { private final Log _log; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java index 5618d2564..b7ad0465f 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java @@ -20,6 +20,8 @@ import net.i2p.util.Log; /** * This extends StoreJob to fire off a FloodfillVerifyStoreJob after success. * + * Stores through this class always request a reply. + * */ class FloodfillStoreJob extends StoreJob { private final FloodfillNetworkDatabaseFacade _facade; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index 809b96015..2845de561 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -33,6 +33,8 @@ import net.i2p.util.Log; import net.i2p.util.VersionComparator; /** + * Stores through this always request a reply. + * * Unused directly - see FloodfillStoreJob */ class StoreJob extends JobImpl { diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java index bb88fed79..8061a2517 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerManager.java +++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java @@ -193,7 +193,8 @@ class PeerManager { } /** - * Find some peers that meet the criteria and we have the netDb info for locally + * Find some peers that meet the criteria and we have the netDb info for locally. + * Returned list will not include ourselves. * * Only used by PeerTestJob (PURPOSE_TEST) */ diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java index 68ad4e046..6bb81fbc8 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java @@ -24,7 +24,7 @@ class ExploratoryPeerSelector extends TunnelPeerSelector { super(context); } - public List selectPeers(TunnelPoolSettings settings) { + public List selectPeers(TunnelPoolSettings settings) { Log l = ctx.logManager().getLog(getClass()); int length = getLength(settings); if (length < 0) { From 1cf544f1d4e6363395e4ab80643185a6b535bfb2 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 18 Jun 2015 00:41:58 +0000 Subject: [PATCH 067/258] fix unit test compile --- .../i2p/router/client/LocalClientConnectionRunner.java | 8 ++++---- .../junit/net/i2p/router/client/LocalClientManager.java | 4 ++-- .../router/client/LocalClientMessageEventListener.java | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java b/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java index 9ded6ce90..11bed79a9 100644 --- a/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java +++ b/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java @@ -42,9 +42,9 @@ class LocalClientConnectionRunner extends ClientConnectionRunner { * don't instantiate a RequestLeaseSetJob */ @Override - void requestLeaseSet(LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) { + void requestLeaseSet(Hash h, LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) { RequestVariableLeaseSetMessage msg = new RequestVariableLeaseSetMessage(); - msg.setSessionId(getSessionId()); + msg.setSessionId(getSessionId(h)); for (int i = 0; i < set.getLeaseCount(); i++) { Lease lease = set.getLease(i); msg.addEndpoint(lease); @@ -60,12 +60,12 @@ class LocalClientConnectionRunner extends ClientConnectionRunner { * No job queue, so super NPEs */ @Override - void updateMessageDeliveryStatus(MessageId id, long messageNonce, int status) { + void updateMessageDeliveryStatus(Destination dest, MessageId id, long messageNonce, int status) { if (messageNonce <= 0) return; MessageStatusMessage msg = new MessageStatusMessage(); msg.setMessageId(id.getMessageId()); - msg.setSessionId(getSessionId().getSessionId()); + msg.setSessionId(getSessionId(dest.calculateHash()).getSessionId()); // has to be >= 0, it is initialized to -1 msg.setNonce(messageNonce); msg.setSize(0); diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java index 12666969d..0f9ba30ab 100644 --- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java +++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java @@ -58,12 +58,12 @@ class LocalClientManager extends ClientManager { if (runner != null) { runner.receiveMessage(toDest, fromDest, payload); if (sender != null) - sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL); + sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL); } else { // remote. ignore. System.out.println("Message " + msgId + " is targeting a REMOTE destination - DROPPED"); if (sender != null) - sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE); + sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE); } } diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java b/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java index 17cd20e71..d4873f4a8 100644 --- a/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java +++ b/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java @@ -25,6 +25,7 @@ import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.HostLookupMessage; import net.i2p.data.i2cp.HostReplyMessage; import net.i2p.data.i2cp.I2CPMessageException; +import net.i2p.data.i2cp.SessionConfig; import net.i2p.data.i2cp.SessionId; import net.i2p.router.RouterContext; @@ -43,7 +44,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener { * Immediately send a fake leaseset */ @Override - protected void startCreateSessionJob() { + protected void startCreateSessionJob(SessionConfig config) { long exp = _context.clock().now() + 10*60*1000; LeaseSet ls = new LeaseSet(); Lease lease = new Lease(); @@ -53,7 +54,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener { Date date = new Date(exp); lease.setEndDate(date); ls.addLease(lease); - _runner.requestLeaseSet(ls, exp, null, null); + _runner.requestLeaseSet(config.getDestination().calculateHash(), ls, exp, null, null); } /** From acc647822f802bea56118fc407497a2cdd1edee0 Mon Sep 17 00:00:00 2001 From: kytv Date: Thu, 18 Jun 2015 10:34:54 +0000 Subject: [PATCH 068/258] sync debian changelog in mtn --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 860e523b0..fd4e29a28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +i2p (0.9.20-2) unstable; urgency=medium + + [str4d] + * i2ptunnel: Don't connect manager to router in constructor (ticket #815) + * i2ptunnel: Don't call startup() in chained constructor (ticket #1593) + * Define I2PTunnelClientBase stats in one place + + [killyourtv] + * Tighten apparmor rules for TMPDIR + * Add support for specifying limits to the initscript + * Fix NPE in I2PSnark (I2P Trac #1602) + + -- Kill Your TV Sun, 14 Jun 2015 16:11:33 +0000 + i2p (0.9.20-1) unstable; urgency=medium * New Upstream Version From cd62d7170c28819e287df3dfb541e4da7a9610eb Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 18 Jun 2015 15:02:21 +0000 Subject: [PATCH 069/258] I2CP: Don't send the first LS request to the client until we have at least one OB tunnel, so the client waits until we are ready. This will reduce drops, retransmissions, and failures on new client tunnels. Fixes to prevent multiple pending LS requests. --- .../router/client/ClientConnectionRunner.java | 51 +++++++++++++++---- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index 3e212d081..f804c3674 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -123,6 +123,7 @@ class ClientConnectionRunner { SessionId sessionId; SessionConfig config; LeaseRequestState leaseRequest; + Rerequest rerequestTimer; LeaseSet currentLeaseSet; SessionParams(Destination d, boolean isPrimary) { @@ -766,6 +767,8 @@ class ClientConnectionRunner { * within the timeout specified, queue up the onFailedJob. This call does not * block. * + * Job args are always null, may need some fixups if we start using them. + * * @param h the Destination's hash * @param set LeaseSet with requested leases - this object must be updated to contain the * signed version (as well as any changed/added/removed Leases) @@ -800,6 +803,7 @@ class ClientConnectionRunner { // synch so _currentLeaseSet isn't changed out from under us LeaseSet current = null; Destination dest = sp.dest; + LeaseRequestState state; synchronized (this) { current = sp.currentLeaseSet; if (current != null && current.getLeaseCount() == leases) { @@ -817,11 +821,10 @@ class ClientConnectionRunner { } } } - } - if (_log.shouldLog(Log.INFO)) - _log.info("Current leaseSet " + current + "\nNew leaseSet " + set); - LeaseRequestState state; - synchronized (this) { + + if (_log.shouldLog(Log.INFO)) + _log.info("Current leaseSet " + current + "\nNew leaseSet " + set); + state = sp.leaseRequest; if (state != null) { LeaseSet requested = state.getRequested(); @@ -835,7 +838,9 @@ class ClientConnectionRunner { } else { // ours is newer, so wait a few secs and retry set.setDestination(dest); - _context.simpleTimer2().addEvent(new Rerequest(set, expirationTime, onCreateJob, onFailedJob), 3*1000); + Rerequest timer = new Rerequest(set, expirationTime, onCreateJob, onFailedJob); + sp.rerequestTimer = timer; + _context.simpleTimer2().addEvent(timer, 3*1000); if (_log.shouldLog(Log.DEBUG)) _log.debug("Already requesting, ours newer, wait 3 sec: " + state); } @@ -843,10 +848,24 @@ class ClientConnectionRunner { return; // already requesting } else { set.setDestination(dest); - sp.leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, + if (current == null && _context.tunnelManager().getOutboundClientTunnelCount(h) <= 0) { + // at startup of a client, where we don't have a leaseset, wait for + // an outbound tunnel also, so the client doesn't start sending data + // before we are ready + Rerequest timer = new Rerequest(set, expirationTime, onCreateJob, onFailedJob); + sp.rerequestTimer = timer; + _context.simpleTimer2().addEvent(timer, 1000); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("No current LS but no OB tunnels, wait 1 sec for " + h); + return; + } else { + // so the timer won't fire off with an older LS request + sp.rerequestTimer = null; + sp.leaseRequest = state = new LeaseRequestState(onCreateJob, onFailedJob, _context.clock().now() + expirationTime, set); - if (_log.shouldLog(Log.DEBUG)) - _log.debug("New request: " + state); + if (_log.shouldLog(Log.DEBUG)) + _log.debug("New request: " + state); + } } } _context.jobQueue().addJob(new RequestLeaseSetJob(_context, this, state)); @@ -867,6 +886,20 @@ class ClientConnectionRunner { } public void timeReached() { + Hash h = _ls.getDestination().calculateHash(); + SessionParams sp = _sessions.get(h); + if (sp == null) { + if (_log.shouldLog(Log.WARN)) + _log.warn("cancelling rerequest, session went away"); + return; + } + synchronized(ClientConnectionRunner.this) { + if (sp.rerequestTimer != Rerequest.this) { + if (_log.shouldLog(Log.WARN)) + _log.warn("cancelling rerequest, newer request came in"); + return; + } + } requestLeaseSet(_ls.getDestination().calculateHash(), _ls, _expirationTime, _onCreate, _onFailed); } } From 20c796e87ac9e0c65d16ac0b6e7ab122c1bc58ab Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 18 Jun 2015 15:05:48 +0000 Subject: [PATCH 070/258] Update: Add language param to news fetch, to support translated news (ticket #1425) --- .../net/i2p/router/update/NewsFetcher.java | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index 7041c21da..76a77fe7e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -40,6 +40,7 @@ import net.i2p.util.PortMapper; import net.i2p.util.ReusableGZIPInputStream; import net.i2p.util.SecureFileOutputStream; import net.i2p.util.SSLEepGet; +import net.i2p.util.Translate; import net.i2p.util.VersionComparator; /** @@ -94,8 +95,13 @@ class NewsFetcher extends UpdateRunner { } for (URI uri : _urls) { - _currentURI = uri; - String newsURL = uri.toString(); + String origURL = uri.toString(); + String newsURL = addLang(origURL); + try { + _currentURI = new URI(newsURL); + } catch (URISyntaxException use) { + _currentURI = uri; + } if (_tempFile.exists()) _tempFile.delete(); @@ -129,6 +135,29 @@ class NewsFetcher extends UpdateRunner { } } } + + /** + * Add a query param for the local language to get translated news + * @since 0.9.21 + */ + private String addLang(String url) { + if (url.contains("?lang=") || url.contains("&lang=")) + return url; + String lang = Translate.getLanguage(_context); + if (lang.equals("en")) + return url; + StringBuilder buf = new StringBuilder(); + buf.append(url); + if (url.contains("?")) + buf.append("&lang="); + else + buf.append("?lang="); + buf.append(lang); + String co = Translate.getCountry(_context); + if (co.length() > 0) + buf.append('_').append(co); + return buf.toString(); + } // Fake XML parsing // Line must contain this, and full entry must be on one line From addb142ecd519e14ac95cc8345fbc7e9434e6eca Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 18 Jun 2015 21:20:00 +0000 Subject: [PATCH 071/258] I2CP: Move client-side implementation classes to new package net.i2p.client.impl, leaving only the factories and interfaces in net.i2p.client --- .../net/i2p/client/streaming/impl/PacketLocal.java | 2 -- core/java/src/net/i2p/client/I2PClientFactory.java | 4 +++- core/java/src/net/i2p/client/I2PSession.java | 1 - core/java/src/net/i2p/client/I2PSimpleClient.java | 1 + .../i2p/client/{ => impl}/BWLimitsMessageHandler.java | 2 +- .../net/i2p/client/{ => impl}/ClientWriterRunner.java | 3 ++- .../client/{ => impl}/DestReplyMessageHandler.java | 2 +- .../client/{ => impl}/DisconnectMessageHandler.java | 3 ++- .../src/net/i2p/client/{ => impl}/HandlerImpl.java | 2 +- .../client/{ => impl}/HostReplyMessageHandler.java | 2 +- .../net/i2p/client/{ => impl}/I2CPMessageHandler.java | 2 +- .../i2p/client/{ => impl}/I2CPMessageProducer.java | 4 +++- .../src/net/i2p/client/{ => impl}/I2PClientImpl.java | 7 +++++-- .../client/{ => impl}/I2PClientMessageHandlerMap.java | 2 +- .../client/{ => impl}/I2PSessionDemultiplexer.java | 6 +++++- .../src/net/i2p/client/{ => impl}/I2PSessionImpl.java | 7 ++++++- .../net/i2p/client/{ => impl}/I2PSessionImpl2.java | 8 +++++++- .../i2p/client/{ => impl}/I2PSessionMuxedImpl.java | 9 +++++++-- .../net/i2p/client/{ => impl}/I2PSimpleSession.java | 6 ++++-- .../{ => impl}/MessagePayloadMessageHandler.java | 3 ++- .../src/net/i2p/client/{ => impl}/MessageState.java | 4 +++- .../{ => impl}/MessageStatusMessageHandler.java | 3 ++- .../{ => impl}/RequestLeaseSetMessageHandler.java | 3 ++- .../RequestVariableLeaseSetMessageHandler.java | 2 +- .../net/i2p/client/{ => impl}/SessionIdleTimer.java | 3 ++- .../{ => impl}/SessionStatusMessageHandler.java | 3 ++- .../i2p/client/{ => impl}/SetDateMessageHandler.java | 2 +- .../src/net/i2p/client/{ => impl}/SubSession.java | 4 +++- core/java/src/net/i2p/client/impl/package.html | 11 +++++++++++ core/java/src/net/i2p/client/package.html | 11 +++++++++-- router/java/src/net/i2p/router/Router.java | 2 +- .../i2p/router/client/ClientManagerFacadeImpl.java | 2 +- 32 files changed, 91 insertions(+), 35 deletions(-) rename core/java/src/net/i2p/client/{ => impl}/BWLimitsMessageHandler.java (96%) rename core/java/src/net/i2p/client/{ => impl}/ClientWriterRunner.java (98%) rename core/java/src/net/i2p/client/{ => impl}/DestReplyMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/DisconnectMessageHandler.java (95%) rename core/java/src/net/i2p/client/{ => impl}/HandlerImpl.java (96%) rename core/java/src/net/i2p/client/{ => impl}/HostReplyMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/I2CPMessageHandler.java (95%) rename core/java/src/net/i2p/client/{ => impl}/I2CPMessageProducer.java (99%) rename core/java/src/net/i2p/client/{ => impl}/I2PClientImpl.java (97%) rename core/java/src/net/i2p/client/{ => impl}/I2PClientMessageHandlerMap.java (99%) rename core/java/src/net/i2p/client/{ => impl}/I2PSessionDemultiplexer.java (96%) rename core/java/src/net/i2p/client/{ => impl}/I2PSessionImpl.java (99%) rename core/java/src/net/i2p/client/{ => impl}/I2PSessionImpl2.java (98%) rename core/java/src/net/i2p/client/{ => impl}/I2PSessionMuxedImpl.java (98%) rename core/java/src/net/i2p/client/{ => impl}/I2PSimpleSession.java (97%) rename core/java/src/net/i2p/client/{ => impl}/MessagePayloadMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/MessageState.java (98%) rename core/java/src/net/i2p/client/{ => impl}/MessageStatusMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/RequestLeaseSetMessageHandler.java (99%) rename core/java/src/net/i2p/client/{ => impl}/RequestVariableLeaseSetMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/SessionIdleTimer.java (98%) rename core/java/src/net/i2p/client/{ => impl}/SessionStatusMessageHandler.java (96%) rename core/java/src/net/i2p/client/{ => impl}/SetDateMessageHandler.java (97%) rename core/java/src/net/i2p/client/{ => impl}/SubSession.java (98%) create mode 100644 core/java/src/net/i2p/client/impl/package.html diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java index d82033891..542de8f2f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java @@ -207,8 +207,6 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { * * @param buffer data to be written * @param offset starting point in the buffer - * @param ctx Application Context - * @param key signing key * @return Count of bytes written * @throws IllegalStateException if there is data missing or otherwise b0rked * @since 0.9.20 moved from Packet diff --git a/core/java/src/net/i2p/client/I2PClientFactory.java b/core/java/src/net/i2p/client/I2PClientFactory.java index 86fbdaa8c..01a37b599 100644 --- a/core/java/src/net/i2p/client/I2PClientFactory.java +++ b/core/java/src/net/i2p/client/I2PClientFactory.java @@ -9,6 +9,8 @@ package net.i2p.client; * */ +import net.i2p.client.impl.I2PClientImpl; + /** * Provide a means of hooking into an appropriate I2PClient implementation * @@ -21,4 +23,4 @@ public class I2PClientFactory { public static I2PClient createClient() { return new I2PClientImpl(); } -} \ No newline at end of file +} diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java index 016293ea7..458b9a892 100644 --- a/core/java/src/net/i2p/client/I2PSession.java +++ b/core/java/src/net/i2p/client/I2PSession.java @@ -260,7 +260,6 @@ public interface I2PSession { public I2PSession addSubsession(InputStream privateKeyStream, Properties opts) throws I2PSessionException; /** - * @return a list of subsessions, non-null, does not include the primary session * @since 0.9.21 */ public void removeSubsession(I2PSession session); diff --git a/core/java/src/net/i2p/client/I2PSimpleClient.java b/core/java/src/net/i2p/client/I2PSimpleClient.java index 38286f2b1..c8b1fdcf4 100644 --- a/core/java/src/net/i2p/client/I2PSimpleClient.java +++ b/core/java/src/net/i2p/client/I2PSimpleClient.java @@ -12,6 +12,7 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.impl.I2PSimpleSession; import net.i2p.crypto.SigType; import net.i2p.data.Certificate; import net.i2p.data.Destination; diff --git a/core/java/src/net/i2p/client/BWLimitsMessageHandler.java b/core/java/src/net/i2p/client/impl/BWLimitsMessageHandler.java similarity index 96% rename from core/java/src/net/i2p/client/BWLimitsMessageHandler.java rename to core/java/src/net/i2p/client/impl/BWLimitsMessageHandler.java index 34fa81ec8..6e199af46 100644 --- a/core/java/src/net/i2p/client/BWLimitsMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/BWLimitsMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * Released into the public domain diff --git a/core/java/src/net/i2p/client/ClientWriterRunner.java b/core/java/src/net/i2p/client/impl/ClientWriterRunner.java similarity index 98% rename from core/java/src/net/i2p/client/ClientWriterRunner.java rename to core/java/src/net/i2p/client/impl/ClientWriterRunner.java index 35ecce19d..dfe20bc1d 100644 --- a/core/java/src/net/i2p/client/ClientWriterRunner.java +++ b/core/java/src/net/i2p/client/impl/ClientWriterRunner.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; import java.io.BufferedOutputStream; import java.io.IOException; @@ -9,6 +9,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageException; import net.i2p.internal.PoisonI2CPMessage; diff --git a/core/java/src/net/i2p/client/DestReplyMessageHandler.java b/core/java/src/net/i2p/client/impl/DestReplyMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/DestReplyMessageHandler.java rename to core/java/src/net/i2p/client/impl/DestReplyMessageHandler.java index 2207a56c5..e15a55779 100644 --- a/core/java/src/net/i2p/client/DestReplyMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/DestReplyMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * Released into the public domain diff --git a/core/java/src/net/i2p/client/DisconnectMessageHandler.java b/core/java/src/net/i2p/client/impl/DisconnectMessageHandler.java similarity index 95% rename from core/java/src/net/i2p/client/DisconnectMessageHandler.java rename to core/java/src/net/i2p/client/impl/DisconnectMessageHandler.java index 8dd47f10b..20582ddcb 100644 --- a/core/java/src/net/i2p/client/DisconnectMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/DisconnectMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -10,6 +10,7 @@ package net.i2p.client; */ import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.i2cp.DisconnectMessage; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.util.I2PAppThread; diff --git a/core/java/src/net/i2p/client/HandlerImpl.java b/core/java/src/net/i2p/client/impl/HandlerImpl.java similarity index 96% rename from core/java/src/net/i2p/client/HandlerImpl.java rename to core/java/src/net/i2p/client/impl/HandlerImpl.java index d1b5100e2..081d8e0c4 100644 --- a/core/java/src/net/i2p/client/HandlerImpl.java +++ b/core/java/src/net/i2p/client/impl/HandlerImpl.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others diff --git a/core/java/src/net/i2p/client/HostReplyMessageHandler.java b/core/java/src/net/i2p/client/impl/HostReplyMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/HostReplyMessageHandler.java rename to core/java/src/net/i2p/client/impl/HostReplyMessageHandler.java index 94cce4758..4cce11ab9 100644 --- a/core/java/src/net/i2p/client/HostReplyMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/HostReplyMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * Released into the public domain diff --git a/core/java/src/net/i2p/client/I2CPMessageHandler.java b/core/java/src/net/i2p/client/impl/I2CPMessageHandler.java similarity index 95% rename from core/java/src/net/i2p/client/I2CPMessageHandler.java rename to core/java/src/net/i2p/client/impl/I2CPMessageHandler.java index a0f14f837..a0a60d69d 100644 --- a/core/java/src/net/i2p/client/I2CPMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/I2CPMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others diff --git a/core/java/src/net/i2p/client/I2CPMessageProducer.java b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java similarity index 99% rename from core/java/src/net/i2p/client/I2CPMessageProducer.java rename to core/java/src/net/i2p/client/impl/I2CPMessageProducer.java index bbabc3a11..f44b897a3 100644 --- a/core/java/src/net/i2p/client/I2CPMessageProducer.java +++ b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -15,6 +15,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; +import net.i2p.client.SendMessageOptions; import net.i2p.data.DataFormatException; import net.i2p.data.Destination; import net.i2p.data.LeaseSet; diff --git a/core/java/src/net/i2p/client/I2PClientImpl.java b/core/java/src/net/i2p/client/impl/I2PClientImpl.java similarity index 97% rename from core/java/src/net/i2p/client/I2PClientImpl.java rename to core/java/src/net/i2p/client/impl/I2PClientImpl.java index e0c7feea9..0bda34daa 100644 --- a/core/java/src/net/i2p/client/I2PClientImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PClientImpl.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -17,6 +17,9 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; import net.i2p.crypto.KeyGenerator; import net.i2p.crypto.SigType; import net.i2p.data.Certificate; @@ -36,7 +39,7 @@ import net.i2p.util.RandomSource; * * @author jrandom */ -class I2PClientImpl implements I2PClient { +public class I2PClientImpl implements I2PClient { /** * Create a destination with a DSA 1024/160 signature type and a null certificate. diff --git a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java b/core/java/src/net/i2p/client/impl/I2PClientMessageHandlerMap.java similarity index 99% rename from core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java rename to core/java/src/net/i2p/client/impl/I2PClientMessageHandlerMap.java index bd2de83d6..4cea850b7 100644 --- a/core/java/src/net/i2p/client/I2PClientMessageHandlerMap.java +++ b/core/java/src/net/i2p/client/impl/I2PClientMessageHandlerMap.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others diff --git a/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java b/core/java/src/net/i2p/client/impl/I2PSessionDemultiplexer.java similarity index 96% rename from core/java/src/net/i2p/client/I2PSessionDemultiplexer.java rename to core/java/src/net/i2p/client/impl/I2PSessionDemultiplexer.java index ea1ef2437..5b29e8018 100644 --- a/core/java/src/net/i2p/client/I2PSessionDemultiplexer.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionDemultiplexer.java @@ -1,9 +1,13 @@ -package net.i2p.client; +package net.i2p.client.impl; import java.util.concurrent.ConcurrentHashMap; import java.util.Map; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; +import net.i2p.client.I2PSessionMuxedListener; import net.i2p.util.Log; /* diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java similarity index 99% rename from core/java/src/net/i2p/client/I2PSessionImpl.java rename to core/java/src/net/i2p/client/impl/I2PSessionImpl.java index 6532b1f9f..0be40f87f 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -29,6 +29,11 @@ import java.util.concurrent.atomic.AtomicInteger; import net.i2p.CoreVersion; import net.i2p.I2PAppContext; +import net.i2p.client.DomainSocketFactory; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; import net.i2p.data.Base32; import net.i2p.data.DataFormatException; import net.i2p.data.Destination; diff --git a/core/java/src/net/i2p/client/I2PSessionImpl2.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java similarity index 98% rename from core/java/src/net/i2p/client/I2PSessionImpl2.java rename to core/java/src/net/i2p/client/impl/I2PSessionImpl2.java index d6fe3ad36..4eddcc30e 100644 --- a/core/java/src/net/i2p/client/I2PSessionImpl2.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -20,6 +20,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import net.i2p.I2PAppContext; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; +import net.i2p.client.I2PSessionMuxedListener; +import net.i2p.client.SendMessageOptions; +import net.i2p.client.SendMessageStatusListener; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.SessionKey; diff --git a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java similarity index 98% rename from core/java/src/net/i2p/client/I2PSessionMuxedImpl.java rename to core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java index 653fddc9a..46e551e49 100644 --- a/core/java/src/net/i2p/client/I2PSessionMuxedImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * public domain @@ -8,9 +8,14 @@ import java.io.InputStream; import java.util.concurrent.LinkedBlockingQueue; import java.util.Properties; import java.util.Set; - import java.util.concurrent.atomic.AtomicBoolean; + import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; +import net.i2p.client.I2PSessionMuxedListener; +import net.i2p.client.SendMessageOptions; +import net.i2p.client.SendMessageStatusListener; import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.data.SessionKey; diff --git a/core/java/src/net/i2p/client/I2PSimpleSession.java b/core/java/src/net/i2p/client/impl/I2PSimpleSession.java similarity index 97% rename from core/java/src/net/i2p/client/I2PSimpleSession.java rename to core/java/src/net/i2p/client/impl/I2PSimpleSession.java index ce0ef254f..dd59ea463 100644 --- a/core/java/src/net/i2p/client/I2PSimpleSession.java +++ b/core/java/src/net/i2p/client/impl/I2PSimpleSession.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * Released into the public domain @@ -16,6 +16,8 @@ import java.util.Properties; import net.i2p.CoreVersion; import net.i2p.I2PAppContext; +import net.i2p.client.I2PClient; +import net.i2p.client.I2PSessionException; import net.i2p.data.i2cp.BandwidthLimitsMessage; import net.i2p.data.i2cp.DestReplyMessage; import net.i2p.data.i2cp.DisconnectMessage; @@ -37,7 +39,7 @@ import net.i2p.util.OrderedProperties; * * @author zzz */ -class I2PSimpleSession extends I2PSessionImpl2 { +public class I2PSimpleSession extends I2PSessionImpl2 { private static final int BUF_SIZE = 1024; diff --git a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java b/core/java/src/net/i2p/client/impl/MessagePayloadMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/MessagePayloadMessageHandler.java rename to core/java/src/net/i2p/client/impl/MessagePayloadMessageHandler.java index 39dc99403..47beb2101 100644 --- a/core/java/src/net/i2p/client/MessagePayloadMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/MessagePayloadMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -10,6 +10,7 @@ package net.i2p.client; */ import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.DataFormatException; import net.i2p.data.Payload; import net.i2p.data.i2cp.I2CPMessage; diff --git a/core/java/src/net/i2p/client/MessageState.java b/core/java/src/net/i2p/client/impl/MessageState.java similarity index 98% rename from core/java/src/net/i2p/client/MessageState.java rename to core/java/src/net/i2p/client/impl/MessageState.java index e56eb9a8a..267a9cb19 100644 --- a/core/java/src/net/i2p/client/MessageState.java +++ b/core/java/src/net/i2p/client/impl/MessageState.java @@ -1,8 +1,10 @@ -package net.i2p.client; +package net.i2p.client.impl; import java.util.concurrent.atomic.AtomicLong; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSession; +import net.i2p.client.SendMessageStatusListener; import net.i2p.data.i2cp.MessageId; import net.i2p.data.i2cp.MessageStatusMessage; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/MessageStatusMessageHandler.java b/core/java/src/net/i2p/client/impl/MessageStatusMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/MessageStatusMessageHandler.java rename to core/java/src/net/i2p/client/impl/MessageStatusMessageHandler.java index f967ad956..4654eafa3 100644 --- a/core/java/src/net/i2p/client/MessageStatusMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/MessageStatusMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -10,6 +10,7 @@ package net.i2p.client; */ import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.MessageStatusMessage; import net.i2p.data.i2cp.ReceiveMessageBeginMessage; diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java similarity index 99% rename from core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java rename to core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java index 68f8f07b8..09dab72ff 100644 --- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/RequestLeaseSetMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -14,6 +14,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.crypto.KeyGenerator; import net.i2p.crypto.SigType; import net.i2p.data.DataFormatException; diff --git a/core/java/src/net/i2p/client/RequestVariableLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/RequestVariableLeaseSetMessageHandler.java rename to core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java index 6ba03d8f6..41cc9eb93 100644 --- a/core/java/src/net/i2p/client/RequestVariableLeaseSetMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/RequestVariableLeaseSetMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others diff --git a/core/java/src/net/i2p/client/SessionIdleTimer.java b/core/java/src/net/i2p/client/impl/SessionIdleTimer.java similarity index 98% rename from core/java/src/net/i2p/client/SessionIdleTimer.java rename to core/java/src/net/i2p/client/impl/SessionIdleTimer.java index 444f73167..5b4fa513e 100644 --- a/core/java/src/net/i2p/client/SessionIdleTimer.java +++ b/core/java/src/net/i2p/client/impl/SessionIdleTimer.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -8,6 +8,7 @@ package net.i2p.client; import java.util.Properties; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.DataHelper; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; diff --git a/core/java/src/net/i2p/client/SessionStatusMessageHandler.java b/core/java/src/net/i2p/client/impl/SessionStatusMessageHandler.java similarity index 96% rename from core/java/src/net/i2p/client/SessionStatusMessageHandler.java rename to core/java/src/net/i2p/client/impl/SessionStatusMessageHandler.java index 92bd7db82..ec0b0d674 100644 --- a/core/java/src/net/i2p/client/SessionStatusMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/SessionStatusMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others @@ -10,6 +10,7 @@ package net.i2p.client; */ import net.i2p.I2PAppContext; +import net.i2p.client.I2PSessionException; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.SessionStatusMessage; import net.i2p.util.Log; diff --git a/core/java/src/net/i2p/client/SetDateMessageHandler.java b/core/java/src/net/i2p/client/impl/SetDateMessageHandler.java similarity index 97% rename from core/java/src/net/i2p/client/SetDateMessageHandler.java rename to core/java/src/net/i2p/client/impl/SetDateMessageHandler.java index 68adb2d60..723bb7e2f 100644 --- a/core/java/src/net/i2p/client/SetDateMessageHandler.java +++ b/core/java/src/net/i2p/client/impl/SetDateMessageHandler.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others diff --git a/core/java/src/net/i2p/client/SubSession.java b/core/java/src/net/i2p/client/impl/SubSession.java similarity index 98% rename from core/java/src/net/i2p/client/SubSession.java rename to core/java/src/net/i2p/client/impl/SubSession.java index 0e2fca90b..51c5f0b16 100644 --- a/core/java/src/net/i2p/client/SubSession.java +++ b/core/java/src/net/i2p/client/impl/SubSession.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; import java.io.IOException; import java.io.InputStream; @@ -9,6 +9,8 @@ import java.util.Map; import java.util.Properties; import net.i2p.I2PAppContext; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; import net.i2p.data.Destination; import net.i2p.data.Hash; import net.i2p.data.PrivateKey; diff --git a/core/java/src/net/i2p/client/impl/package.html b/core/java/src/net/i2p/client/impl/package.html new file mode 100644 index 000000000..393014d7b --- /dev/null +++ b/core/java/src/net/i2p/client/impl/package.html @@ -0,0 +1,11 @@ + +

Implements the base I2P SDK for developing applications that communicate +through I2P.

+ +

+These classes are for implementing the client side of I2CP +and are not to be used externally. +Subject to change and not part of the public API. +Moved from net.i2p.client in 0.9.21. +

+ diff --git a/core/java/src/net/i2p/client/package.html b/core/java/src/net/i2p/client/package.html index f7287d5ac..9d250b4df 100644 --- a/core/java/src/net/i2p/client/package.html +++ b/core/java/src/net/i2p/client/package.html @@ -1,6 +1,13 @@ -

Implements the base I2P SDK for developing applications that communicate -through I2P.

+

+Interfaces and factories for +the base I2P SDK used to develop applications that communicate +through I2P. +

+ +

+Implementation moved to net.i2p.client.impl in 0.9.21. +

When a client application wants to communicate over I2P, the first thing it needs to do is get a {@link net.i2p.client.I2PClient} from the diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 364648ce6..c2994666e 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap; import gnu.getopt.Getopt; -import net.i2p.client.I2PSessionImpl; +import net.i2p.client.impl.I2PSessionImpl; import net.i2p.crypto.SigUtil; import net.i2p.data.Base64; import net.i2p.data.Certificate; diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index cc82592d5..385d3bd2b 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -132,7 +132,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte * LeaseSet. * * @param dest Destination from which the LeaseSet's authorization should be requested - * @param ls LeaseSet with requested leases - this object must be updated to contain the + * @param set LeaseSet with requested leases - this object must be updated to contain the * signed version (as well as any changed/added/removed Leases). * The LeaseSet contains Leases only; it is unsigned and does not have the destination set. */ From 2499aad51da29039c684af75a86d75564067014c Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 19 Jun 2015 14:55:49 +0000 Subject: [PATCH 072/258] I2PSocketEepGet: Do hostname lookups in-session for efficiency --- .../i2p/client/streaming/I2PSocketEepGet.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java index 99c81afdd..1b67bd226 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketEepGet.java @@ -11,8 +11,12 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; +import net.i2p.data.Base32; import net.i2p.data.DataHelper; import net.i2p.data.Destination; +import net.i2p.data.Hash; import net.i2p.util.EepGet; import net.i2p.util.SocketTimeout; @@ -129,9 +133,31 @@ public class I2PSocketEepGet extends EepGet { } } - Destination dest = _context.namingService().lookup(host); + // Use existing I2PSession for lookups. + // This is much more efficient than using the naming service + Destination dest; + I2PSession sess = _socketManager.getSession(); + if (sess != null && !sess.isClosed()) { + try { + if (host.length() == 60 && host.endsWith(".b32.i2p")) { + byte[] b = Base32.decode(host.substring(0, 52)); + if (b != null) { + Hash h = Hash.create(b); + dest = sess.lookupDest(h, 20*1000); + } else { + dest = null; + } + } else { + dest = sess.lookupDest(host, 20*1000); + } + } catch (I2PSessionException ise) { + dest = null; + } + } else { + dest = _context.namingService().lookup(host); + } if (dest == null) - throw new UnknownHostException("Unknown or non-i2p host"); + throw new UnknownHostException("Unknown or non-i2p host: " + host); // Set the timeouts, using the other existing options in the socket manager // This currently duplicates what SocketTimeout is doing in EepGet, From 586defc802b70d3b88616d026fee169c9c6874c9 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 19 Jun 2015 14:57:59 +0000 Subject: [PATCH 073/258] Tunnels: Increase default max tunnels --- history.txt | 14 ++++++++++++++ .../src/net/i2p/router/RouterThrottleImpl.java | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/history.txt b/history.txt index 47c310559..6081f8b95 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,17 @@ +2015-06-19 zzz + * I2PSocketEepGet: Do hostname lookups in-session for efficiency + * Tunnels: Increase default max tunnels + +2015-06-18 zzz + * I2CP: + - Don't send the first LS request to the client until we have + at least one OB tunnel, so the client waits until we are ready. + - Fixes to prevent multiple pending LS requests + - Move client-side implementation classes to + new package net.i2p.client.impl, leaving only the + factories and interfaces in net.i2p.client + * Update: Add language param to news fetch for translated news (ticket #1425) + 2015-06-17 zzz Prop from i2p.i2p.zzz.multisess: * Router, I2CP, Streaming, i2ptunnel: diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index 66a31acce..aafdea9fd 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -29,7 +29,7 @@ class RouterThrottleImpl implements RouterThrottle { // TODO reduce private static final long JOB_LAG_LIMIT_TUNNEL = 500; private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; - private static final int DEFAULT_MAX_TUNNELS = 5000; + private static final int DEFAULT_MAX_TUNNELS = 10*1000; private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; private static final long DEFAULT_REJECT_STARTUP_TIME = 10*60*1000; private static final String PROP_REJECT_STARTUP_TIME = "router.rejectStartupTime"; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index c10128fe6..fecba78d6 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 = ""; From 1b2d4c75eb832af3d2870963efa5ff400b4e96ab Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 19 Jun 2015 15:55:07 +0000 Subject: [PATCH 074/258] I2CP: Fix simple session lookups, broken in prop --- .../net/i2p/client/impl/I2PSessionImpl.java | 6 +++++- history.txt | 1 + .../src/net/i2p/router/RouterVersion.java | 2 +- .../router/client/ClientConnectionRunner.java | 14 +++++++------- .../client/ClientMessageEventListener.java | 19 +++++++++++++++---- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java index 0be40f87f..a0dbdcf55 100644 --- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -42,9 +42,11 @@ import net.i2p.data.LeaseSet; import net.i2p.data.PrivateKey; import net.i2p.data.SigningPrivateKey; import net.i2p.data.i2cp.DestLookupMessage; +import net.i2p.data.i2cp.DestReplyMessage; import net.i2p.data.i2cp.GetBandwidthLimitsMessage; import net.i2p.data.i2cp.GetDateMessage; import net.i2p.data.i2cp.HostLookupMessage; +import net.i2p.data.i2cp.HostReplyMessage; import net.i2p.data.i2cp.I2CPMessage; import net.i2p.data.i2cp.I2CPMessageReader; import net.i2p.data.i2cp.MessagePayloadMessage; @@ -900,7 +902,9 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 SessionId id = message.sessionId(); SessionId currId = _sessionId; if (id == null || id.equals(currId) || - (currId == null && id != null && type == SessionStatusMessage.MESSAGE_TYPE)) { + (currId == null && id != null && type == SessionStatusMessage.MESSAGE_TYPE) || + ((id == null || id.getSessionId() == 65535) && + (type == HostReplyMessage.MESSAGE_TYPE || type == DestReplyMessage.MESSAGE_TYPE))) { // it's for us I2CPMessageHandler handler = _handlerMap.getHandler(type); if (handler != null) { diff --git a/history.txt b/history.txt index 6081f8b95..1a2bda8de 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,5 @@ 2015-06-19 zzz + * I2CP: Fix simple session lookups, broken in prop * I2PSocketEepGet: Do hostname lookups in-session for efficiency * Tunnels: Increase default max tunnels diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fecba78d6..a6204817e 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java index f804c3674..d94bb897b 100644 --- a/router/java/src/net/i2p/router/client/ClientConnectionRunner.java +++ b/router/java/src/net/i2p/router/client/ClientConnectionRunner.java @@ -303,15 +303,15 @@ class ClientConnectionRunner { /** * Equivalent to getConfig().getDestination().calculateHash(); * will be null before session is established - * Not subsession aware. Returns random hash from the sessions. + * Not subsession aware. Returns primary session hash. * Don't use if you can help it. * * @return primary hash or null if not yet set */ public Hash getDestHash() { - for (Hash h : _sessions.keySet()) { - return h; - } + SessionConfig cfg = getPrimaryConfig(); + if (cfg != null) + return cfg.getDestination().calculateHash(); return null; } @@ -890,17 +890,17 @@ class ClientConnectionRunner { SessionParams sp = _sessions.get(h); if (sp == null) { if (_log.shouldLog(Log.WARN)) - _log.warn("cancelling rerequest, session went away"); + _log.warn("cancelling rerequest, session went away: " + h); return; } synchronized(ClientConnectionRunner.this) { if (sp.rerequestTimer != Rerequest.this) { if (_log.shouldLog(Log.WARN)) - _log.warn("cancelling rerequest, newer request came in"); + _log.warn("cancelling rerequest, newer request came in: " + h); return; } } - requestLeaseSet(_ls.getDestination().calculateHash(), _ls, _expirationTime, _onCreate, _onFailed); + requestLeaseSet(h, _ls, _expirationTime, _onCreate, _onFailed); } } diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java index f0b273c4a..8db9da336 100644 --- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java +++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java @@ -540,11 +540,22 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi * @since 0.9.11 */ protected void handleHostLookup(HostLookupMessage message) { - Hash h = _runner.getDestHash(message.getSessionId()); - if (h == null) - return; // ok? + SessionId sid = message.getSessionId(); + Hash h; + if (sid != null) { + h = _runner.getDestHash(sid); + } else { + // fixup if necessary + if (message.getReqID() >= 0) + sid = new SessionId(65535); + h = null; + } + if (h == null) { + h = _runner.getDestHash(); + // h may still be null, an LS lookup for b32 will go out expl. tunnels + } _context.jobQueue().addJob(new LookupDestJob(_context, _runner, message.getReqID(), - message.getTimeout(), message.getSessionId(), + message.getTimeout(), sid, message.getHash(), message.getHostname(), h)); } From c6896c4418f0860798c07c1a857dc7c183603b96 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sat, 20 Jun 2015 10:03:47 +0000 Subject: [PATCH 075/258] I2PSnark: Auto-start now only starts torrents which were running at shutdown (#766) --- .../src/org/klomp/snark/SnarkManager.java | 25 +++++++++++++------ history.txt | 3 +++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 84949d794..cb6fa9fe7 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -89,6 +89,7 @@ public class SnarkManager implements CompleteListener { public static final String PROP_UPBW_MAX = "i2psnark.upbw.max"; public static final String PROP_DIR = "i2psnark.dir"; private static final String PROP_META_PREFIX = "i2psnark.zmeta."; + private static final String PROP_META_RUNNING = "running"; private static final String PROP_META_STAMP = "stamp"; private static final String PROP_META_BASE = "base"; private static final String PROP_META_BITFIELD = "bitfield"; @@ -1270,7 +1271,10 @@ public class SnarkManager implements CompleteListener { return; } // ok, snark created, now lets start it up or configure it further - if (!dontAutoStart && shouldAutoStart()) { + Properties config = getConfig(torrent); + boolean running = Boolean.parseBoolean(config.getProperty(PROP_META_RUNNING)); + // Were we running last time? + if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); addMessage(_("Torrent added and started: \"{0}\"", torrent.getBaseName())); } else { @@ -1431,7 +1435,7 @@ public class SnarkManager implements CompleteListener { return false; } // so addTorrent won't recheck - saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0); // no file priorities + saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, snark.isStopped()); // no file priorities try { locked_writeMetaInfo(metainfo, filename, areFilesPublic()); // hold the lock for a long time @@ -1626,7 +1630,7 @@ public class SnarkManager implements CompleteListener { return; saveTorrentStatus(meta, storage.getBitField(), storage.getFilePriorities(), storage.getBase(), storage.getPreserveFileNames(), - snark.getUploaded()); + snark.getUploaded(), snark.isStopped()); } /** @@ -1641,14 +1645,14 @@ public class SnarkManager implements CompleteListener { * @param base may be null */ private void saveTorrentStatus(MetaInfo metainfo, BitField bitfield, int[] priorities, - File base, boolean preserveNames, long uploaded) { + File base, boolean preserveNames, long uploaded, boolean stopped) { synchronized (_configLock) { - locked_saveTorrentStatus(metainfo, bitfield, priorities, base, preserveNames, uploaded); + locked_saveTorrentStatus(metainfo, bitfield, priorities, base, preserveNames, uploaded, stopped); } } private void locked_saveTorrentStatus(MetaInfo metainfo, BitField bitfield, int[] priorities, - File base, boolean preserveNames, long uploaded) { + File base, boolean preserveNames, long uploaded, boolean stopped) { byte[] ih = metainfo.getInfoHash(); String bfs; if (bitfield.complete()) { @@ -1657,11 +1661,13 @@ public class SnarkManager implements CompleteListener { byte[] bf = bitfield.getFieldBytes(); bfs = Base64.encode(bf); } + boolean running = !stopped; Properties config = getConfig(ih); config.setProperty(PROP_META_STAMP, Long.toString(System.currentTimeMillis())); config.setProperty(PROP_META_BITFIELD, bfs); config.setProperty(PROP_META_PRESERVE_NAMES, Boolean.toString(preserveNames)); config.setProperty(PROP_META_UPLOADED, Long.toString(uploaded)); + config.setProperty(PROP_META_RUNNING, Boolean.toString(running)); if (base != null) config.setProperty(PROP_META_BASE, base.getAbsolutePath()); @@ -1989,7 +1995,8 @@ public class SnarkManager implements CompleteListener { Storage storage = snark.getStorage(); if (meta != null && storage != null) saveTorrentStatus(meta, storage.getBitField(), storage.getFilePriorities(), - storage.getBase(), storage.getPreserveFileNames(), snark.getUploaded()); + storage.getBase(), storage.getPreserveFileNames(), snark.getUploaded(), + snark.isStopped()); } /** @@ -2012,7 +2019,8 @@ public class SnarkManager implements CompleteListener { return null; } saveTorrentStatus(meta, storage.getBitField(), null, - storage.getBase(), storage.getPreserveFileNames(), 0); + storage.getBase(), storage.getPreserveFileNames(), 0, + snark.isStopped()); // temp for addMessage() in case canonical throws String name = storage.getBaseName(); try { @@ -2350,6 +2358,7 @@ public class SnarkManager implements CompleteListener { if (count == 0) addMessage(_("Stopping all torrents and closing the I2P tunnel.")); count++; + saveTorrentStatus(snark); if (finalShutdown) snark.stopTorrent(true); else diff --git a/history.txt b/history.txt index 1a2bda8de..b97b2a378 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-06-20 dg + * I2PSnark: Auto-start now only starts torrents which were running at shutdown (#766) + 2015-06-19 zzz * I2CP: Fix simple session lookups, broken in prop * I2PSocketEepGet: Do hostname lookups in-session for efficiency From 699d550992d33e1eb2a1574f95a6b68a0b40c835 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sat, 20 Jun 2015 10:06:54 +0000 Subject: [PATCH 076/258] NetDB: Don't say we stored, and don't flood, if we're shutting down --- history.txt | 2 ++ .../kademlia/HandleFloodfillDatabaseStoreMessageJob.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/history.txt b/history.txt index b97b2a378..4e545bbbc 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,6 @@ 2015-06-20 dg * I2PSnark: Auto-start now only starts torrents which were running at shutdown (#766) + * NetDB: Don't say we stored, and don't flood, if we're shutting down 2015-06-19 zzz * I2CP: Fix simple session lookups, broken in prop @@ -37,6 +38,7 @@ Prop from i2p.i2p.zzz.multisess: - Improve routing of DatabaseStoreMessage acks - Send our own RI unsolicited in reply if we aren't floodfill - Don't ack or flood a store of an unknown type + - Don't say we stored, and don't flood if we're shutting down * PeerTestJob: Don't generate zero reply token * Timestamper: Reduce NTP timeouts to shorten startup time when NTP is blocked diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index 322ad4bbb..29e4c789d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -216,6 +216,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { // flood it if (invalidMessage == null && getContext().netDb().floodfillEnabled() && + !getContext().router().gracefulShutdownInProgress() && _message.getReplyToken() > 0) { if (wasNew) { // DOS prevention @@ -251,7 +252,7 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { TunnelId replyTunnel = _message.getReplyTunnel(); // A store of our own RI, only if we are not FF DatabaseStoreMessage msg2; - if (getContext().netDb().floodfillEnabled() || + if ((getContext().netDb().floodfillEnabled() && !getContext().router().gracefulShutdownInProgress()) || storedKey.equals(getContext().routerHash())) { // don't send our RI if the store was our RI (from PeerTestJob) msg2 = null; From feff6c003b03d00924d4d50be1766364837bf6d6 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sat, 20 Jun 2015 10:30:14 +0000 Subject: [PATCH 077/258] bump --- 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 a6204817e..f2522cd4e 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 = 8; + public final static long BUILD = 9; /** for example "-test" */ public final static String EXTRA = ""; From 428d89a3070f5f33952add269ad137071866cfd4 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 21 Jun 2015 15:41:33 +0000 Subject: [PATCH 078/258] Update: Add config to disable translated news Rewrite addLang() for efficiency --- .../net/i2p/router/update/NewsFetcher.java | 34 +++++++++++-------- .../src/net/i2p/router/web/NewsHelper.java | 5 +++ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index 76a77fe7e..b00043597 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -95,13 +95,8 @@ class NewsFetcher extends UpdateRunner { } for (URI uri : _urls) { - String origURL = uri.toString(); - String newsURL = addLang(origURL); - try { - _currentURI = new URI(newsURL); - } catch (URISyntaxException use) { - _currentURI = uri; - } + _currentURI = addLang(uri); + String newsURL = _currentURI.toString(); if (_tempFile.exists()) _tempFile.delete(); @@ -137,18 +132,25 @@ class NewsFetcher extends UpdateRunner { } /** - * Add a query param for the local language to get translated news + * Add a query param for the local language to get translated news. + * Unchanged if disabled by property, if language is english, + * or if URI already contains a language paramter + * * @since 0.9.21 */ - private String addLang(String url) { - if (url.contains("?lang=") || url.contains("&lang=")) - return url; + private URI addLang(URI uri) { + if (!_context.getBooleanPropertyDefaultTrue(NewsHelper.PROP_TRANSLATE)) + return uri; String lang = Translate.getLanguage(_context); if (lang.equals("en")) - return url; + return uri; + String query = uri.getRawQuery(); + if (query != null && (query.startsWith("lang=") || query.contains("&lang="))) + return uri; + String url = uri.toString(); StringBuilder buf = new StringBuilder(); buf.append(url); - if (url.contains("?")) + if (query != null) buf.append("&lang="); else buf.append("?lang="); @@ -156,7 +158,11 @@ class NewsFetcher extends UpdateRunner { String co = Translate.getCountry(_context); if (co.length() > 0) buf.append('_').append(co); - return buf.toString(); + try { + return new URI(buf.toString()); + } catch (URISyntaxException use) { + return uri; + } } // Fake XML parsing diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java index f7a30c6dd..be3b5685b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java @@ -28,6 +28,11 @@ public class NewsHelper extends ContentHelper { public static final String PROP_LAST_CHECKED = "routerconsole.newsLastChecked"; /** @since 0.9.4 */ public static final String PROP_LAST_UPDATED = "routerconsole.newsLastUpdated"; + /** + * Default true + * @since 0.9.21 + */ + public static final String PROP_TRANSLATE = "routerconsole.newsTranslate"; public static final String NEWS_FILE = "docs/news.xml"; /** From 0b4d4ddcbc509f2ee6ed8c21b06b2a307da59139 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 21 Jun 2015 15:42:30 +0000 Subject: [PATCH 079/258] update hardcoded tags --- apps/routerconsole/java/strings/Strings.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/apps/routerconsole/java/strings/Strings.java b/apps/routerconsole/java/strings/Strings.java index 5a45fd770..462938017 100644 --- a/apps/routerconsole/java/strings/Strings.java +++ b/apps/routerconsole/java/strings/Strings.java @@ -34,6 +34,7 @@ class Dummy { // note that if the wording changes in i2ptunnel.config, we have to // keep the old string here as well for existing installs _("shared clients"); + _("shared clients (DSA)"); _("IRC proxy"); _("eepsite"); _("I2P webserver"); @@ -79,21 +80,5 @@ class Dummy { _("port"); // capabilities _("caps"); - // introducer host - _("ihost0"); - _("ihost1"); - _("ihost2"); - // introducer port - _("iport0"); - _("iport1"); - _("iport2"); - // introducer key - _("ikey0"); - _("ikey1"); - _("ikey2"); - // introducer tag - _("itag0"); - _("itag1"); - _("itag2"); } } From 2fbbfa388e518d8419ceb228fe31fc87830a2674 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 22 Jun 2015 20:11:29 +0000 Subject: [PATCH 080/258] NetDB: Partially revert last NetDB change: flood because we don't want to create a hole in the DHT before publisher resends to somebody else. --- history.txt | 4 ++++ .../kademlia/HandleFloodfillDatabaseStoreMessageJob.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/history.txt b/history.txt index 4e545bbbc..aadfe30a8 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-06-22 dg + * NetDB: Partially revert last NetDB change: flood because we don't want to create a hole in the DHT + before publisher resends to somebody else. + 2015-06-20 dg * I2PSnark: Auto-start now only starts torrents which were running at shutdown (#766) * NetDB: Don't say we stored, and don't flood, if we're shutting down diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java index 29e4c789d..56fd1f0eb 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseStoreMessageJob.java @@ -216,7 +216,6 @@ public class HandleFloodfillDatabaseStoreMessageJob extends JobImpl { // flood it if (invalidMessage == null && getContext().netDb().floodfillEnabled() && - !getContext().router().gracefulShutdownInProgress() && _message.getReplyToken() > 0) { if (wasNew) { // DOS prevention From e3f64f6edf6fbba339995fca7e07ec0466783b5f Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 23 Jun 2015 20:26:02 +0000 Subject: [PATCH 081/258] Console: Fix NPE on /configtunnels --- router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index 196b3b36b..a1dae253c 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -415,8 +415,10 @@ public class TunnelPool { void setSettings(TunnelPoolSettings settings) { if (settings != null && _settings != null) { - settings.getAliases().addAll(_settings.getAliases()); - settings.setAliasOf(_settings.getAliasOf()); + if (!(settings.isExploratory() || _settings.isExploratory())) { + settings.getAliases().addAll(_settings.getAliases()); + settings.setAliasOf(_settings.getAliasOf()); + } } _settings = settings; if (_settings != null) { From af394e13ade46f1436eeeb4926b5a5b238140e83 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 23 Jun 2015 20:33:38 +0000 Subject: [PATCH 082/258] GeoIP: Add countries and flags for Asia/Pacific, Bonaire, St. Barts, St. Maarten, South Sudan AP: black flag copied from A1 BL: official flag is France, copied from FR BQ, SX, SS: PNG files generated from public domain SVG files from Wikipedia Shortened some other country names (remove "Republic of", etc.) Change spelling to Macau, Vietnam --- build.xml | 5 +++-- installer/resources/countries.txt | 29 +++++++++++++++---------- installer/resources/icons/flags/ap.png | Bin 0 -> 143 bytes installer/resources/icons/flags/bl.png | Bin 0 -> 545 bytes installer/resources/icons/flags/bq.png | Bin 0 -> 435 bytes installer/resources/icons/flags/ss.png | Bin 0 -> 333 bytes installer/resources/icons/flags/sx.png | Bin 0 -> 377 bytes 7 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 installer/resources/icons/flags/ap.png create mode 100644 installer/resources/icons/flags/bl.png create mode 100644 installer/resources/icons/flags/bq.png create mode 100644 installer/resources/icons/flags/ss.png create mode 100644 installer/resources/icons/flags/sx.png diff --git a/build.xml b/build.xml index c6dba9e08..a3c344f3f 100644 --- a/build.xml +++ b/build.xml @@ -1261,8 +1261,9 @@ - - + + diff --git a/installer/resources/countries.txt b/installer/resources/countries.txt index 5707af567..9702197ef 100644 --- a/installer/resources/countries.txt +++ b/installer/resources/countries.txt @@ -16,6 +16,7 @@ AL,Albania AM,Armenia AN,Netherlands Antilles AO,Angola +AP,Asia/Pacific Region AQ,Antarctica AR,Argentina AS,American Samoa @@ -33,9 +34,11 @@ BG,Bulgaria BH,Bahrain BI,Burundi BJ,Benin +BL,Saint Barthélemy BM,Bermuda BN,Brunei Darussalam BO,Bolivia +BQ,Bonaire BR,Brazil BS,Bahamas BT,Bhutan @@ -45,7 +48,7 @@ BY,Belarus BZ,Belize CA,Canada CC,Cocos (Keeling) Islands -CD,The Democratic Republic of the Congo +CD,Congo CF,Central African Republic CG,Congo CH,Switzerland @@ -80,7 +83,7 @@ EU,European Union FI,Finland FJ,Fiji FK,Falkland Islands (Malvinas) -FM,Federated States of Micronesia +FM,Micronesia FO,Faroe Islands FR,France GA,Gabon @@ -114,7 +117,7 @@ IM,Isle of Man IN,India IO,British Indian Ocean Territory IQ,Iraq -IR,Islamic Republic of Iran +IR,Iran IS,Iceland IT,Italy JE,Jersey @@ -127,7 +130,7 @@ KH,Cambodia KI,Kiribati KM,Comoros KN,Saint Kitts and Nevis -KP,The Democratic People's Republic of Korea +KP,North Korea KR,Republic of Korea KW,Kuwait KY,Cayman Islands @@ -142,19 +145,19 @@ LS,Lesotho LT,Lithuania LU,Luxembourg LV,Latvia -LY,Libyan Arab Jamahiriya +LY,Libya MA,Morocco MC,Monaco -MD,Republic of Moldova +MD,Moldova ME,Montenegro MF,Saint Martin MG,Madagascar MH,Marshall Islands -MK,The Former Yugoslav Republic of Macedonia +MK,Macedonia ML,Mali MM,Myanmar MN,Mongolia -MO,Macao +MO,Macau MP,Northern Mariana Islands MQ,Martinique MR,Mauritania @@ -214,9 +217,11 @@ SM,San Marino SN,Senegal SO,Somalia SR,Suriname +SS,South Sudan ST,Sao Tome and Principe SV,El Salvador -SY,Syrian Arab Republic +SX,Sint Maarten +SY,Syria SZ,Swaziland TC,Turks and Caicos Islands TD,Chad @@ -233,19 +238,19 @@ TR,Turkey TT,Trinidad and Tobago TV,Tuvalu TW,Taiwan -TZ,United Republic of Tanzania +TZ,Tanzania UA,Ukraine UG,Uganda UM,United States Minor Outlying Islands US,United States UY,Uruguay UZ,Uzbekistan -VA,Holy See (Vatican City State) +VA,Vatican VC,Saint Vincent and the Grenadines VE,Venezuela VG,Virgin Islands VI,Virgin Islands -VN,Viet Nam +VN,Vietnam VU,Vanuatu WF,Wallis and Futuna WS,Samoa diff --git a/installer/resources/icons/flags/ap.png b/installer/resources/icons/flags/ap.png new file mode 100644 index 0000000000000000000000000000000000000000..adde45fd8462fed5c1eb33684f106c8400604920 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~o!2~3KHq6QcQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?i-B5%L70(Y)*K0-AbW|YuPgg)E_MNNqfHh9MnEBcPZ!4!jq}L~ f60D0Ev>6zfq!}0^Q!S1Hr5HS2{an^LB{Ts5nvWl? literal 0 HcmV?d00001 diff --git a/installer/resources/icons/flags/bl.png b/installer/resources/icons/flags/bl.png new file mode 100644 index 0000000000000000000000000000000000000000..8332c4ec23c853944c29b02d7b32a88033f48a71 GIT binary patch literal 545 zcmV++0^a?JP)lgG%);U`26kn-@hOg zU%!6+4+cOs(0HIde9xZz`}Onxub&LUB0x(30+2WcIRJn#2ut|?gWYu1Cf+!-K%B8# zdf?1WA}#uZ8oj7u>$I1i0Al&`=O0k%-@icgAIJnM0xA6maSq6BK-ECw|NZ*S`0Lj% z1_pot6puj;05Ax`F!=umqj7^frO?t|3^&I1kxUq9yECc+jQpY84SWH_0#pxl$?v~F z@*hy-KN0|X07U)z`4{NpU%#2aHUI<=%a31wK(7Du52Oc(|3O^?R1IN+RRjI-n*kVB z3=9AP#PZ|EACPLGJ%9cJNh|>9B%spYzZw7h1%?tp0I_@ndg9MNE>313@6R75NcceF zkr51-#U+7;F#`Sf7i0rK0I_`g_NQ&ZbzW@8ncTBg+TKvivQ0|CnWPYMaHi;KxoaRACfZoviOy(c0#~9KIrAkx*3? zyWO52+&{jiXWUCPk@-|=Dz023Ll^PH4ce%SM0*F-X94_vKf11?WnUPc-oeqk{4ES1 z3YHeiEnu_RD5!Nq!^$1;YUM(h1JFAWzRaza;|1Q!0HfFTTSlem;z;v)_<>>xkZg#MnLgMhM+E2r$TE~v`CZm z_O&$(=6Tf(HGO8nf?HO&-oC}bYTGzT@JNcZ`U$qb-?@sPAGj%ZPJHLuz6C~1OBR)B zE#L8#yJVe*R7QhO9rN~k$A5%oGd`8Q+YxriNkr<&4x67j>)IE(32{m=+@E{tj%>m2 zpy2Z4{UZDOyq+KS-qanriR0~G_bT=4K6Nn+a$MD4wBJ7ATgTS^=NR8VuOs1GytHc; zeHXh?p0H(7Uh>b!Zxnv#hAJ`m9m!F5*t78}7n{SL@_*ZyQ!=w`7tdU8E1Z9?dDe2P aOZJbW!}TNG3g!Ym&fw|l=d#Wzp$P!JrG%gW literal 0 HcmV?d00001 diff --git a/installer/resources/icons/flags/sx.png b/installer/resources/icons/flags/sx.png new file mode 100644 index 0000000000000000000000000000000000000000..a2edf588e39cf020e10368f7459f45286a8f752c GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~o!3HGD9`RZNDYhhUcNd2LAh=-f^2tCE&H|6f zVxW%eAk65bF}s3+fl<=a#W6(VeDa^VPgf469~2b(U;jTXS%KN$-+vHze?Q-@@awZb zrO*3hR?FnGlcd1_jT;Nvg>NQL}cXu2~S#I z`d;OkGix2s{C9hkPIPTbN_g~e=Z_O7eLubbES}WDlkoHJONQndD>R#zwwoS)x%<83 zzkiX(4k$$|_+R|hL+% zGjDJ5{%yb7hF>u5$M^roSI^|x|Gy?JA@$EU{l)Qrt}I$Be@0S5LZXw8nT?ID?fLrs zd#>@%`2FQ<`+GK(FVdQ&MBb@09uE!1^@s6 literal 0 HcmV?d00001 From 975149d0499617e64fc0910532ffcdc1f4b8bf5d Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 23 Jun 2015 20:50:22 +0000 Subject: [PATCH 083/258] Router: Increase default outbound bandwidth to 60 KBps; raise class L/M boundary to match so defaulted routers are still L --- router/java/src/net/i2p/router/Router.java | 2 +- .../src/net/i2p/router/transport/FIFOBandwidthRefiller.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index c2994666e..bb7e5068d 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -911,7 +911,7 @@ public class Router implements RouterClock.ClockShiftListener { ri.addCapability(force.charAt(0)); } else if (bwLim < 12) { ri.addCapability(CAPABILITY_BW12); - } else if (bwLim <= 32) { + } else if (bwLim <= 48) { ri.addCapability(CAPABILITY_BW32); } else if (bwLim <= 64) { ri.addCapability(CAPABILITY_BW64); diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index 190c3b641..1358686cd 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -56,9 +56,9 @@ public class FIFOBandwidthRefiller implements Runnable { * of moving the default bandwidth class from L to M, or maybe * adjusting bandwidth class boundaries. */ - public static final int DEFAULT_OUTBOUND_BANDWIDTH = 40; + public static final int DEFAULT_OUTBOUND_BANDWIDTH = 60; public static final int DEFAULT_INBOUND_BURST_BANDWIDTH = 96; - public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 40; + public static final int DEFAULT_OUTBOUND_BURST_BANDWIDTH = 60; public static final int DEFAULT_BURST_SECONDS = 60; From 355b2a15283538e2a9b67ac9c898156d23a81628 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 23 Jun 2015 21:16:34 +0000 Subject: [PATCH 084/258] I2CP: Don't try to decrypt an LS before it's encrypted (ticket #1608) log tweaks --- core/java/src/net/i2p/data/LeaseSet.java | 14 +++++++++----- history.txt | 8 ++++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../net/i2p/router/client/RequestLeaseSetJob.java | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java index b844c7e3a..0fd4ed845 100644 --- a/core/java/src/net/i2p/data/LeaseSet.java +++ b/core/java/src/net/i2p/data/LeaseSet.java @@ -418,10 +418,10 @@ public class LeaseSet extends DatabaseEntry { encryp(key); } catch (DataFormatException dfe) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); - log.error("Error encrypting lease: " + _destination.calculateHash()); + log.error("Error encrypting lease: " + _destination.calculateHash(), dfe); } catch (IOException ioe) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); - log.error("Error encrypting lease: " + _destination.calculateHash()); + log.error("Error encrypting lease: " + _destination.calculateHash(), ioe); } } @@ -520,7 +520,11 @@ public class LeaseSet extends DatabaseEntry { private synchronized boolean isEncrypted() { if (_decrypted) return true; - if (_checked || _destination == null) + // If the encryption key is not set yet, it can't have been encrypted yet. + // Router-side I2CP sets the destination (but not the encryption key) + // on an unsigned LS which is pending signature (and possibly encryption) + // by the client, and we don't want to attempt 'decryption' on it. + if (_checked || _encryptionKey == null || _destination == null) return false; SessionKey key = I2PAppContext.getGlobalContext().keyRing().get(_destination.calculateHash()); if (key != null) { @@ -529,10 +533,10 @@ public class LeaseSet extends DatabaseEntry { _decrypted = true; } catch (DataFormatException dfe) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); - log.error("Error decrypting lease: " + _destination.calculateHash() + dfe); + log.error("Error decrypting lease: " + _destination.calculateHash(), dfe); } catch (IOException ioe) { Log log = I2PAppContext.getGlobalContext().logManager().getLog(LeaseSet.class); - log.error("Error decrypting lease: " + _destination.calculateHash() + ioe); + log.error("Error decrypting lease: " + _destination.calculateHash(), ioe); } } _checked = true; diff --git a/history.txt b/history.txt index aadfe30a8..5ecc00a62 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,11 @@ +2015-06-23 zzz + * Console: Fix NPE on /configtunnels + * GeoIP: Add countries and flags for Asia/Pacific, Bonaire, St. Barts, + St. Maarten, South Sudan + * I2CP: Don't try to decrypt an LS before it's encrypted (ticket #1608) + * Router: Increase default outbound bandwidth to 60 KBps; + raise class L/M boundary to match so defaulted routers are still L + 2015-06-22 dg * NetDB: Partially revert last NetDB change: flood because we don't want to create a hole in the DHT before publisher resends to somebody else. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f2522cd4e..7ca1a3ec2 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 = 9; + public final static long BUILD = 10; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java index f5ec343a0..81a3b6354 100644 --- a/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java +++ b/router/java/src/net/i2p/router/client/RequestLeaseSetJob.java @@ -64,7 +64,7 @@ class RequestLeaseSetJob extends JobImpl { // _log.debug("Adding fudge " + fudge); endTime += fudge; - SessionId id = _runner.getSessionId(_requestState.getRequested().getDestination().calculateHash()); + SessionId id = _runner.getSessionId(requested.getDestination().calculateHash()); if (id == null) return; I2CPMessage msg; From 25268e7cb253150f380098026ddc0122e0585c6d Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 24 Jun 2015 19:11:05 +0000 Subject: [PATCH 085/258] Transport: Add failsafe to prevent complete SSU stall waiting for bandwidth limiter, root cause unknown --- history.txt | 4 +++ .../src/net/i2p/router/RouterVersion.java | 2 +- .../transport/FIFOBandwidthLimiter.java | 27 ++++++++++++++----- .../i2p/router/transport/udp/UDPReceiver.java | 11 +++++++- .../i2p/router/transport/udp/UDPSender.java | 11 +++++++- .../router/transport/udp/UDPTransport.java | 3 +-- 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/history.txt b/history.txt index 5ecc00a62..4547341e1 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-06-24 zzz + * Transport: Add failsafe to prevent complete SSU stall waiting + for bandwidth limiter + 2015-06-23 zzz * Console: Fix NPE on /configtunnels * GeoIP: Add countries and flags for Asia/Pacific, Bonaire, St. Barts, diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7ca1a3ec2..5a58b19bc 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 10; + public final static long BUILD = 11; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index b650e5c03..2f891ec64 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -717,8 +717,8 @@ public class FIFOBandwidthLimiter { _availableInbound.addAndGet(0 - requested); _totalAllocatedInboundBytes.addAndGet(requested); } - if (_log.shouldLog(Log.INFO)) - _log.info("IB shortcut for " + requested + "B? " + rv); + //if (_log.shouldLog(Log.INFO)) + // _log.info("IB shortcut for " + requested + "B? " + rv); return rv; } @@ -739,8 +739,8 @@ public class FIFOBandwidthLimiter { _availableOutbound.addAndGet(0 - requested); _totalAllocatedOutboundBytes.addAndGet(requested); } - if (_log.shouldLog(Log.INFO)) - _log.info("OB shortcut for " + requested + "B? " + rv); + //if (_log.shouldLog(Log.INFO)) + // _log.info("OB shortcut for " + requested + "B? " + rv); return rv; } @@ -809,7 +809,12 @@ public class FIFOBandwidthLimiter { public int getTotalRequested() { return _total; } public int getPendingRequested() { return _total - _allocated; } public boolean getAborted() { return _aborted; } - public void abort() { _aborted = true; } + public void abort() { + _aborted = true; + // so isComplete() will return true + _allocated = _total; + notifyAllocation(); + } public CompleteListener getCompleteListener() { return _lsnr; } public void setCompleteListener(CompleteListener lsnr) { @@ -829,6 +834,10 @@ public class FIFOBandwidthLimiter { private boolean isComplete() { return _allocated >= _total; } + /** + * May return without allocating. + * Check getPendingRequested() > 0 in a loop. + */ public void waitForNextAllocation() { _waited = true; _allocationsSinceWait = 0; @@ -838,7 +847,7 @@ public class FIFOBandwidthLimiter { if (isComplete()) complete = true; else - wait(); + wait(100); } } catch (InterruptedException ie) {} if (complete && _lsnr != null) @@ -899,7 +908,11 @@ public class FIFOBandwidthLimiter { public int getTotalRequested(); /** how many bytes were requested and haven't yet been allocated? */ public int getPendingRequested(); - /** block until we are allocated some more bytes */ + /** + * Block until we are allocated some more bytes. + * May return without allocating. + * Check getPendingRequested() > 0 in a loop. + */ public void waitForNextAllocation(); /** we no longer want the data requested (the connection closed) */ public void abort(); 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 bc16de99c..cae3030f2 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPReceiver.java @@ -52,6 +52,7 @@ class UDPReceiver { //_context.statManager().createRateStat("udp.droppedInbound", "How many packet are queued up but not yet received when we drop", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.receiveHolePunch", "How often we receive a NAT hole punch", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.ignorePacketFromDroplist", "Packet lifetime for those dropped on the drop list", "udp", UDPTransport.RATES); + _context.statManager().createRateStat("udp.receiveFailsafe", "limiter stuck?", "udp", new long[] { 24*60*60*1000L }); } /** @@ -265,8 +266,16 @@ class UDPReceiver { //_context.bandwidthLimiter().requestInbound(req, size, "UDP receiver"); FIFOBandwidthLimiter.Request req = _context.bandwidthLimiter().requestInbound(size, "UDP receiver"); - while (req.getPendingRequested() > 0) + // failsafe, don't wait forever + int waitCount = 0; + while (req.getPendingRequested() > 0 && waitCount++ < 5) { req.waitForNextAllocation(); + } + if (waitCount >= 5) { + // tell FBL we didn't receive it, but receive it anyway + req.abort(); + _context.statManager().addRateData("udp.receiveFailsafe", 1); + } receive(packet); //_context.statManager().addRateData("udp.receivePacketSize", size); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java index 9c1fdf2ab..7091b4ced 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java @@ -54,6 +54,7 @@ class UDPSender { //_context.statManager().createRateStat("udp.socketSendTime", "How long the actual socket.send took", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendBWThrottleTime", "How long the send is blocked by the bandwidth throttle", "udp", UDPTransport.RATES); _context.statManager().createRateStat("udp.sendACKTime", "How long an ACK packet is blocked for (duration == lifetime)", "udp", UDPTransport.RATES); + _context.statManager().createRateStat("udp.sendFailsafe", "limiter stuck?", "udp", new long[] { 24*60*60*1000L }); // used in RouterWatchdog _context.statManager().createRequiredRateStat("udp.sendException", "Send fails (Windows exception?)", "udp", new long[] { 60*1000, 10*60*1000 }); @@ -230,8 +231,16 @@ class UDPSender { //_context.bandwidthLimiter().requestOutbound(req, size, "UDP sender"); FIFOBandwidthLimiter.Request req = _context.bandwidthLimiter().requestOutbound(size, 0, "UDP sender"); - while (req.getPendingRequested() > 0) + // failsafe, don't wait forever + int waitCount = 0; + while (req.getPendingRequested() > 0 && waitCount++ < 5) { req.waitForNextAllocation(); + } + if (waitCount >= 5) { + // tell FBL we didn't send it, but send it anyway + req.abort(); + _context.statManager().addRateData("udp.sendFailsafe", 1); + } } long afterBW = _context.clock().now(); 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 7429314f6..c616e5a82 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -2261,7 +2261,6 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority void failed(OutboundMessageState msg, boolean allowPeerFailure) { if (msg == null) return; - int consecutive = 0; OutNetMessage m = msg.getMessage(); if ( allowPeerFailure && (msg.getPeer() != null) && ( (msg.getMaxSends() >= OutboundMessageFragments.MAX_VOLLEYS) || @@ -2273,7 +2272,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority // + " lastReceived: " + recvDelay // + " lastSentFully: " + sendDelay // + " expired? " + msg.isExpired()); - consecutive = msg.getPeer().incrementConsecutiveFailedSends(); + int consecutive = msg.getPeer().incrementConsecutiveFailedSends(); if (_log.shouldLog(Log.INFO)) _log.info("Consecutive failure #" + consecutive + " on " + msg.toString() From dd47389ad199303f5bf300d3361915cdc3e713db Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 25 Jun 2015 17:00:52 +0000 Subject: [PATCH 086/258] Console: Use registered host/port for eepsite link (ticket #1604) Jetty starter: Register host/port when started PortMapper: Add hostname support --- .../java/src/net/i2p/jetty/JettyStart.java | 30 +++++++++++- .../src/net/i2p/router/web/HomeHelper.java | 15 ++++-- .../i2p/router/web/SummaryBarRenderer.java | 7 ++- core/java/src/net/i2p/util/PortMapper.java | 46 +++++++++++++++---- history.txt | 5 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- 6 files changed, 89 insertions(+), 16 deletions(-) diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java index 4eb0d6ed1..73b4b4d78 100644 --- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java +++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java @@ -16,6 +16,7 @@ package net.i2p.jetty; // limitations under the License. // ======================================================================== +import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -25,8 +26,10 @@ import java.util.Properties; import net.i2p.I2PAppContext; import net.i2p.app.*; import static net.i2p.app.ClientAppState.*; +import net.i2p.util.PortMapper; -import java.io.InputStream; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.xml.XmlConfiguration; @@ -45,13 +48,15 @@ public class JettyStart implements ClientApp { private final ClientAppManager _mgr; private final String[] _args; private final List _jettys; + private final I2PAppContext _context; private volatile ClientAppState _state; + private volatile int _port; /** * All args must be XML file names. * Does not support any of the other argument types from org.mortbay.start.Main. * - * @param context unused, may be null + * @param context may be null * @param mgr may be null e.g. for use in plugins */ public JettyStart(I2PAppContext context, ClientAppManager mgr, String[] args) throws Exception { @@ -59,6 +64,7 @@ public class JettyStart implements ClientApp { _mgr = mgr; _args = args; _jettys = new ArrayList(args.length); + _context = context; parseArgs(args); _state = INITIALIZED; } @@ -116,6 +122,22 @@ public class JettyStart implements ClientApp { if (!lc.isRunning()) { try { lc.start(); + if (_context != null && _context.portMapper().getPort(PortMapper.SVC_EEPSITE) <= 0) { + if (lc instanceof Server) { + Server server = (Server) lc; + Connector[] connectors = server.getConnectors(); + if (connectors.length > 0) { + int port = connectors[0].getPort(); + if (port > 0) { + _port = port; + String host = connectors[0].getHost(); + if (host.equals("0.0.0.0") || host.equals("::")) + host = "127.0.0.1"; + _context.portMapper().register(PortMapper.SVC_EEPSITE, host, port); + } + } + } + } } catch (Exception e) { changeState(START_FAILED, e); return; @@ -154,6 +176,10 @@ public class JettyStart implements ClientApp { } } } + if (_context != null && _port > 0 && _context.portMapper().getPort(PortMapper.SVC_EEPSITE) == _port) { + _port = 0; + _context.portMapper().unregister(PortMapper.SVC_EEPSITE); + } changeState(STOPPED); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 114441e5c..223862576 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -167,13 +167,22 @@ public class HomeHelper extends HelperBase { ctx.router().saveConfig(prop, buf.toString()); } - private static String renderApps(Collection apps) { + private String renderApps(Collection apps) { + String website = _("Website"); StringBuilder buf = new StringBuilder(1024); buf.append("

"); for (App app : apps) { + String url; + if (app.name.equals(website) && app.url.equals("http://127.0.0.1:7658/")) { + // fixup eepsite link + url = "http://" + _context.portMapper().getHost(PortMapper.SVC_EEPSITE, "127.0.0.1") + + ':' + _context.portMapper().getPort(PortMapper.SVC_EEPSITE, 7658) + '/'; + } else { + url = app.url; + } buf.append("
" + "
" + - "" + + "" + "" + "
" + "
" + - "").append(app.name).append("" + + "").append(app.name).append("" + "
" + "
" + "
\n"); 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 302316217..344d36bd1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -11,6 +11,7 @@ import java.util.Map; import net.i2p.crypto.SigType; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; +import net.i2p.util.PortMapper; /** * Refactored from summarynoframe.jsp to save ~100KB @@ -146,7 +147,11 @@ public class SummaryBarRenderer { .append(nbsp(_("Torrents"))) .append("\n" + - "") .append(nbsp(_("Website"))) diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java index b3c8e65e7..816020433 100644 --- a/core/java/src/net/i2p/util/PortMapper.java +++ b/core/java/src/net/i2p/util/PortMapper.java @@ -2,6 +2,7 @@ package net.i2p.util; import java.io.IOException; import java.io.Writer; +import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -16,7 +17,7 @@ import net.i2p.I2PAppContext; * @since 0.8.12 */ public class PortMapper { - private final ConcurrentHashMap _dir; + private final ConcurrentHashMap _dir; public static final String SVC_CONSOLE = "console"; public static final String SVC_HTTPS_CONSOLE = "https_console"; @@ -37,7 +38,7 @@ public class PortMapper { * @param context unused for now */ public PortMapper(I2PAppContext context) { - _dir = new ConcurrentHashMap(8); + _dir = new ConcurrentHashMap(8); } /** @@ -46,9 +47,19 @@ public class PortMapper { * @return success, false if already registered */ public boolean register(String service, int port) { - if (port <= 0) + return register(service, "127.0.0.1", port); + } + + /** + * Add the service + * @param port > 0 + * @return success, false if already registered + * @since 0.9.21 + */ + public boolean register(String service, String host, int port) { + if (port <= 0 || port > 65535) return false; - return _dir.putIfAbsent(service, Integer.valueOf(port)) == null; + return _dir.putIfAbsent(service, InetSocketAddress.createUnresolved(host, port)) == null; } /** @@ -73,10 +84,24 @@ public class PortMapper { * @return def if not registered */ public int getPort(String service, int def) { - Integer port = _dir.get(service); - if (port == null) + InetSocketAddress ia = _dir.get(service); + if (ia == null) return def; - return port.intValue(); + return ia.getPort(); + } + + /** + * Get the registered host for a service. + * Will return "127.0.0.1" if the service was registered without a host. + * @param def default + * @return def if not registered + * @since 0.9.21 + */ + public String getHost(String service, String def) { + InetSocketAddress ia = _dir.get(service); + if (ia == null) + return def; + return ia.getHostName(); } /** @@ -85,10 +110,13 @@ public class PortMapper { */ public void renderStatusHTML(Writer out) throws IOException { List services = new ArrayList(_dir.keySet()); - out.write("

Port Mapper

\n" + " \n" + "" + "\n"); } long dat = meta.getCreationDate(); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String systemTimeZone = _context.getProperty("i2p.systemTimeZone"); + if (systemTimeZone != null) + fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone)); if (dat > 0) { - String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(dat)); + String date = fmt.format(new Date(dat)); buf.append("\n"); } String cby = meta.getCreatedBy(); @@ -2783,6 +2788,25 @@ public class I2PSnarkServlet extends BasicServlet { .append(DataHelper.stripHTML(cby)) .append("\n"); } + long[] dates = _manager.getSavedAddedAndCompleted(snark); + if (dates[0] > 0) { + String date = fmt.format(new Date(dates[0])); + buf.append("\n"); + } + if (dates[1] > 0) { + String date = fmt.format(new Date(dates[1])); + buf.append("\n"); + } } if (meta == null || !meta.isPrivate()) { diff --git a/build.xml b/build.xml index 8190e4fa1..7d409ff1f 100644 --- a/build.xml +++ b/build.xml @@ -100,8 +100,11 @@ - + + + + @@ -1763,9 +1766,11 @@ since preppkg puts too much stuff in pkg-temp --> + + From 3d533a406dbe6fd27c41e9f9086661635ce91b51 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 16 Sep 2015 16:42:24 +0000 Subject: [PATCH 156/258] News: - Fix retrieval of entry links from feed - Linkify entry headers --- .../java/src/net/i2p/router/news/NewsManager.java | 5 ++++- .../java/src/net/i2p/router/news/NewsXMLParser.java | 6 +++--- .../java/src/net/i2p/router/news/PersistNews.java | 8 +++++--- .../java/src/net/i2p/router/web/NewsFeedHelper.java | 9 +++++++-- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java index 781449ac9..9f21bf93c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java @@ -269,6 +269,7 @@ public class NewsManager implements RouterApp { return rv; } +/**** public static void main(String[] args) { if (args.length != 0) { System.err.println("Usage: NewsManager"); @@ -281,7 +282,9 @@ public class NewsManager implements RouterApp { System.out.println("Loaded " + entries.size() + " news entries"); for (int i = 0; i < entries.size(); i++) { NewsEntry e = entries.get(i); - System.out.println("\n****** News #" + (i+1) + ": " + e.title + ' ' + new Date(e.updated) + '\n' + e.content); + System.out.println("\n****** News #" + (i+1) + ": " + e.title + ' ' + new Date(e.updated) + + "\nLink: " + e.link + '\n' + e.content); } } +****/ } diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java index 20d8746c7..5f35fa8c6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java @@ -267,9 +267,9 @@ public class NewsXMLParser { } n = entry.getNode("link"); if (n != null) { - e.link = n.getValue(); - if (e.link != null) - e.link = e.link.trim(); + String a = n.getAttributeValue("href"); + if (a.length() > 0) + e.link = a.trim(); } n = entry.getNode("id"); if (n != null) { diff --git a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java index 65e17c6bc..164b04422 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java @@ -155,9 +155,9 @@ class PersistNews { } n = entry.getNode("link"); if (n != null) { - e.link = n.getValue(); - if (e.link != null) - e.link = e.link.trim(); + String a = n.getAttributeValue("href"); + if (a.length() > 0) + e.link = a.trim(); } n = entry.getNode("id"); if (n != null) { @@ -231,6 +231,7 @@ class PersistNews { return PFX + Base64.encode(hash) + SFX; } +/**** public static void main(String[] args) { if (args.length != 1) { System.err.println("Usage: PersistNews file.xml"); @@ -262,4 +263,5 @@ class PersistNews { System.out.println("\n****** News #" + (i+1) + ": " + e.title + '\n' + e.content); } } +****/ } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java index 7a9adae76..ef2e7ea37 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -8,6 +8,7 @@ import java.util.TimeZone; import net.i2p.I2PAppContext; import net.i2p.app.ClientAppManager; +import net.i2p.data.DataHelper; import net.i2p.router.news.NewsEntry; import net.i2p.router.news.NewsManager; @@ -68,8 +69,12 @@ public class NewsFeedHelper extends HelperBase { buf.append(fmt.format(date)) .append(": "); } - buf.append(entry.title) - .append("\n
\n") + if (entry.link != null) + buf.append(""); + buf.append(entry.title); + if (entry.link != null) + buf.append(""); + buf.append("\n
\n") .append(entry.content) .append("\n
\n"); if (i >= start + max) From 0f6176b7bf33b9196197fb01544906f76323b489 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 16 Sep 2015 17:26:03 +0000 Subject: [PATCH 157/258] News: Add author to entry headers --- .../java/src/net/i2p/router/web/NewsFeedHelper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java index ef2e7ea37..1e4198ad0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -74,6 +74,11 @@ public class NewsFeedHelper extends HelperBase { buf.append(entry.title); if (entry.link != null) buf.append(""); + if (entry.authorName != null) { + buf.append(" (") + .append(Messages.getString("by {0}", DataHelper.escapeHTML(entry.authorName), ctx)) + .append(")\n"); + } buf.append("\n
\n") .append(entry.content) .append("\n
\n"); From 1de840ce59001fc9bca9da0deafd2245528f2c6d Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 16 Sep 2015 21:07:46 +0000 Subject: [PATCH 158/258] Profiles: Bias slightly away from floodfills --- history.txt | 9 +++++++++ .../java/src/net/i2p/router/RouterVersion.java | 2 +- .../router/peermanager/CapacityCalculator.java | 18 +++++++++++++++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/history.txt b/history.txt index 5b8cecb7d..4d83ac343 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,12 @@ +2015-09-16 zzz + * Build: + - Include geoip in update files for next release + - Add created-by string to release torrents + * i2psnark: + - Store torrent added and completed times in config files, display on details page + - Add metainfo creation command line support for created-by string + * Profiles: Bias slightly away from floodfills + 2015-09-15 zzz * Console: - Store news feed items separately on disk in XML, like a real feed reader diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 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 = ""; diff --git a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java index 2c4a96c44..b67189e07 100644 --- a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java +++ b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java @@ -1,6 +1,8 @@ package net.i2p.router.peermanager; -import net.i2p.I2PAppContext; +import net.i2p.data.router.RouterInfo; +import net.i2p.router.RouterContext; +import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade; import net.i2p.stat.Rate; import net.i2p.stat.RateAverages; import net.i2p.stat.RateStat; @@ -25,6 +27,9 @@ class CapacityCalculator { private static final double BONUS_SAME_COUNTRY = 0; private static final double BONUS_XOR = .25; private static final double PENALTY_UNREACHABLE = 2; + // we make this a bonus for non-ff, not a penalty for ff, so we + // don't drive the ffs below the default + private static final double BONUS_NON_FLOODFILL = 0.5; public static double calc(PeerProfile profile) { double capacity; @@ -54,7 +59,7 @@ class CapacityCalculator { // now take into account non-rejection tunnel rejections (which haven't // incremented the rejection counter, since they were only temporary) - I2PAppContext context = profile.getContext(); + RouterContext context = profile.getContext(); long now = context.clock().now(); if (profile.getTunnelHistory().getLastRejectedTransient() > now - 5*60*1000) capacity = 1; @@ -83,8 +88,15 @@ class CapacityCalculator { // penalize unreachable peers if (profile.wasUnreachable()) capacity -= PENALTY_UNREACHABLE; + + // credit non-floodfill to reduce conn limit issues at floodfills + // TODO only if we aren't floodfill ourselves? + RouterInfo ri = context.netDb().lookupRouterInfoLocally(profile.getPeer()); + if (!FloodfillNetworkDatabaseFacade.isFloodfill(ri)) + capacity += BONUS_NON_FLOODFILL; + // a tiny tweak to break ties and encourage closeness, -.25 to +.25 - capacity -= profile.getXORDistance() * (BONUS_XOR / 128); + capacity -= profile.getXORDistance() * (BONUS_XOR / 128); capacity += profile.getCapacityBonus(); if (capacity < 0) From d5a0d95c61e9d1b319fbe4c9108fea1cd34f9940 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 17 Sep 2015 19:51:01 +0000 Subject: [PATCH 159/258] news appearance tweaks --- .../java/src/net/i2p/router/web/NewsFeedHelper.java | 5 +++-- installer/resources/themes/console/light/console.css | 8 ++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java index 1e4198ad0..357887f9e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -66,8 +66,9 @@ public class NewsFeedHelper extends HelperBase { buf.append("

"); if (entry.updated > 0) { Date date = new Date(entry.updated); - buf.append(fmt.format(date)) - .append(": "); + buf.append("") + .append(fmt.format(date)) + .append(": "); } if (entry.link != null) buf.append(""); diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 463b8e1df..24e34751e 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -250,8 +250,12 @@ div.newsheadings { div.newsheadings li { list-style: none outside url('images/newsbullet_mini.png'); - margin: 0 -4px 2px 8px; - line-height: 140%; + margin: 4px -4px 2px 10px; + line-height: 120%; +} + +div.newsheadings li:first-child { + margin-top: 0; } div.tunnels { From 84abfa01907e1e6470f65b7760ac2cc7f11dbc55 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 17 Sep 2015 20:19:10 +0000 Subject: [PATCH 160/258] Store magnet parameters across restart (ticket #1485) --- .../src/org/klomp/snark/SnarkManager.java | 76 ++++++++++++++++--- history.txt | 4 + .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 70 insertions(+), 12 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 0552f9c67..ccc331725 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -98,6 +98,10 @@ public class SnarkManager implements CompleteListener { private static final String PROP_META_UPLOADED = "uploaded"; private static final String PROP_META_ADDED = "added"; private static final String PROP_META_COMPLETED = "completed"; + private static final String PROP_META_MAGNET = "magnet"; + private static final String PROP_META_MAGNET_DN = "magnet_dn"; + private static final String PROP_META_MAGNET_TR = "magnet_tr"; + private static final String PROP_META_MAGNET_DIR = "magnet_dir"; //private static final String PROP_META_BITFIELD_SUFFIX = ".bitfield"; //private static final String PROP_META_PRIORITY_SUFFIX = ".priority"; private static final String PROP_META_MAGNET_PREFIX = "i2psnark.magnet."; @@ -1357,7 +1361,7 @@ public class SnarkManager implements CompleteListener { // Tell the dir monitor not to delete us _magnets.add(name); if (updateStatus) - saveMagnetStatus(ih); + saveMagnetStatus(ih, dirPath, trackerURL, name); _snarks.put(name, torrent); } if (autoStart) { @@ -1668,6 +1672,7 @@ public class SnarkManager implements CompleteListener { * The status is either a bitfield converted to Base64 or "." for a completed * torrent to save space in the config file and in memory. * + * @param metainfo non-null * @param bitfield non-null * @param priorities may be null * @param base may be null @@ -1730,9 +1735,20 @@ public class SnarkManager implements CompleteListener { } else { config.remove(PROP_META_PRIORITY); } + // magnet properties, no longer apply, we have the metainfo + config.remove(PROP_META_MAGNET); + config.remove(PROP_META_MAGNET_DIR); + config.remove(PROP_META_MAGNET_DN); + config.remove(PROP_META_MAGNET_TR); // TODO save closest DHT nodes too + locked_saveTorrentStatus(ih, config); + } + /** + * @since 0.9.23 + */ + private void locked_saveTorrentStatus(byte[] ih, Properties config) { File conf = configFile(_configDir, ih); File subdir = conf.getParentFile(); if (!subdir.exists()) @@ -1823,14 +1839,38 @@ public class SnarkManager implements CompleteListener { } /** - * Just remember we have it + * Just remember we have it. + * This used to simply store a line in the config file, + * but now we also save it in its own config file, + * just like other torrents, so we can remember the directory, tracker, etc. + * + * @param dir may be null + * @param trackerURL may be null + * @param dn may be null * @since 0.8.4 */ - public void saveMagnetStatus(byte[] ih) { + public void saveMagnetStatus(byte[] ih, String dir, String trackerURL, String dn) { + // i2psnark.config file String infohash = Base64.encode(ih); infohash = infohash.replace('=', '$'); _config.setProperty(PROP_META_MAGNET_PREFIX + infohash, "."); - saveConfig(); + // its own config file + Properties config = new OrderedProperties(); + config.setProperty(PROP_META_MAGNET, "true"); + if (dir != null) + config.setProperty(PROP_META_MAGNET_DIR, dir); + if (trackerURL != null) + config.setProperty(PROP_META_MAGNET_TR, trackerURL); + if (dn != null) + config.setProperty(PROP_META_MAGNET_DN, dn); + String now = Long.toString(System.currentTimeMillis()); + config.setProperty(PROP_META_ADDED, now); + config.setProperty(PROP_META_STAMP, now); + // save + synchronized (_configLock) { + saveConfig(); + locked_saveTorrentStatus(ih, config); + } } /** @@ -1840,8 +1880,8 @@ public class SnarkManager implements CompleteListener { public void removeMagnetStatus(byte[] ih) { String infohash = Base64.encode(ih); infohash = infohash.replace('=', '$'); - _config.remove(PROP_META_MAGNET_PREFIX + infohash); - saveConfig(); + if (_config.remove(PROP_META_MAGNET_PREFIX + infohash) != null) + saveConfig(); } /** @@ -2109,21 +2149,35 @@ public class SnarkManager implements CompleteListener { /** * Add all magnets from the config file + * * @since 0.8.4 */ private void addMagnets() { - for (Object o : _config.keySet()) { - String k = (String) o; + boolean changed = false; + for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) { + String k = (String) iter.next(); if (k.startsWith(PROP_META_MAGNET_PREFIX)) { String b64 = k.substring(PROP_META_MAGNET_PREFIX.length()); b64 = b64.replace('$', '='); byte[] ih = Base64.decode(b64); // ignore value - TODO put tracker URL in value - if (ih != null && ih.length == 20) - addMagnet(_("Magnet") + ' ' + I2PSnarkUtil.toHex(ih), ih, null, false); - // else remove from config? + if (ih != null && ih.length == 20) { + Properties config = getConfig(ih); + String name = config.getProperty(PROP_META_MAGNET_DN); + if (name == null) + name = _("Magnet") + ' ' + I2PSnarkUtil.toHex(ih); + String tracker = config.getProperty(PROP_META_MAGNET_TR); + String dir = config.getProperty(PROP_META_MAGNET_DIR); + File dirf = (dir != null) ? (new File(dir)) : null; + addMagnet(name, ih, tracker, false, dirf); + } else { + iter.remove(); + changed = true; + } } } + if (changed) + saveConfig(); } /** diff --git a/history.txt b/history.txt index 4d83ac343..03c584c55 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-09-17 zzz + * i2psnark: + - Store magnet parameters across restart (ticket #1485) + 2015-09-16 zzz * Build: - Include geoip in update files for next release diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0725033fa..f6e6df3a5 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 = ""; From bfc6534b205f5489c4fb31e669a86f8cd117cef4 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 17 Sep 2015 21:20:21 +0000 Subject: [PATCH 161/258] Don't delete torrent config file after error on initial startup (ticket #1658) --- .../src/org/klomp/snark/SnarkManager.java | 19 ++++++++++++++++--- history.txt | 1 + .../src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index ccc331725..1e6f152a9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1755,6 +1755,8 @@ public class SnarkManager implements CompleteListener { subdir.mkdirs(); try { DataHelper.storeProps(config, conf); + if (_log.shouldInfo()) + _log.info("Saved config to " + conf); } catch (IOException ioe) { _log.error("Unable to save the config to " + conf); } @@ -2013,13 +2015,15 @@ public class SnarkManager implements CompleteListener { File dir = getDataDir(); if (_log.shouldLog(Log.DEBUG)) _log.debug("Directory Monitor loop over " + dir.getAbsolutePath()); + boolean ok; try { // Don't let this interfere with .torrent files being added or deleted synchronized (_snarks) { - monitorTorrents(dir); + ok = monitorTorrents(dir); } } catch (Exception e) { _log.error("Error in the DirectoryMonitor", e); + ok = false; } if (doMagnets) { // first run only @@ -2033,7 +2037,11 @@ public class SnarkManager implements CompleteListener { addMessage(_("Up bandwidth limit is {0} KBps", _util.getMaxUpBW())); // To fix bug where files were left behind, // but also good for when user removes snarks when i2p is not running - cleanupTorrentStatus(); + // Don't run if there was an error, as we would delete the torrent config + // file(s) and we don't want to do that. We'll do the cleanup the next + // time i2psnark starts. See ticket #1658. + if (ok) + cleanupTorrentStatus(); } try { Thread.sleep(60*1000); } catch (InterruptedException ie) {} } @@ -2182,8 +2190,11 @@ public class SnarkManager implements CompleteListener { /** * caller must synchronize on _snarks + * + * @return success, false if an error adding any torrent. */ - private void monitorTorrents(File dir) { + private boolean monitorTorrents(File dir) { + boolean rv = true; String fileNames[] = dir.list(TorrentFilenameFilter.instance()); List foundNames = new ArrayList(0); if (fileNames != null) { @@ -2213,6 +2224,7 @@ public class SnarkManager implements CompleteListener { } catch (Exception e) { addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e); _log.error("Unable to add the torrent " + name, e); + rv = false; } } } @@ -2233,6 +2245,7 @@ public class SnarkManager implements CompleteListener { } } } + return rv; } /** translate */ diff --git a/history.txt b/history.txt index 03c584c55..97cc89d69 100644 --- a/history.txt +++ b/history.txt @@ -1,6 +1,7 @@ 2015-09-17 zzz * i2psnark: - Store magnet parameters across restart (ticket #1485) + - Don't delete torrent config file after error on initial startup (ticket #1658) 2015-09-16 zzz * Build: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5..4e28a2c8d 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 = ""; From 64889b2bc26df11d7d3540f36cb4f31eeb7f2a4f Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 14:36:49 +0000 Subject: [PATCH 162/258] Streaming: Move remaining timers from the context to streaming's SimpleTimer2; these were the ones migrated from SimpleScheduler earlier --- .../i2p/client/streaming/impl/Connection.java | 22 ++++++++++++++++--- .../streaming/impl/ConnectionHandler.java | 7 ++++-- .../streaming/impl/ConnectionManager.java | 6 ++--- .../impl/ConnectionPacketHandler.java | 2 +- .../client/streaming/impl/PacketQueue.java | 8 +++---- .../client/streaming/impl/SchedulerImpl.java | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java index 1d43a6cef..f5e93ddf0 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java @@ -793,7 +793,7 @@ class Connection { private boolean scheduleDisconnectEvent() { if (!_disconnectScheduledOn.compareAndSet(0, _context.clock().now())) return false; - _context.simpleTimer2().addEvent(new DisconnectEvent(), DISCONNECT_TIMEOUT); + schedule(new DisconnectEvent(), DISCONNECT_TIMEOUT); return true; } @@ -808,6 +808,24 @@ class Connection { } } + /** + * Called from SchedulerImpl + * + * @since 0.9.23 moved here so we can use our timer + */ + public void scheduleConnectionEvent(long msToWait) { + schedule(_connectionEvent, msToWait); + } + + /** + * Schedule something on our timer. + * + * @since 0.9.23 + */ + public void schedule(SimpleTimer.TimedEvent event, long msToWait) { + _timer.addEvent(event, msToWait); + } + private boolean _remotePeerSet = false; /** who are we talking with * @return peer Destination @@ -1254,8 +1272,6 @@ class Connection { return buf.toString(); } - public SimpleTimer.TimedEvent getConnectionEvent() { return _connectionEvent; } - /** * fired to reschedule event notification */ diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java index c06ae4a82..b92648d0b 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java @@ -9,6 +9,7 @@ import net.i2p.I2PAppContext; import net.i2p.data.Destination; import net.i2p.util.Log; import net.i2p.util.SimpleTimer; +import net.i2p.util.SimpleTimer2; /** * Receive new connection attempts @@ -23,6 +24,7 @@ class ConnectionHandler { private final Log _log; private final ConnectionManager _manager; private final LinkedBlockingQueue _synQueue; + private final SimpleTimer2 _timer; private volatile boolean _active; private int _acceptTimeout; @@ -37,10 +39,11 @@ class ConnectionHandler { private static final int MAX_QUEUE_SIZE = 64; /** Creates a new instance of ConnectionHandler */ - public ConnectionHandler(I2PAppContext context, ConnectionManager mgr) { + public ConnectionHandler(I2PAppContext context, ConnectionManager mgr, SimpleTimer2 timer) { _context = context; _log = context.logManager().getLog(ConnectionHandler.class); _manager = mgr; + _timer = timer; _synQueue = new LinkedBlockingQueue(MAX_QUEUE_SIZE); _acceptTimeout = DEFAULT_ACCEPT_TIMEOUT; } @@ -96,7 +99,7 @@ class ConnectionHandler { // also check if expiration of the head is long past for overload detection with peek() ? boolean success = _synQueue.offer(packet); // fail immediately if full if (success) { - _context.simpleTimer2().addEvent(new TimeoutSyn(packet), _acceptTimeout); + _timer.addEvent(new TimeoutSyn(packet), _acceptTimeout); } else { if (_log.shouldLog(Log.WARN)) _log.warn("Dropping new SYN request, as the queue is full"); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java index c55c8a67d..be2bbed11 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java @@ -74,11 +74,11 @@ class ConnectionManager { _pendingPings = new ConcurrentHashMap(4); _messageHandler = new MessageHandler(_context, this); _packetHandler = new PacketHandler(_context, this); - _connectionHandler = new ConnectionHandler(_context, this); _schedulerChooser = new SchedulerChooser(_context); _conPacketHandler = new ConnectionPacketHandler(_context); _timer = new RetransmissionTimer(_context, "Streaming Timer " + session.getMyDestination().calculateHash().toBase64().substring(0, 4)); + _connectionHandler = new ConnectionHandler(_context, this, _timer); _tcbShare = new TCBShare(_context, _timer); // PROTO_ANY is for backward compatibility (pre-0.7.1) // TODO change proto to PROTO_STREAMING someday. @@ -88,7 +88,7 @@ class ConnectionManager { // As of 0.9.1, listen on configured port (default 0 = all) int protocol = defaultOptions.getEnforceProtocol() ? I2PSession.PROTO_STREAMING : I2PSession.PROTO_ANY; _session.addMuxedSessionListener(_messageHandler, protocol, defaultOptions.getLocalPort()); - _outboundQueue = new PacketQueue(_context); + _outboundQueue = new PacketQueue(_context, _timer); _recentlyClosed = new LHMCache(32); /** Socket timeout for accept() */ _soTimeout = -1; @@ -839,7 +839,7 @@ class ConnectionManager { private final PingNotifier _notifier; public PingFailed(Long id, PingNotifier notifier) { - super(_context.simpleTimer2()); + super(_timer); _id = id; _notifier = notifier; } diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java index 51516c98d..f87b21e25 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java @@ -207,7 +207,7 @@ class ConnectionPacketHandler { final long delay = nextSendTime - now; if (_log.shouldLog(Log.INFO)) _log.info("scheduling ack in " + delay); - _context.simpleTimer2().addEvent(new AckDup(con), delay); + con.schedule(new AckDup(con), delay); } } else { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 34ab43939..943a0c03f 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -45,11 +45,11 @@ class PacketQueue implements SendMessageStatusListener, Closeable { private static final long REMOVE_EXPIRED_TIME = 67*1000; private static final boolean ENABLE_STATUS_LISTEN = true; - public PacketQueue(I2PAppContext context) { + public PacketQueue(I2PAppContext context, SimpleTimer2 timer) { _context = context; _log = context.logManager().getLog(PacketQueue.class); _messageStatusMap = new ConcurrentHashMap(16); - new RemoveExpired(); + new RemoveExpired(timer); // all createRateStats in ConnectionManager } @@ -328,8 +328,8 @@ class PacketQueue implements SendMessageStatusListener, Closeable { */ private class RemoveExpired extends SimpleTimer2.TimedEvent { - public RemoveExpired() { - super(_context.simpleTimer2(), REMOVE_EXPIRED_TIME); + public RemoveExpired(SimpleTimer2 timer) { + super(timer, REMOVE_EXPIRED_TIME); } public void timeReached() { diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java index 41085a30d..bc54ba3c8 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java @@ -16,7 +16,7 @@ abstract class SchedulerImpl implements TaskScheduler { } protected void reschedule(long msToWait, Connection con) { - _context.simpleTimer2().addEvent(con.getConnectionEvent(), msToWait); + con.scheduleConnectionEvent(msToWait); } @Override From 1a385b6dca6051fd33aa158b3d4f05473cd9ddd2 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 18:15:32 +0000 Subject: [PATCH 163/258] i2ptunnel: - Pass Accept-Encoding header through HTTP client and server proxies, to allow end-to-end compression - Don't do transparent response compression if response Content-Encoding indicates it is already compressed - Minor encoding cleanups EepGet: - Send Accept-Encoding: gzip even when proxied - Minor cleanups --- .../i2ptunnel/HTTPResponseOutputStream.java | 24 ++++++++++++------- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 8 ++++--- .../i2p/i2ptunnel/I2PTunnelHTTPServer.java | 23 +++++++++++------- core/java/src/net/i2p/util/EepGet.java | 15 ++++++------ 4 files changed, 42 insertions(+), 28 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 83fbb6d0a..2fc344a71 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -39,7 +39,10 @@ class HTTPResponseOutputStream extends FilterOutputStream { private final byte _buf1[]; protected boolean _gzip; protected long _dataExpected; + /** lower-case, trimmed */ protected String _contentType; + /** lower-case, trimmed */ + protected String _contentEncoding; private static final int CACHE_SIZE = 8*1024; private static final ByteCache _cache = ByteCache.getInstance(8, CACHE_SIZE); @@ -151,7 +154,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { responseLine = (responseLine.trim() + "\r\n"); if (_log.shouldLog(Log.INFO)) _log.info("Response: " + responseLine.trim()); - out.write(responseLine.getBytes()); + out.write(DataHelper.getUTF8(responseLine)); } else { for (int j = lastEnd+1; j < i; j++) { if (_headerBuffer.getData()[j] == ':') { @@ -160,7 +163,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { if ( (keyLen <= 0) || (valLen < 0) ) throw new IOException("Invalid header @ " + j); String key = DataHelper.getUTF8(_headerBuffer.getData(), lastEnd+1, keyLen); - String val = null; + String val; if (valLen == 0) val = ""; else @@ -171,10 +174,10 @@ class HTTPResponseOutputStream extends FilterOutputStream { String lcKey = key.toLowerCase(Locale.US); if ("connection".equals(lcKey)) { - out.write("Connection: close\r\n".getBytes()); + out.write(DataHelper.getASCII("Connection: close\r\n")); connectionSent = true; } else if ("proxy-connection".equals(lcKey)) { - out.write("Proxy-Connection: close\r\n".getBytes()); + out.write(DataHelper.getASCII("Proxy-Connection: close\r\n")); proxyConnectionSent = true; } else if ("content-encoding".equals(lcKey) && "x-i2p-gzip".equals(val.toLowerCase(Locale.US))) { _gzip = true; @@ -189,7 +192,10 @@ class HTTPResponseOutputStream extends FilterOutputStream { } catch (NumberFormatException nfe) {} } else if ("content-type".equals(lcKey)) { // save for compress decision on server side - _contentType = val; + _contentType = val.toLowerCase(Locale.US); + } else if ("content-encoding".equals(lcKey)) { + // save for compress decision on server side + _contentEncoding = val.toLowerCase(Locale.US); } else if ("set-cookie".equals(lcKey)) { String lcVal = val.toLowerCase(Locale.US); if (lcVal.contains("domain=b32.i2p") || @@ -203,7 +209,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { break; } } - out.write((key.trim() + ": " + val.trim() + "\r\n").getBytes()); + out.write(DataHelper.getUTF8(key.trim() + ": " + val + "\r\n")); } break; } @@ -214,9 +220,9 @@ class HTTPResponseOutputStream extends FilterOutputStream { } if (!connectionSent) - out.write("Connection: close\r\n".getBytes()); + out.write(DataHelper.getASCII("Connection: close\r\n")); if (!proxyConnectionSent) - out.write("Proxy-Connection: close\r\n".getBytes()); + out.write(DataHelper.getASCII("Proxy-Connection: close\r\n")); finishHeaders(); @@ -237,7 +243,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { protected boolean shouldCompress() { return _gzip; } protected void finishHeaders() throws IOException { - out.write("\r\n".getBytes()); // end of the headers + out.write(DataHelper.getASCII("\r\n")); // end of the headers } @Override diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 74fcaccb1..8645b686f 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -881,7 +881,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn } else if(lowercaseLine.startsWith("accept")) { // strip the accept-blah headers, as they vary dramatically from // browser to browser - if(!Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_ACCEPT))) { + // But allow Accept-Encoding: gzip, deflate + if(!lowercaseLine.startsWith("accept-encoding: ") && + !Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_ACCEPT))) { line = null; continue; } @@ -933,8 +935,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn // 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. - if(!Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_ACCEPT))) - newRequest.append("Accept-Encoding: \r\n"); + //if (!Boolean.parseBoolean(getTunnel().getClientOptions().getProperty(PROP_ACCEPT))) + // newRequest.append("Accept-Encoding: \r\n"); if (!usingInternalOutproxy) newRequest.append("X-Accept-Encoding: x-i2p-gzip;q=1.0, identity;q=0.5, deflate;q=0, gzip;q=0, *;q=0\r\n"); } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index 6b3b41720..35dd6f132 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -419,12 +419,14 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { setEntry(headers, "Connection", "close"); // we keep the enc sent by the browser before clobbering it, since it may have // been x-i2p-gzip - String enc = getEntryOrNull(headers, "Accept-encoding"); - String altEnc = getEntryOrNull(headers, "X-Accept-encoding"); + String enc = getEntryOrNull(headers, "Accept-Encoding"); + String altEnc = getEntryOrNull(headers, "X-Accept-Encoding"); // according to rfc2616 s14.3, this *should* force identity, even if // "identity;q=1, *;q=0" didn't. - setEntry(headers, "Accept-encoding", ""); + // as of 0.9.23, the client passes this header through, and we do the same, + // so if the server and browser can do the compression/decompression, we don't have to + //setEntry(headers, "Accept-Encoding", ""); socket.setReadTimeout(readTimeout); Socket s = getSocket(socket.getPeerDestination().calculateHash(), socket.getLocalPort()); @@ -432,7 +434,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { // instead of i2ptunnelrunner, use something that reads the HTTP // request from the socket, modifies the headers, sends the request to the // server, reads the response headers, rewriting to include Content-encoding: x-i2p-gzip - // if it was one of the Accept-encoding: values, and gzip the payload + // if it was one of the Accept-Encoding: values, and gzip the payload boolean allowGZIP = true; String val = opts.getProperty("i2ptunnel.gzip"); if ( (val != null) && (!Boolean.parseBoolean(val)) ) @@ -443,7 +445,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { boolean useGZIP = alt || ( (enc != null) && (enc.indexOf("x-i2p-gzip") >= 0) ); // Don't pass this on, outproxies should strip so I2P traffic isn't so obvious but they probably don't if (alt) - headers.remove("X-Accept-encoding"); + headers.remove("X-Accept-Encoding"); String modifiedHeader = formatHeaders(headers, command); if (_log.shouldLog(Log.DEBUG)) @@ -671,6 +673,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { /** * Don't compress small responses or images. + * Don't compress things that are already compressed. * Compression is inline but decompression on the client side * creates a new thread. */ @@ -687,7 +690,11 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { (!_contentType.equals("application/x-bzip")) && (!_contentType.equals("application/x-bzip2")) && (!_contentType.equals("application/x-gzip")) && - (!_contentType.equals("application/zip")))); + (!_contentType.equals("application/zip")))) && + (_contentEncoding == null || + ((!_contentEncoding.equals("gzip")) && + (!_contentEncoding.equals("compress")) && + (!_contentEncoding.equals("deflate")))); } @Override @@ -877,9 +884,9 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { String lcName = name.toLowerCase(Locale.US); if ("accept-encoding".equals(lcName)) - name = "Accept-encoding"; + name = "Accept-Encoding"; else if ("x-accept-encoding".equals(lcName)) - name = "X-Accept-encoding"; + name = "X-Accept-Encoding"; else if ("x-forwarded-for".equals(lcName)) name = "X-Forwarded-For"; else if ("x-forwarded-server".equals(lcName)) diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java index c31184dbd..a098a997a 100644 --- a/core/java/src/net/i2p/util/EepGet.java +++ b/core/java/src/net/i2p/util/EepGet.java @@ -755,6 +755,8 @@ public class EepGet { Thread pusher = null; _decompressException = null; if (_isGzippedResponse) { + if (_log.shouldInfo()) + _log.info("Gzipped response, starting decompressor"); PipedInputStream pi = BigPipedInputStream.getInstance(); PipedOutputStream po = new PipedOutputStream(pi); pusher = new I2PAppThread(new Gunzipper(pi, _out), "EepGet Decompressor"); @@ -1160,17 +1162,13 @@ public class EepGet { lookahead[1] = lookahead[2]; lookahead[2] = (byte)cur; } + private static boolean isEndOfHeaders(byte lookahead[]) { - byte first = lookahead[0]; - byte second = lookahead[1]; - byte third = lookahead[2]; - return (isNL(second) && isNL(third)) || // \n\n - (isNL(first) && isNL(third)); // \n\r\n + return lookahead[2] == NL && + (lookahead[0] == NL || lookahead[1] == NL); // \n\n or \n\r\n } - /** we ignore any potential \r, since we trim it on write anyway */ private static final byte NL = '\n'; - private static boolean isNL(byte b) { return (b == NL); } /** * @param timeout may be null @@ -1315,7 +1313,8 @@ public class EepGet { buf.append("Content-length: ").append(_postData.length()).append("\r\n"); // This will be replaced if we are going through I2PTunnelHTTPClient buf.append("Accept-Encoding: "); - if ((!_shouldProxy) && + // as of 0.9.23, the proxy passes the Accept-Encoding header through + if ( /* (!_shouldProxy) && */ // This is kindof a hack, but if we are downloading a gzip file // we don't want to transparently gunzip it and save it as a .gz file. (!path.endsWith(".gz")) && (!path.endsWith(".tgz"))) From ff420278c596baa11bb978651557a2e917693b1f Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 20:08:40 +0000 Subject: [PATCH 164/258] only log once --- .../java/src/net/i2p/router/transport/udp/UDPTransport.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 c616e5a82..d109cb099 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -86,6 +86,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority private final DHSessionKeyBuilder.Factory _dhFactory; private int _mtu; private int _mtu_ipv6; + private boolean _mismatchLogged; /** * Do we have a public IPv6 address? @@ -1229,10 +1230,12 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority _expireEvent.remove(oldPeer2); } - if (_log.shouldLog(Log.WARN) && _peersByIdent.size() != _peersByRemoteHost.size()) + if (_log.shouldLog(Log.WARN) && !_mismatchLogged && _peersByIdent.size() != _peersByRemoteHost.size()) { + _mismatchLogged = true; _log.warn("Size Mismatch after add: " + peer + " byIDsz = " + _peersByIdent.size() + " byHostsz = " + _peersByRemoteHost.size()); + } _activeThrottle.unchoke(peer.getRemotePeer()); markReachable(peer.getRemotePeer(), peer.isInbound()); From 83791b2d1065cc99b27ca48515d23b93250824e5 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 20:15:06 +0000 Subject: [PATCH 165/258] i2psnark: Don't display "Tracker Error" if torrent is stopped (ticket #1654) --- .../org/klomp/snark/web/I2PSnarkServlet.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 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 f969687ca..549ac435f 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1475,7 +1475,8 @@ public class I2PSnarkServlet extends BasicServlet { } else if (snark.isAllocating()) { statusString = toThemeImg("stalled", "", _("Allocating")) + "" + "

" + "" + - "" + + // "" + "\n"); + + // buttons + if (showStopStart) { + buf.append("\n"); + } } else { + // snark == null // shouldn't happen buf.append("\n"); } buf.append("
ServicePort\n"); + out.write("

Port Mapper

ServiceHostPort\n"); Collections.sort(services); for (String s : services) { - out.write("
" + s + "" + _dir.get(s) + '\n'); + InetSocketAddress ia = _dir.get(s); + if (ia == null) + continue; + out.write("
" + s + "" + ia.getHostName() + "" + ia.getPort() + '\n'); } out.write("
\n"); } diff --git a/history.txt b/history.txt index 4547341e1..02cec0312 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2015-06-25 zzz + * Console: Use registered host/port for eepsite link (ticket #1604) + * Jetty starter: Register host/port when started + * PortMapper: Add hostname support + 2015-06-24 zzz * Transport: Add failsafe to prevent complete SSU stall waiting for bandwidth limiter diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 5a58b19bc..e36cd3b14 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 = 11; + public final static long BUILD = 12; /** for example "-test" */ public final static String EXTRA = ""; From 23f2261bd96d35aaeb9f9ad38725d06725af1f07 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 28 Jun 2015 12:13:52 +0000 Subject: [PATCH 087/258] Apache Tomcat 6.0.44 --- LICENSE.txt | 4 ++-- apps/jetty/apache-tomcat-deployer/NOTICE | 2 +- .../apache-tomcat-deployer/README-i2p.txt | 2 +- .../apache-tomcat-deployer/lib/el-api.jar | Bin 34141 -> 34622 bytes .../apache-tomcat-deployer/lib/jasper-el.jar | Bin 112554 -> 112521 bytes .../apache-tomcat-deployer/lib/jasper.jar | Bin 532709 -> 528303 bytes .../lib/tomcat-juli.jar | Bin 32404 -> 32384 bytes apps/jetty/apache-tomcat/README-i2p.txt | 2 +- .../apache-tomcat/lib/tomcat-coyote-util.jar | Bin 12425 -> 12420 bytes apps/jetty/build.xml | 2 +- 10 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 254fde1a3..295da33aa 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -252,8 +252,8 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 6.0.43: - Copyright 1999-2014 The Apache Software Foundation + Tomcat 6.0.44: + Copyright 1999-2015 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-deployer/NOTICE b/apps/jetty/apache-tomcat-deployer/NOTICE index 932b4e744..32940950b 100644 --- a/apps/jetty/apache-tomcat-deployer/NOTICE +++ b/apps/jetty/apache-tomcat-deployer/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2014 The Apache Software Foundation +Copyright 1999-2015 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/apps/jetty/apache-tomcat-deployer/README-i2p.txt b/apps/jetty/apache-tomcat-deployer/README-i2p.txt index c64d393b1..c354fb71a 100644 --- a/apps/jetty/apache-tomcat-deployer/README-i2p.txt +++ b/apps/jetty/apache-tomcat-deployer/README-i2p.txt @@ -2,7 +2,7 @@ This is Apache Tomcat 6.x, supporting Servlet 2.5 and JSP 2.1. The Glassfish JSP 2.1 bundled in Jetty 6 is way too old. Retrieved from the file - apache-tomcat-6.0.43-deployer.tar.gz + apache-tomcat-6.0.44-deployer.tar.gz minus the following files and directores: diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar index def835a2561dbc3e56e151e3cdb4cf48fb9332fd..c6c52f48c15b9e22f76f87695a416f92fc42b652 100644 GIT binary patch delta 13345 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 Sg@Hv5K%8(27-gS-xc>*5`q3Bw diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar index 9c779fd396379f38d12c6fc4f19d299e3fec48da..f7d19049e7bcb0eb37ab337867c59029120703c9 100644 GIT binary patch delta 10812 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 delta 10789 zcmZWv1yod9+nz&9cOxyS2-4ls9nv8oBHbbkARrPF101CrK~khkKoCTbk`@spRHRj! z|IC2*e%yc7I&1cN_Vea`_nx!%JC8T8N;j|wb=1)@aA7bU7%WA{RVk5><5Dv8&6}2w z)s-mC441;|yiTt4NA^TPnSu1~i!j$W5+;HB4`L@i0XS?k9UC(q~q<`w*ANcqUC4ZZpv|$p8fP3M6wY!`7 zha%S2FeOL!(CVG4)0$oXD&FZv>+nO}6yDIHqB^wIegALmg32`Y+MBH5!`S}@m;eQa zxC&gxKp+R&06PXURD?gkiIIdH;GkVbgy>-YPfAemM}Y6|{8iMTMhxvUIw?|CNMbba z1qKWzf(L^!!@#*rfEAu%r0F)JOx%jy3#XpMw8Q3RSXm9j?oKq#t+RXj52n*L`^SD`GrPfncDsb1f8kh(yl+5-vEcQt7&{Sl+eCbi^gJ@}iF`Ca}CED79@K6R5DqCzd ziRZkRWfz6JM|7W)!;N*9^`4Ux3CtWaNoU<9mhuZ*$IHI7+Wkd{_zC`0>Z#FSiZK;c z`oI-Z=>?VaB_+gsH^H#DYNX7g=Tob4OLwj&{?cYA(3Sig%E?t~@Sbbj{9Z#yn@Zar zd3O)-%-tz$GvjOsjH(5`=UyYX}^?sakwU(M-#4B?nb-)21(JwDv$uTn!L%)@2m8ht+Ku4P&7j#Ov zFTqkxRuNMfVM{OuSNA{JTfl4JA<5#idOEtI%~!6gOPXJvXmy{p&A+j|;km&(-EKc+ z{ajqUl3p*ZJh4#A`1ki)d-C+KREf>U?_A^UxnYyKsscMamhO!ePh8EFboSDV{J1Y} zU}YF^LTTwF=&|DKW?Ls)ArKuxsC(Bt(u`zD%wcPDxowVZ7;e`V+L_4l^Btn&Ct95G zG9ttLGTTf<+~f~tUs}$J+=zJGr_@gePdmpj87<`H2N;zszg$;|?`=zb!ameswd0ih zXdsFXYmpUi{Sxqt!YExkxl+Jcx_`bzh~{zfl@(VFZa4af0@ES!60tUx#sstFTCcbj z{tqdQMH+#{A9UfnBRjdf!MLXrHe;NtM&dCXcAOys1=F(!<>>Pw_zzwrRmvQh)F8`!jlvE&opS5>#V_&&PcvpsV zTPD84l^+qN;x?2J788`+m9R)Id8w79Qr>U9HZdnK+2}HSa+;yKHIBE*KVxNAbSYu) zs!aN-w1(g1bPbJnO+b6&V{&&jSl6JQlHjfp21Gr4=2dK&vC0m`IhUvkkGC1(6T~d zaawzqD2A9Mcwx#&;t$i0tl4=Bp+DTlZAcWV!>p2l7SsFnZC?5aE1`R@1C35%${So) z8Gh!iygFo^f6yLtOcU|l_Vl^;Z~Z28rjMq@c>#5n3Jp3b9R#PmI5P1K!Fc&Gr*f>t zyYK8IuQj_rQ+{z@a&AI$HgK1_R(?DJOIng&rxmFzR7&1ue4Z>%%qu*5kP;C?QtsW6 z?DQFf`OxT5Ei9t;_p91W#Xm>6nhN9797=Q1)~>Sq*{ zdLH}in;6eeQP^b;-fR~sV_$9MnhcEkWmV3=X1T6nXq{5Z-avVmhagrndH_47{NeN! z8TQYEj1u{nMg5}`^D~SD)kOvuX-jl3WtD(1F1_s=lp2jW< zHs{7n?Rvg^`o74YcGUgg@yRm{KJCZMG~1glO9f~{V=Nqw)%BSv;<&ct0lz7V?-%MP zJ8YXSX*7PSy0L(WwkTK4-}*2Qk8-SK_*^O@NS1YTx?55zRx@_l z>89VxpXBNfuT|j2sq2<=`6+&t>qH&)?E1S*x1Jb~;jvx%ZfW)LN*p0vePS?AvvAvh zycEL`&u-rmUh(0>TR1f>e#mud@9J6)d@~gkSt<&lSo0^>B z`3;}qby-d8T+4fz{dsMPl(Z`BU4r6v>zb20eioCTN3xuFhvsF$JYh|-)I8VDRNK-= z@<#*Z*MYfO3@6v zNZ8d|Btc?&4vd3QAS@s!F{GP|l=0G+uCe{hOW%dJcopE%6S+2iF&`rfv(OcnQyh{u zt_P|3$EgpgHkTjP`O+DAx}j}YCm*KV7emF?L*1*4>L+Va2oUQxeDPmFP2Dk%zU#*)_+!c%mi_JVRV= z&%dtwQbQMRa%WYlZphYo@rtoWu5WMv!|_OUAk5O49oxpNnxsUcG;kLd{gKt|$hs!~&MbArYxdpe36KZepv)@n$36%;Z-0MxM zaXdc(EuPx=0@KQnA1njsH<4@TTfN@(<8S0A9C}AYe_#G^V8~awniZlJtg~0RVoDKA zLL?TGwwJAo4TH6kfT2DB`Ad3l>@$WxYZK<#NSMnG{cM!QD||kh8?0JgTVqI3*3lmfU+h+hv8hXNMG?>aNY0(?@Yy}P5C*NYv+IN zDuc5t#@TGV+b9~!Y1UDXj!Wn;*lR3AH6=Onr4`I70H|wnJ;~0MH~8cOXF^tf66Y$j z0!Gd;@4%dMj5>Jje1sF~h=%g{@u~Hfc>o5pg$ytwLIde)(jV>sD7&wIS2-I&;Rs-$ zl2ua`5pXVjHOl^clp1|yty&Q}7MHI)Nb&t>KZ4RFt*6P-#w!w?hG^Jh@=jK?|c`llync{j;p z6B-eO!EC}2Ini`rLN!2G^J{Ka5Va@`bNaWBFk!F-JVcc~Ibwc}2>ezJ5Y>~A16XGn zuBW2~blFha>)oY+w`alEODF)&XC)3D#Q^?U_+XP7uy97rQ3oEM6?FYoePEy94CS@~ zlyFdn^QSgmyFm-`83QrjMOXjS2?#&aQO|S_z&l*mG!3_v{zk^6VVX#aFGM!`QECnPIJ$o)c*H%bT?N?C4+> zUtmvlY{Y!0eDvq~T8re)`}aXx5?dwN{pDp7YAwUH-!l&uN-$4##+^oEDz8}@EV#X7 zEc_HxY1y)Ou=rxUt14*!Xy3KIIpM)jL^b@yN~X+vsnZ3&mfe$s-^CIhjSZxgu9U_* zhx-EyS}kpj6dUUmJRX6^zke@(|HO0Oe9O#ur}=PZ|Ify%>f}N{o=2hSryl@mQ_Lp0 zOpSZZGk51HAKQF8KCD@P9pA<9H9Fn&wyhtE&Slh@rQwEV&S}*}Zw+T-EL~sGm03Q4 z?_x7&-dQ#H7`0?MTQa?|%}!Y5U|!x`-}!1!X;Df)p6(;j+dP^;HZzyHz!%0pU=lt2QaKVfj=1SL(nfb}P9{ zCOgu)#H(l#E<% zo{O2;Yp78YdARHJQf}&u^-fG4!ELiA;<6!hOXUN$+KnS^7OfcYedR z;NrFFZT7;{{;KeNdtKQck#}#8AnhLnoZh}~q^Ytwks|Clc`J=#u}B(5h+L-ABZh#q zMKYTVEaj+qi=87xBvNI4OTC@JC#q($Nw_@ zogmqbCt2XPTN*pqt=+Wg%u}!_zHnUnjeYS7wx1HUixB2ho2^a@V|UzH^mvZ?EO-cQ z#o>I%r(tF3ry`}pdiaMwch@)Kj@>cHB_!=iXtH`YJXKbuE!nZdjjbDIl!awM>=KE_ zHI^&n?uI0TNh0F{4Jq$$k?0aNy`H)ByQOWj&SB}DP0m`^-RSKesX=$_Uz{Rl8F4AE zgZx{qR4XlA>v0`rSenFZB=`(H3d`WZA;OHwOyvzzxqL(X#S|oh#P!?JQJs8+tUSNz zGYA;uJ771riIp9zr=SZEXNyYp@Q{yKb~qR>42jZQ)T9ZH!y8C&?+Xi`L`sFV_OC`a z>s~e>)ap`B5FPZUXT4Qy-1L_JZJmtrcMPka7^K`D&pUJEw%4rX=Va{2UkK~LS3(TU zoTltmL>?gGUY5?Vavl(swXn}d(ieerK9}PvL$&Hsgg6pPHS$zzZrUbBCOfJBXlKbF z(wHw;B0^{Bb`P-AyN&busSASh)yx~gwGW!syiPoeLT~yvJKtW@p&${^QM)eMtRA)A z!#>Y8uUf#d=Ey6FN4*fHZ5t)S0%z=-&LGOxU}w)|Zdl&w`vv0Sy5z=js0^;~qw%ZP zr*#iVa;Uh+8I~%DnxZFE^pdMjRV)1Dy}I@+FE;3UXimt}JC^qLi4|BN`lGn{QjSrB z$eL~PBd`!n?fVlWKc<|?ieAUZ{Ee-2V?CNV45|SJ$>w*pa=%b)U?x*Z6~k2v%ElfT zcD{Q-)mv+0<7A`@n80w91KbmuX}m9SKLy_ zDh#_FYRTQ>*K2XvK(Ro-J)094xMk`1B#>~m^8Dcz<1Rw9MQG3%q!9(=_fSJAziiK zCLHILeU*g3seac<8Rzm&H(K(|j#0)tt-r10q}mr1CdfrNws?>l~{d`yS}q6xSzJ?VWb1INmC*L&v1& zPGKhHiducZ?sKi~q$z?#ZnJvERGQP_p(aGduoY=c8r&>icyYKLrjgwB^zoxo-T9eT)Kvv(==vXGyr0SwrvvST-IJLG>xZv~}|N;FamO=}Ir|Jsq`W{4h~;?b#heUVDYH zHzRCs%~T#G2JDx~ZK(-sNV8fL_z+|%^J#GR_!`&>lhC%c5!aXA6SUa;M%Vb^jvtQ3 zYh{N059E1S)(`K|EP$de81T(%1(F{fr|B8h#Xj{PwixB=xhJ&CQabyD)dIZgixk+G zF3E=1fMP`1eO~ZSB$o9o&r}ty@?XEE{lmt@6X1D`_uI;9UDA!WHd|Yn+BM%M?LEpi z(Cxo#{-P2B9>n)1N#uSVlG=~0l(gUi0IO~H>Ew5(6h9RA;|Pf=W4hqww8Wl-rdFe@dLHN_TD$XYYZ>NrQdv}vSHo}(`8>G#FVAUpq) zXZC2cbcuzp#Jv%&Z_kO-V=+3@=wDmwi2k-GH&EuP>8wdDI$6p}UT7v=tq}UdSYrJy(khx~E@AMRM7T+KKFJiDCP$W5`Q7EYuR5cI+T8Ah zrH{~?A9NY&Jr&zC74cH`W1jof`|^oP@nsLA@{*8csTdE9_2e}oxT@nY1JATAqe}$E z5|9}%NwNLL-Nd*4^hN2l>jIRoHtE|R6*p<71sxDjI^-BSnZJ4F==4D9rcKMjNWwNA z-imU;rDEEpo7&`Lh4!7gSs{DlJOL{tDR(+SfoY9^k zmDlO(rX!P`9oLhgm-FzsI2&08NliWnor06=y*ug`GwpZpCc0 z>3HhtJC^sW0I*RS5=LU~;#axLboF^o7pwC`=z07dR z9Uw4I{T=(JaJ)-5&a6!lKM$FOV5$5redONekr}UN7^do*aU;X`lu?-I)`qs@# zDt}T6_5Qg#jbjW%TPw+Fm@0ZQRh+?8lHVKRart%2L6>wKA`X1ND4#0+=_tUQ)H)z^)FxccH}~Ed^q;Vx8C~-h`KA&qJ19I; zUNFa69hqq7R=BSGgDhojy7~h~6xr7jH~l-4vccxx-!PWb(?`MSlW>l0-1uCRXn(&9 z7?R9#>H5PK6`2#YSE4j2quf#P5+05B?z5m*) z+NU#;984@}Yb)XnaMErq&VKK(j|Ry{cYFkCzqePO7~jvx zTrRz>f> zonoRAyUd$)m6T?n+{j`P!xMYqbMZrVO%;k+@8A8EHL;Io=W+Vn85v@Rg_C2It_Cv? zR%o2Q-CdHWdF25={G5$fvDf(CCx^)$*8o#BNk^AFpf!U)f2~0(;e~^pB zI&E7ov)q>maX2OM7}ZK!$tWV7ePrA@E$wDyuh)C4-+TLp@T1O`3gZv?H!5x9Ho+p! z`l2j@6swx(8~2%mxbB}YY>?p5gkfiYmd}>fgMWG?p2~ki%y?Ozvk&Zk6HuQntRK+4A&ilJGy#t-2(Mi9&(72LJ0hSQ;Cx3Vtu}LdbMSIs)5Kh+ z9vO4q=neER^e>#g$9KaIL&ce#cOO}?^o*-J?62?L75y%wqYj{vqyO9g2E)<;k$*ej zU}riYhJoxGgQw{LEj1H#q2uQ1$oIcu$YwIgp8?PU@}LIvg=#8;ccBrB^Eutd-RAZk zdp`Sn7X*=aS|E2OBnW~X82}3t5`gYC{`pY+Ga`olli$f|G?_)CQf0>ZJ6)-pp5JANeHS4*&4fT+)pdJ#>1yV632+snTz+YJa z4T}2j4J-`Cae=x(huEa!0!y+0d=yiNRKnXAy6MWrhwjxbF#TB}CL>DcS#sL50a`R+ zE>JE9U{B2fm{Fd`n1~C1g)Xefq1#x|3-Vc@Yz}bqOf)735}o8jin4%xIRMic{1XZH z-Z+DKa-qKwpcYUw7lPA-kuWnDoePkj!8u4+P8tbQfup$q%^AFjgl%<@FeM^VhY}Rc zJC6-h8O!Jds+TX&tt;;Z--`56bnt#2z=lf0eTQav6O`9t+W)3u-SABFJAGpCYu;a9 z4)P$Qn>NTP3WTgPAt;s)(4Z31L$I;R4J{=B0SpFRFaGl>2+ajO@&N^uIg^yfqg>EZ z{(}A^a&ajcod4>iMlI4=j3fn+xp+6!6!Kb{5Y#F78@~&3&cXAaIX09VEoyhwt)bX0 zp|#=q#|aozQ4Qdi0zmXkFGC?DYvl*+0$NbN5TH0i?;+8w03?d&2_OUS6a)Aur9u;P zOtz51ILLLj3rfAg`9k0ZDmF}|)6QIo!~|6p{{<3tF!-eqpaZpv&a-|@A1}cGQ5PY7 z*Dp|ULLuvPV0jV1ic)&v0{sHh>mkHs<^A{gIO|LNd#(Q89gq}(RE=nkAVdX*QZK!m z6hsd>G7mYzcR~HtD3l|W#Q+N`1;jpvLLCqj21Unuftd4%0$4w~tzEI&^ zBs~S?o&y3Xn+_p4J6;ee0Md4m)E5ugqy@{L15_v`^N;|)Kg3#syt`N}L5V2l$#a15 zZ0VRwprw;eMxn;g80AiZrb8DEB;N+PbFmfx=V! z^aOA7VK=nDmC65mIt^r_ELoNU^k?>iOCcqb#Yi;iIRWv1R|OnK&PSGlaxb8RfanE4 zigIw^YJm_NQHEP89;f)?MI>~4M-GmrI8RMD*yX?z*r8=xVEDBhUI^?xFXTj zb`+oZH6ch{dY&kOj_74qXi0maSXeF;2WKaWt<#D7FI(0t%N%(;r9x3NU0{!Qq1Y!~ zIG|3&Utg>%AgiQ3s2TAdTrlUKnJVNAe=lmrq!<7H?FAEE+NU0nA)o)})^I;k2o$XZ zC{dMmq04f?rLX}M6WMe@R1Oe;X_bHdDy@X9&kz2cKF|Ll5*3|-P%7|R6~J(oY3(Wq zotQ?Vi20dIU`!Q2hBAz~eR6{ra`6-NT&#fRnR7NJ_@nBt%|oP~>!1GWL0EpG1U0Mw z&RSGMvz>D&+fZMJ_RMw#68#8uM_vMq$ZifD%5Y>JPbm&`ma(Y(cjwd5BB@NEDlI_5 z^WQ=~SR=&_g0`b2bbwzxx!l2!mw*gPH-f0W=?ZjC6hbdU7lV>eK|#V#fb^b5;M0n)3?40ySU#-ODboAT``J|ID3l@z+S$%jpc>dG&Y05!OO5 z)4elT=^jA#|8iF7GGT%R)jB=&>v-`chX;h$0wQP2)P&UI=L3e+0uVF19y)7ox!NDsS!GaD|bvLAz{X%NQKzJP>hzdM@ac2k)*))fif%O6j9u9`oLDi6# z50IK8U)lcK5Btk52$hKe{@We<-#7hIeXCM`wuE5NzKz)RJMk<%rk@?Gq{GvbkfZ@b(A3ML=D1u+KW^-*|x z3aljhb&(Hm<#iQS+S&DqXLdG5RkDm)F^IVgh=fpa^DZzP0{*{yws{AtX3xMAzg+CvQGCJF&=P=w`Re8WjZgI{u0%FCa`2n~fGQmA zGxz|<_6&Z&u{?uCIEMdGND?W)2>(xx{)uXXsFK_F5s=aTPwM`Woq%Fk{{g`N^MjX& z1;$IpY(;>e{x8k{cw50#$(TkE`e9r(3 z7JdfOV2NiC0p@rHtzh0~un0$jWn=sQWZ|EA8VJ+#@((zYM0*I<|NW5h^x?lmRaHW` z;r^k-efW-l>s4h4vJ>CExK`+w9>*HMbY$s<2&uvdV?d`@6pfD+s%SSUnq;B;WnT@#K5 zW+GD$?n3ujETtAM3C6(D1XusOuj>x>;Fw{dkY2(?KQ~oPF>oB_m_Gur@VT$+STTS^ zsL#3-NPtDKTwIX>nGv6<^mIUa(7zxWljl?po=WlVDTPAG0b;-xb^eS%T$o4-GjI;) zS;S2Y_y8+_y95xG{a+*HsdH_KU;_Z9bpQIduEH6piT%uv5)3qkLC4R)m(MBV?2-o# zGXMbQ+5iB2%<~ITtYyrtC|Cj!{P{A02ZPDGaWQ2&+YTn zNPY1CHbnCHArL*ee+dDr&V3IU`mDJ2&;Q9}=^=3ZIiSXO&Fv8s z)Xc%s9Zx2&;s1+@G5Kf>0l7{J4K(!ZQL!Pl0pn8^rI7yTQPw&FVzR>eQ|xarL0m8^ z5jY?tnCd@xAT1b_B?PI!U>Y$f2nJt}fwo{>icAd(fVE~UJqRBL3z}w94YUt4zN`*vhQUlN&=zbHg&Bbe(f;ibS=1jO5CQ-|h4H_Q&K?dzty{1I(IEU| zNK$M*$io2u=!5_Ov436gk3ql<)Q|J8X2u4Vfjm#{UnBi@m%ONZT2_O_7!nOifNe37 zEReLoKmPmWV-0#-0N@+zb3bPNL7=GnHV@*!ecoL22cYlIvEh{Sxd}ft-zHk}%RvZX zvj6c@Hg)Wc zN1k0kV)^-tWaD)(axz0Fxc)ib%}($o`ZHXa0JnqxmECNL=hgaCRewIkA(MR431&zx zyMEgEyR+asSW0&n!Sb*~^Q?p2U@cy<1+IoU`)(IJ|6ECjzzUp0ZU7)VIQd8&^6x(X z&kLfu(BI&P=Vzw6a7u{tbFP!`nIP-`y!bAr)e`u0%4t7sdZGWCuMV9BQVcudT3I2b zFzECWvIv7J9FSg^eIjm%#`8@;>+Zb?c+!FO)alIsp7&N+A*gj(d=LVd+f9NH+~+f> z`<&7{EuDh0ibip{=Wgx=O25RLX!!WDk@{lLco3>-RVWv(1A9 z^E9Oi!dyaOL0T%Pchw;ST(*BZ^|wNN&*q{}izDhZklMk>) z_+keg7%HKM@+j{5;JsA(tYx9L0H|ysTl@eC2Wo1aaz|8EoKLw>x9i>+7;ok>g>G{w zb!|?Sr$+pcjm@TiII1k#M)3CLhnTnu*OXv z6{E4WtRl`BT(+|?kbCM1{_-Pl*aazjJ)T5^j(hs+M2=zRFRbgSJXLoK_(X4@ zeZTOv;tKp{KoULqc=U)l(-n6&J()6$*>&C9jt1qkz z)@Ybl=_JfQSo4lXb;dALzeH_g|M|Ke3Po(R{Gc8aRZnd6D)HOyM#Yu2Qyv*WbbO5e;*a$MT=mPwT_W23xsbU5%}YwXn2SzGSOK zeGgv9Q8Il!WM#Nn&ZuF!HGIqlr0N&@V~@wPv)pdzM?nuElb-hx5@2r=xhJECR`=u6 zmc9Tr0tJByh#k`M^AuOt0)j;)C;>kt{0D&4Br#LJJje6^tCFLVG~q5MUGfNq>DIM7`rlO;Y(8?i2m!xzP$$wZ-InR zI06Ca=)Z6i@xdQjk-}+6@}nZ`1LAgU#aTG}SZ_UDUIr}26pyUxvbI9ULuPuE-rZ6) z;#TV5YPkfQzXO@9Vr#NVA$ z3~*ij4EORkp=o6nim>##HbpAd1o^SSnCE^=z=0uME_jwbQjwBEQ1CvNf6?Lvyrv2{ zCyRL=J9V5<0&+vq5k@#PkROhku#acBTRFg9Ir<|?eMyw^o%5LNhxdCEI};yf6@!k< z<5%hEQ&TtJ~Yd}QJ(7DVzAQ&epUC+>dU@Jhg4 zd3Q7qAwyB8^qc(hJ+3Sz&)RZ^Zw7W#QBen&0{RtXORup%X0OdcNj)EXX4&pSI#XDg zA70pg6!WKItCbe~u{)orsx1z7HhWh_S1TD0-`>P0jN>5hVKXjbq<$*HGctuVL~^%y z46;F>$D^gKi@T4#TWxR0$8DAIE!&J2k(D*@xO;#B>?${AO0^+#jZ0+6ntck>qn;6@N z5|`uOt@x|R9xjl(YQz-tS2sKN@?rITHp9Nss(?FF53{Ec?}< z&VIJs@8@oTf)}kBfiih|>jmhtXPHKCc+ZT<8stzxZ|$9=4H-Ngl3@ zHzrsv5Nr8}1U0v^$Ay;*nlGcwD*NSSIpmD3X=cbOH)3rM40i&q@ni<7LpnG1SxKVK zLR=gGIJXrI!SCg!z?oZGl#AK^HQ3zY?L|%jXx-~K}<~E_(3wb{2e8?oZ{Zb z6`pn~w?;NJi@u{=37nNmCs#N$ihYx~Qev3L=9eGD2i=~7I70STATh_e*Hd5F&qkXxG6em(Ymv^ z=|p7L(564{Ox>NgQKuJg9J}Eqw-@SDSj$P8&XLSYM*D@G%9)y9+sZJ}a&$7$9D~Rdr~mhh z1{v{qu}rM^?5!RO{rbZAc3J!b-C(Oft0e&NfmSEyhtF(B!E{TxOc~PVB@$W?QsXNe zbZGgGUT1$1@ehfqcPzh%`z%2Uc#`etlb5C_erHbHo(|WTKawFHRE+Vbkoq38Z(F@y zCtXSeLjhLBpTe*MRROdm1_wSBC&(GZPPKO!Y3>^=UR5RuN#)4g1;kfQh!r*26~t(v zl;ixCIJ!OC$wQn(ARN14h%dMKNT<@q2Gjuj3*HFF^8+oNWQ)@$!L`eWBObbDO3eKw z6v{yyxL|<)pG7j~RXTDHw*YTM>k*H2gkF;0o+hX8GWtEcqhnF;j2}Zo5w<_JBFf=6 z77+~xZ2b?SnkL%SuIKOl$uHe0Wt3S%BG$0&xF@n^xzly*7IMp|^LIq{k zL7iTuAzd-e_i-6d`CbJLcKz0sw6p4j-PklG=*-)70j9njR6X26W zRn3+)fWNr5Qca??A^bl4txsDpITwEp{#L^!K7N(-Y?cQ_y6@7c1(bZ`{C!glb@DEz zgyvFX;bTQVvtFq{{4dH)xN_}Z_LERCx9JZ3AI-xAj0=An7QfB24iy@VtJF~q5lKr4 z=NkTq@50$-G& zUBJV;q=>)nh1vX>i7)X>3+34ybiGk*C&{@7il}76P~`c-QY#D)2pJiykopJ_sF+$S zXWogv7|;^=7)iQBrc`~oHqs#j5A^Hy=?DM>6d|Y|)M|y` zsS#dzSN9Sw<%<0#7a^TeVb`050#jEXTTLSu@HAMGN;;zuC^U&%bF>IsCxq;cj;hma z&QUXgWjCcQ)`D3XG%3*gb--9a(L9sZQ0R_Gg?Aq z8&i(+vn^+*vkqRVmMeeID&#g&FZe$3 z20^GwQB0bMMynX4QDnD7+=3d0vGC)F4}W4gIv^3d?At3`O)SG@4t?sAD@B|%(YBYu z`dtxC#$QwyPvB`7UcM@l0L;xfVl>iZ8on3TvZ^2edAX* z^c6g@#2eKvP07^MTYy}zIty(|GJBem6vAG|b?V93sN4 zs9BNLZ5uCYRGa}Fv)cywD(gJ}H&+N(yYvtl8c>PSz_FNg9}kz56Q6PC)B;`0O2xGz;I-^G{sj zUPe~BxcQk3#-wDYK-V|XIpc3%2U8Kd1lSp2xepHi8Y=7c|J zl{~M=>SLjex9A;xgA`$Lt-}p9KtBn7l>=>0!WU?U?tVNKRx7CS^j*D&SDg)<%X<8@ z#QekLEWOVXjq(Uj8>xt#qZ)qpy*|yS@N(==we=*}szhGKvjGWo9vv>z4RFN=3E>Sp z=Yu@{`B8Q(hbMSWH8Q)dgD51~55xgQ#ocG{ORL|ea~_5i*MsMbWML3aA>X2-? zJT;uDpwt2*48(6%^iciy8%iQmf^REMSEoDaD__{)NcpRr5SQyoaTtBV#m`xeq}-UX zw>I8g9S*5CljCgYkSNBN(L^|{@)xj&cf$YvzP1MuAH+4{pIE+6XB(`E_6`MSNX^Qs z$ad4eysmtZ+ME{rW59sdzsHA4vVrR+pY`v<5LEoc&rqv5!z}XNf!?P67ooRKHZA8NV}A{~K0cTMF8W zg(eIg#bDXA#56-a-_?0Wzk)wIAE2nFAdH>RCLJCR{eI2Eb`y4%A0Re!7Rx)s$)wMl4|pOr?jvXs)e6M@X!$9(4}dqu|>G+^wVzI8Zv5{&5K#~ zkfrhY5rJ=`5{Gy9CBJz|zb!9?5n8L@gh8zU$S+hB>0QJpGF2Ql#=m0Rp{lu;62Csb z-a8g?%p_$*cG5#~v0z>x#lXwNM2$<4Gjx`HTbve7@49kNr)^*YE^sy>@kh@3H8*jf zAqZw;$ITZM;E888?&M*ist(UWIwvwx3T1>xXNg0-p-@1M4&l=%Z5aFNl^F3M1`Ms$ z+VW0c?M5KJIO?(VG^#T4;U$R8%*Fa5rEWM~=yDi?0K|2%l0je)`_8?ZjX}M(x!M#Y zkNKxR#_SWST8I%G8Cj^5bAngO<|`KakWk=>(JZMabHk(RU4RrX)_Z>t#a(7uVjX`8op!P%dzVb+nOKv1OpLc%+{E z+UEL;t8!sRVV_XSiR{>m6Di0=nKBQ~gZ9^qxU?Hs*2p<6!*;|;0NP=#_IS5!IipjeJReA+Q;`kA0T<>FNwP zG`o9atP@9|-rq}l6M_*EOjveLUcJP_m+Vw``_8pp@WCUT^a8rL2Tn!9*S?MnYd_DfIwDX>H%>Sd7 z{(7)sWbs;)eqG*q73-^dD7@A+jTPV17yb{IF;xv2)n@LW#Li<*`eo$FHMCrJ&%1-< z^}09+W29dAic@`jzihz~RuydNt_HsPgaKA(>#f%z#~epUiazmQwy_j+dsWRO*3z6} zO-7T|WbCrhB>u4_v_^`9@6!iI#m~ja{ELxxfTVlswbzeyEXY6TvY;d1)`LBoPQfuY zX)eR15b#Lsj-%n1PmzP>jf5SUbQe<_V@q)cbZ}qLP_IWk$i+CSiIVa>KKbcffYR3r zV#`fq^NCD2Yfg9cJKte;>1g}7f0Q*@T667kIIy2VpcCCjAXg;{d($9Mu7^!@@JLVK zF|T%)*Q>s|8X|iY9tbYP`YaqmTp^mXly79akDs=pabE^&fV< z`W-?aQk7QsMKl6Zr<}uZ_4GR;!^=| z&)?)_BC*2`*KwDCfR1UlftNYpjG6>f)Ldzp2>an)nKe z>(mjF7;GAms6_0tH-MnNMw$Y(6)=pt1G z6_N27IpZi$fD&+hsnn~tfZ-P#P;JqL%5lEg-#y3x|9t~GX%m$`Al>NW!ne+W-`^(H zqhikL%a=+U6iV$>2r0|yqqfZy9dgL&F#h~iT99(6VRk_5)ELoi=~VWZm_bk0tNEkm zqy(41eD>PaSlxm0=ePd1nWZD8-s}OU165URF_Eqbonl=Bqc5?vK?H# zq|rGsBeXnX9XJ^j_1)D8l%W!>Kuk96A?b`wLlfe@-oCQP+hZu!k9CnI@lfp0<^UxW z_ZWDK+sJkhk5MVjB=~xOu7IuGle&VZIigW%AysD!Udl5zt(`7QT3bfFw~mbu&K+X| zuAgR(g7jgXdP}ZsRtv$SyC%RDn-#kl;ulNq0*MdHG(Ym+diDRd9zjj!&F#9Jmtn_UYs zt6gXGV-b_G&zI1L(XC&9>JS^9vH-S)(P~9tG)A$bx5RQRVw3KqPqFnb^f*{523fgv zUqk5=#A8J<&Z2&zE+R1z?w$#&&};7{nb%Y6Pi*t@v-5LUI=anYCup584bR!ae-XsQ z?|OA?1u0F`#2Ree=&+O}{@LV;_wHa6pE}M%+4pmEzd}B%Y_mm^>SXxXVIITWp(>G0 z!>Ih)sMMx(6UIY!;$=N`V@`dp*IGag#nb%@=-d3{Mx8H`h!a$h>T^ueaKf{+&Q=)_T-vao9{MC^1A*O+W-fXVq11}uanZMBQ zd?M>q-bf$N9CVealDa0L%u)t+AO(WOa@;FEH;@PeOVKWY37T6mNkpi68!V!Y6xeQIL+8q;(|XFz{@t0tr&PX+S-#WpJM4>dgnVD9Z2j{#*-daX>l~w$B7qE z=Hq?6n8t!QVyK3i4V@N`l3$r76OTg+w8uFH{2<&tLbxkM%(k!cBU%N8j$!fhxe z=^76*;(3oH(zre&6{&K z=Dma{gMp~3_0KOD?&0@$mlW<~B*+Tor(KVSx5>j z;-AO_Ski_4svXQ~^4~=lnXQ-brn%7~ZC%gFjkFg(O0rRZKc{^44M*P=sGcY0zBh51 zjtvVcNne#AWdn%mboSD2v`?=VeV4zkTEI&Bq>lABanOm72C)s5{uB9Hn<2Uz;Jaq1 zk7tPTAUFBqLTYQLql)TmBpvazqBI!0ybQZWN|G)<-^KMO*(qXX`$%Ti_$ZybW!8B} zDUkFRz#nauIN$f?r5*HshCyXXvvgNN#_;BB<)ha$a>G@Fz{Q|qKR&*3Z0iYAv|?PB z-4EoC?d#awEQ!=S{)9ZOXPl(xNrEy_lPE6rRwHk?ON*hysrEZ}Wd&Yq;7_FUx*AcQ z;MC>yq=62vL&~-C>ztyt_gk#`!;!&PkR3;x+L|d6uZ9xl`j1ez@+A)L5tM5OGu7ES zJ+r?qE(e#!+=DJH-t4`EyNTI+P1I|(bgMjXZcxQhYTt0Jt0cb$Sss2bF^_w-FX$Jv z??zmkb4094cUW4Rry{WAvWb8cU3d6fC>#wF=$8xMEu-{TC*+;ln!#d2dqzL}0bgIk zY+>k45#$cB;KT!}{in%P{41a5d`Jwt*w-_IKJg(t-ZHI)JnT1gKD^=kufr4;T^o|D6dDon zL5j^LC2S^1S%S|5eNp2hI3iK4Q4gDC%r|VB8nV)+G{M{Tfb3BY{iuUP3}O}X4T`bBf)A9Mx+BK@74I;M`3clLlX3~i@{3GbQVOiAq4WE9 zO?zWP!S!ppctyx-JEA%4lPUddlPQ$KakgO1h)c9DLi>l+i6P5^`Cds8d)=}~0Gy$5?Q?o|!m-8Efel>inDJWbD zQ~14{M7q4h!*mQUplu-z@(+JYFXCp0F@c6Chc?5`6?`iBhGmBPP{3R1qb@)}rNKIO zu5h#xifY4~*exwwI{U%!rDV%gaf!jE^@DhG|E2VOn}BGg{-c+h;LqBagyfX#lsB1X zY9~s;E>a>w3Y@u(>akgQwp==cOAN&f@o!nL9Q5b~z1$WM3z=q_QleaZs@&(KLftuS zTz>pS*A0-Px-DDL{^5oCnAwajF|$9|`@V!)7@9pwREQm)s6qT*_g*VqpW>y=wWHw7 z=Nqgr<6!&>f0R|-$*S4BLqUYVw*lo#Y7WtkOkAw_=Ep&Vjhk-!ywBn0iT0@7eFFMTsD`XqZwz8%P(&{x zyLvSFov*EW+M$%nD%yK(n6fwiW|7_L&E^qs^&95or;ymN%6lXRqhC4*llz9Acnwrz z0%W5%1>fqL=7=oI<|UY+8M0!|uhKR8lc4sR0m-eEd&xt{pJ-IcBxT)J?$C@aEvlst zgB=BC^>mu@K3Nlox!RTyf|EG#5N}FHgF&)1)a*Y4Jj?L&MSDIpJp}NiEQyS=_Xw0T zut4n7q_Su}XfE`0f1Sh*U5&%?BDV>-s?p;C@&evne{oRNX@yUd^Heg%Mvlx&>4i4e zr1W-Nj_;ewVS;Z~zM4iJ>q~ z8;xj;xJl`s_(fExUY^jk>$gN{QKEjJ*S*IDg(kmri6V{} zaap_9qg2&X8?VcVllm{S{8}d7+)cC-=Z!J8S)^PbG%R3gk z__QUg!B%4cRO7;c7Ck+8F658!KC7pyCkgJ5u(~zUBYK{3{g;UOfi4u;;uhU(kt zP!;ySCuHo|uNnC!H4GnQoZt8e>;_-E%B2fO2G?1=Bo&XzD6B|?savb&!G z$8TvHy|i<7`&#ZNC`33Y-xQP483#<@){8I?a5S>+ZZxNadx{0+w zzW+)2ckM@^6IB#EncX@LD|`uhsrU3*S%2>Y**gdd)A!<}^cr6Wy(83t=iWuNsHyyu zu|lJ2h9!uC{}#2*Ewi81CqhGa?}L@xd!AQ<0HoAR2^6CX;Xm{eP#*ndQzbCx4+3vT zWw9BOs3Y0E*}nDdA`4EqpvF z$yIKYBWKT%)=O+Ez7byNUmB6|cJ8O~no(F%LN0hB`8I&Jw%#5wO4B~O8;BH~RPTrR zD3(%_1!6MEGU!R)LRBofh*Aswnzmp~7@YEqN&4iAeeHYoMIiPU-m()0_uy?bG7Vlb zX{ESP%7D#i&n%&pTrW9m?}srRgb7(~h6FLz5P6FC_tm4N$2qcjSuu@K_U2jyi%oXj z>MDi$Bh&*rHlc|}%UFJXZa$uV+7yH;B}~U`E8|;R;onB%Tc8Nb-~%O`+X*for;2kH zuSjUS!c^>iua+!N!At%PHe+@-{(5%i(vBe6uUhSRY)+-en%7@O;TEOr)hWaJ4uksx zU*_s`DJ+ASkeb1i2@I0kO?DPI>tMgv)ReyEMB^;&JO)<_O!CO}U^0fMu)JVv&~(q= z_U-xj5jiGq0;6gM$T9bKtCWmQpN^iRP>yx{=mjKzcXu!WVg^@X$|pVDh!W~@c;lEl z^84O7@(boctIH)ysE09_ey zxPe@p@A^a?b+5Q~Jb=Q>sMw47H&mM>Zb@Ym?8SBGX1=TVof&9h&J4yM(&VGT7vW59 zCoZ_rYi1v_hFflgT-Q-W{lRF1$Xsq$l&sST*XKfe{-~@x?!8~CNff#GkgU=q2=Nt<#ef;8OH5pEl0W_mjXuQq~s0W^$|Ir-Lh`Jp<;qbRcN+;N$M zsr@Ey)$4-5h7@Ip_umNL#;ayqQF|y|&*s#uC7P?dJW~DGID^;OBi#SqYeEG4_a;eQ zV>m<%Hu!lT3GsxD7=QQ-L4Zw`2B$&-U<^p<5Odg^uk$y^4(#0s{YuCtY@SrQ8shal z6yJJ=YRdOCEUf-Ctt*JbM@cZKAiFz|#W7Pe-L zqn*iQ^*a~A=$^9UE)bLGZg*Luv9M_On9AfFGxE5iHTef7D0&d51+l2d!Vk$3M*a#zKHH5dj zH`w^eC|uS~uUPTg4g#5k*E$JKXiG0DBg^WIiCXu&kMcGy%elzfVl$W?+9Sl=Iuv~5 zdMFxvw@W#4+>C?DNMd4lhp?`w*;GWQyvFS*!;WGu< z*+9aB9tNTu6EL-I1;YFJEkcy8Vj|nrPqcphU2^lmSn-fR@oVSw8~OKJvL42ET(#fU zu~KvuAKB(Afhp#`eq=Bn098GSMZNfXwT9Drr_-Zi;Dlw^mkez?-YWCCCPBGsihOkH zaJZufoxH?*JP2ey5o7YpTi-GN1|ZOg)`$1tj+avp-tX^jIE-$(;r(fFrl=AH=AH7o6 z$dC}3#y<`#=&SIZ;bBr&Fba`07nU@UT$**NFYysDuz`Lgwu?Tja$>FQ(6~%`sY8U3 zJ48}+!FRLp<%|wFW&{yAM62@W2*WSJv(R(OA2X{+dp{bsHy`dTtJ#GVGmg%^yHE-f z*9R=$(r7`_5Q9yaTl{=AZfoI1>X)Zhr{+@wUd0~Ssf-VeZ7a&w&nP;u?B$Eagi4Nw1h)xt|D&{FCRqQktt|p`?vQ;>@v51p699BcSB1_bK{rBgGOU+3vlW1^y6M-w+7xe^d(uYLwU z_(QAD&y5?C>kPw`(}Q2Q!x(GHr}3*pry@a#48}`n3@Tf2M9%=jYh`iBYZlyDw+QEu66m=j>gx$~g(0eW0jSMYbo z&A^*;y0SA|X~5su%$B{9Bt<;MBekHE0%2xyxvGmei?TMxSDWQ|?UPr0xu!xoGNLc= z*-3Vwc(VS<()Hadtx6bP!&j-3JF+Bs=7z&jTI{XNdOr|9t4}H?49%?%vI!$idclTyHb97&=q1-J4!p{UW&%3^E}W^qQJj&N(7C8EKWnS|sCAn_56O;}~NTz`lX9tHhBTMl4dSD#&bGs)q^v zJ2JY_Okps?@XJegeNi&bSK@>%3om}EiMwluOsE5?|84#DV=@9Q zT3NMzg4xHoxnKHh2E-%-yE%n#^Qnqi$)zWS+F!r^lQNiWJyDwHto8e$sq~L4Z-tpx z^_RWJAcsF(O>!7q^tOCAd;8}@$_4>O!H_hUy17zu4q@k+%f&pMjOyU$1C4L zEo`;GU`7`4EcaOscVDAP$t3a^>Hh!zdF&+OJ3_yl4kS;tAeB`!G{eAT4GyC&AZcy~^KlUqz7;<{ z3eOdrk4g|lXDqiTnO|N9iPIZA6dvbB?Qb2IYY2!qH^a4Nry6Lk94bM4YdhQs8K!Vi zs}^_2TMG^2Z>=1lxRd&ZyBJsJP|24q2gjbie-J94zOnLH6VU~rJCOu(XctFt?E>3^ zjnuGT*r%8-u!p34ePno?P?bPX(yv`9F>lF=9gF|S$`H1Gm4)$#FKDRcMrfGU(9MR|1SRliEV`xDWqk18 zGt(%3D^n8TroZ_Ty%sb7#tfSLPO9ks(+96F$Rh?Z5)7O{cqcZdEpu7fC{qYCo^*W6 zf(3L{+|ISyLk3%@MN5AWxrkK9!|+84B0ic)k z{>3t?*3*#2uaZ7CxzFPqaEz)D^`XdWTsqe(5;g0J=c52k0=}gt#2p)|bfjI1WWYUD z#NvE7B^_lo6Rc%7(XF|b`_9kwBiBMpD_yVmm*Z2~tO#D4z^U$#YD1E4@wCA~yB!HB zloolAzJx7596epC^(a0E|J?9=A9qm|xav{l}x6m{u&r`t|lQVn!wHv3b)`@)Y z!1IKTvpg@eMNOQ89FPfAdBuRnuE7p<@ST5yV%D0q_BRtG=j=H)_X5-WP`q_2G=kMV zL>Z9IXjMFc?K-w|VafN4A2vwwbF^$5vrRnuy(e6s1gggeE#MK-H=Clkog3<@*897W z=z8PLHkb)j!>oE8F=qG%m!ONp+a?MkA&GRQxFzy$QyKfyzk3Qo$Ggd6Hjqbu)S*1j_tQX0BmG>rKF7Ya=*Twl6ZmZ#(L04+YBO{Z|lWbH zQK#XYOXq;i_hTJD4NlpY%Ir&@>i4UfcQmmL8aQhbceVeh3gJVzo;*)P21|V za4sWmZ4|D}*vBClKZ9X!}tcv7V^5c*%EC6gzzJ z8mEjgIXA)zEc;TWHQqMqJN*2Mu{3VJb|ZiBkxzSx61e5uDqnpJu(y|v>2PUCTx$vc zadP2^hGvj@(Qvy`8EzC(AkpG%NsY0NE3a1zXO87sqBAG%3MKgnaJ2fE@67z(=Fo)Q z^-9MrQ8;IjbYPasmaOAuM~jI#2x50hR^+S5vMTKQ2k@2^^15>fc^X`$(s< z>vT{f(Ml>E>y56E2Hqt!)d2O4@G$&ltXII3@h|~leni6PZ5Az)Z(;KFKS-w0l``H@nNr)vvEHp)u17Vag z8%KUgQYW1xXQN3pz;{zhRaf;uQpZjh5<#_Y@FF%_%8NfxS@SQ)$b9IUyxx|ypR-;s zuilyE#;vBU#pwqsu-?xP7OhmCefy8=6M=yJaonuQgaz zui?U?%WP3bnKhKQnRArvV@#D@qx|~q)yiw4{H0nXfaE!&E3)3iKn~N0#yFrzw~aw= zkQFBelg9FGdUu;eWQ5mTp1k48A$>9*{CgE`75@LPude{Bs(JpW@1?uDySqW8I|QTz z5ik&GDY>*DNW%d|L?skKKoCLcMvxQ)>5`NXDGC4Q-V69%zrW{yAKypcna|A5&d$#6 z*>iUHGA!wEL5e*P&E<+{e@2jvcwxyM4Vny7momlIBcy#IYR4Jusp5w;w~n16rIaIP ztGD!OM+evOtt~m3Tey$th}#-H{Fu<9)R+nm&B$sF_%^tw)%{_(cIkT-)0h1JfMdjD zJ+X4)9ym}e1!Ldo!f3knbHZ@>z-K=*=nqa-Dr^rN9)6zS`{@q*(@!S#f*HT_@Z%=a z#Ny!8;U>EFZ^^Wk235|GvUN9_S@Z1hXHP`BCor2=qlh=6;tV>xV+}e2tniK!-^eCj z_=^APGKmCKRVc!NprZNCQn7P%*i@5d!`Suu@Pt>CcgrDJzY^@-fzdI7JA2wJ)#6{mvH<64m3;b*)O|l(J3Y#OY+!t>-Q`y#{W{b}tk-PMUnR z$<0?@?e%hpn{;ARu~6;avu4`?+|l)9c9qy>1Da)D=CCA9dkW?G4_=H<5*LMjMD(w} zHRxDOsJ{O!hrBJ7>3-QEi@dxObEZWAK^qe+^n#ms{8U^{z??xtA`{IOz~4%mVn;`z z+_crAA=4OIZu+Vzf;>?z!?1{7+&=RQE;&&m{ZcIWT-rK56=9IE)-yjaFT~^FlAiv_ z`ZDd*%g59m;hCmY98&<$F=i&EmY!d|a9i$mPu@T`t)_i`&UG_JNW(MlrlOb1aycQe zHx{JH7Ab~rLW8QP+M0btaNpcFsfrP)p)8!1vc!DfT+oR#3UunCGrM zj&UV_0CSV%IFPJPBSV3pw~1YXgei{&meq8?61hT75pS4Wl6?U?JN`ElBk7cB=P$)H zy?_7W?camK;v-CKap zAA5TH7K&MaHZM12j#wK{b@d5|6#qJkjlcKOZ+d%5X~hrrh~RG1Mb8$74~9|L*Dml1 zq~C46_gO*&ov8n-kmnWY>Jngux!{BHvq$aE;w)b!Gn9plT*p>#xOw%(4%THx)q6^z z6I!lcbb=}#GEj0TebaWWh~2*~9D0n_cq}sUltbw1T|sU?{#R3mGs512FJ^Wv_UX}& z(5h!QHi-vj0%l>2FcV>33bKPu;pInT+RZRiZKr*~Py56{&SEJ~ZJNW!Z9Orf_8OLb zGGn1zZkFSLG(98jC50>F^C9BI&B+B-If`j2CU+7eQW8~JrIM>kqnp;Ge?CsVNg7M9 z#2rY2#hjOUPdG=;hW{a>TJ!ZAX5NMKISE%U=3Rb1pl5syhVz_vh0P?Aw(!ejTpW|7 zhV%U0X3u6KzC3QapPFLxhSxf-bR^a{VTC;m6qcB`ss$d^n&M)k^N(=oCM>>^`g-Rx zOmA4pu!%5PynWz`=<(<2GM7xf$bQabmTWOC*Q&U~o3E6%Xlh^d^2ha7n<>OTP%M2b zRGv?7zGEd72f$ujCgGK{7b_GYw>64cE@ilXLD0G3K!&X?+q?_$XOL+gQ+hDFOW&sJ zhX-Rn=4;%q18$aTRc;C@Z{{Husnb6>6z4-RHPvw9BapQh~b3k)2u$7t)Z4fZICdF%_`oJt1))Vro>LTB~lw2vr zBWGR-!ol1NHdlLj$nZ=h3v)WsKjJ=M#MY>|tsPxy^80m8y_e%ND}MGjzo4#0(`aTp zwBBa0IoCI$25pRrx91Crt}j*V;?1&L(V~D>WeF5Vu_?sb)Few>A>8&L%!+?kO7Yc{ z!!1{99E(W-667a@Rm$Xh71Jh4U-bG~W#7o{XJum-9N)*_{M`B$GUuHlda_z1lLv8m z{@6;}U%0wc)9ssv2OSr?oB?eCDP5m{&!p&_1nl~NidUGU&e9#BmcPd0Bp3 z>yzY1BKK#EwOZ{ungHA;i|Z7@e<)HsqK5Wx3+JLEOQWJW^CX;uAJnnXXsSCDu|h2_ zPqCR}oJs?I7gyCtdB{FE%Bq*){=++G3KaZ~?6|CI)gpvU$>fPK(?`ygVz&3n(| zi3MR+(G4$0nlf|_xu3+el51B18O%Q${X!%}Hl|>fm{!-5yrb!a4 z7n@?}nA7$CcNegA=MC`<9m=CsR`MoCy?*aI^ta;z6dk^7xAa!e$tw1lxNy8E)@+DP zm2pdwVGb=Gxl89BK{MEa5#J!S#*MoVnK=-K>7XfvN2Wd&AjKGtp?FTnEfM>R=Jhv$ z*WdJBXP9{D-TJ1#_GwL1GISZ}rxl?Y>U7e?c=mw6JzB4WL{`KkE<*b%LF$7h8p=-s zl%I++z6emh5xY^*kufpB$!ja-m3*r-*(@OO1voj{Cb>Yx`SHNKL0hEdMk3z>6>@SG zT|HQsjWNc-a~iyhv{_vFmW~xH&T&+ivL5YbX|Kpyb?o3)vo1! znXGNb@A0}Ox0K!0vEv(-*9K*j%RJuQp2L-a^}DW#LO2UVUl6N}eM+Wgc|9*o$ zMCh3d;{7>ItW8WG(XNN>9vgkW`B)y>p5u6F6gP7}KAoOrjMO}h*QvSdqrE2eT9Ny& z2AI0fgu92(!*t#KA9<I^h@use% zOERCo$o-#-%%l-so!@xBe>W_aRJqApo*qs$JZr`$dT7whkaEu=5lcfLh0=Ly>!kBq zyF-)#u!xr~bFHo!S%z34}i9|1xT! z1=ke%6y>stBU*b7Spui`D*`tU71nc_-S-Bb(NvTsGl*##-p>m2q2lA8DHu zns;~GE*3jKEXC{k+|no};H*Vm6*z4rD{SN9XYWebI-PyVi45jK+kC}2XNs^1O*yuP ziTETKgaAt zJwA?m08#pr__;cd%cHaoO^v;Tr+D$z<6-0XpOSz5Ag$65)wJhnG@J3mGVx-prR4nr zyP45ns3$bQr0;L_+k*4@ceG+)nrvEeylY`1xfaEv4(__7g5mA84d9!(oJGb3xkFTd=K4H0noNQsKN9eqE4{)4PuDnpaDYS-3_9 zitMdJ3Lax9J)3E4tn9MA3w_H#O=BH&B)ztT>3Ju?P6?uRD>V}P=R$bmWj<`{?{_HbX&L_E$_hs!D>2{?vcc*mUTRypwceNZ~1j=Y|zunQ=o+3*M!kTMo7r7jSA>L9T zs+4i-z#dmf(kH`ZMWhI_?o86|-KaPLD;4ff`x8Sd-c43c06eZK>l;7O^&y`>Bp=a# zmT9CNlSyVGXlb%wpFp%IOW`E&{#)u{R;OmH?tBay=bJsN%lu`7_mZEiD@)3=mJdQ7 zZNv)rCQq6VG(4-afBC!->ckUgs-c!7hQY-%I&JQ0|459?nZMfT6-5JEUf<8kG1%2t zxS|5@M#OHFW$L#);@tmZA<|7I+tv~SPWNi4r+KEt>c3!LnIxV{^xjG%)24oVq(W?C z1cW~IZ4U1TuDm0=f1l)eNxkzmA7ahPvS}e1ceDz+@}uaYy_fIsy7>hCN3KDfMeMysqX0bL#<_}5-MP|`Jyp3{ z*%55RQm#D3()T^x0Xz?~*TPCn+foiFY?rofupjdNh`RI3Q{8h#I&k#$P9KJKQDhUP z#EHr?>@YFPHoigod@;-(6KB<0F>0$+oss9=;l(=G5vhYSVtIIPjC&%+(iS#3VR>{+ zm&_Yj7X+3r-JJG!60FHB3g6&;xB2KTlK~(7H1KJ3GxRO4lG(~M@h9i~0#Bmno-4yXl zyBbft$5)4bpQl6qW6mnno82t8ZxA-)=$^|aDg6$T{fd7zDqF};N}AImzGac`i;W~e zWufV>!r%WHd%>i`$X7MnlUC2fx7mB)X9jxz4+8$PEf6s`tgxpCY9Bhnvyv1O&WfLo7`OQB+tp-1+&&L0$p;{e`NmzvT zMr5Z}4ZpE}*!9HAF$0;C2GuF%nWb$OyJ3Yk>L+zvQO~;-XJ!n3*@yGKXVWqE;AU>y zYI$oJ(9{N1bRaj3<N6VlR4z+})JzGx z2S+JMIBXGoA}7|)lNOKnthVbqYo6Yjr0)()@!xyAH}U=0YCHI;$D#5+A2Rf*;CwoL zNuRBTGk*F-La;hcJn}HBO5E${ap2bozwm%f6Y$)&QbQc(l*vULSh2aSDZLX#uw8N@ zu}PvKebMck${gs)R|N;Ko>4sO!^k7d%iFnytNT{(?c>o2mM2@E_!(i*@4Ype7Gjt_jQ03?$>i4sIhV(e>^g@1 z^?b^6zyJ94{3i9ohieh@<*|i<{CzM5vm76rLCL@i4bq90l$(b1^f0|=j;e!0c{lxS zB`s2S$P{hyHSBnc`SQ6o6bq(=Zl*VU#%>nKO?!|mT(~UQTKLlWThU6Tx%psMzJqwq z2T|*x?Mmk*v*vpmZu~EIYurX3WOEM{hqh!|vOWG)bvO4~b|`cgx9FFOO<; z#NxyW#M#FKtG?-RHj-Ch-d!@~DHi-l$Zi3OvB~v#_6s@jEut+gYj>X>3vSVhJ6$XU-fhlWdJVG<$!r z+kbPs_+}mEaw6jY+ zh^du&Kbc#MJTlBDbh{l!IjVb=yEuJ7Gwq7UU4fx-p;x{EU4;^AJ`A+1Qo2l}3ALjn z5|0m4qEv7OIwi*=`1_}S-sG8*H(*N7qnLl}m_w?g*CA!|SUAb~m%>(^&JY#N>#2KH zb*&WT53?`6h{ftwn+_lk<8lu!IX;m{I*Ut(1-T%Yj2>XU^#c+GQ#b3Hv zzVRJlI&8;rhb!h5m$w;|YwN3m_a`Uso89YsHhPF6Ypol~G z+R#TGo`M-I1|NAQ;1?$xR+xFO1^p$8lSz(5&FF!A!FOhOCOM%45m)kx?Td{}8dL^3 zuvKq7;V5xff`2_k@g+_7PlV7!RerWwS@ztp*N0z*?#oZ7o93Q$qTzbrOw`mI)E%yu z+}*h6f4KMf3VPi1n8?+Ap16zA=kSZX6lVPBngGG2``t-*)X`f> zF4FWG;W>n}=B#i=^`yF`l6hVha*b|rR=-4s1yB^HYAxq!M}6m2H!b?e!9;KA4DDG` zZ|qAqktj18{e;iXy?6SU&qk(%Xey*AQdsR=)TFwav@)I>iBjB>PV$i! zFLZsxYb%u8U;bS?@fmyix77Cw5qv3kG^<3oZolU!Ywq(hvDbc|9H7qMvrchw)WrL9 zyrz$VsLd~<_P$4eeo{Jq??N*9NSVzrxSNWjsQ|C=G2m`qLW7-T23rdmqkkSVR={2r z|BNIRDz%kmW+FE`$ijzW{p4#suux_Y;nO0lTaH!y1 zdIZ0z*X5RCBMW2yD(ZoIRt1_OA*ys7gvT^ZzF5L4b61!C5af~gvhUMPiDb!29gEa! zgQq|^-PPAM`lzAXBxm-P=T<7ig933WBYC}*8-Y@z9=9Y`-CF4G_o!gb6F~zRE(cIv zm0`X`!4ZT1M{bSAY7OSG#Pa1)fu&E2*4KA`606$NFDMQ@%UEadp-*;mHZPxwdcK`g zBx1lEbYoYH0rb&s97>SQ;iEBP% zD$j*J-D!Biv@c71R09ca#JscDARI8g;Xe&1Y!VS4y@j0AK_-_&ugJC$_g(7s3Cuc} zrujp9JGR7K@|*lGaoBH+k@8pzt7N8U?ZrJCefqbAFWq3iU^eN%x5mV`O#I4D+$`@g z4R z6@CfzS;ouOA@9)D_0wRY$RmiTh)*7*HT&~xLTA`5+2sr5+BTKsj03M``bOeZR*;rW&MWylixOO;ylAdB(-}UTIJ~A@wyiYz*Awt zGvLXgxbN%Ta2QU{be;0X!Nf-Zt5W@S?TFCObXeerS0j*Q@99Et+)hu8jf=<8BS)Oq zx>MCE7fVTS9)ZJH_v(L4Raz1F~rk9JCH;=ZOUTR{ecmXW_VG z#z?3p`$(@NYiuQ))PF`rGI@dW!u`0nJ7UQT4K2QYBKuO1k#!Jes`E|M*!j}3NsivK`mh&dcebwGNdCS}d@+I1 z;hdO?^lbPEZ`L4l!C?N43$C3}pXLWu$9_c}+i+Tt8)g`ee@ZTLN(dfmDlPknnd21W`SEIU20h(Gu_w zM&GnGq$DqRW&NnW`)=(1Op;~4LRBT~_v7TS*s%U>VVd|#iyv|aME3~23 zgW!8x;>ExyRou*q7aQqmvfhL{OEElPWhU-u%jiq?7wC-a7GG8h-xe|x_dfoW-Kt<& zJNEdGcnUxpfsWzS0@_fmSIL=>j~ zB#V9N{|#X)zaj5*vR;4E-FOGJV^E^ueAog%C1wMM`HSEY!JGgSC6w+xaUKrl>2!dq z0LSk1U|+u?oKfU02cOu*F_Ekrf<4;0GlX|22 zPCxqAZ^wCc+Rc7{#-TYqP?>4~M-X|l!h6j*oT*bWz6G59QvlZr&e;L}k{dV!r&Ro3 zIESYu;_cyBogSWl9Wso38VeaJM~?>kBmp+!G-{xp4$AyK90!t&{Dj(NIoGlhWSgXU zKzIQmdMFXBHf`$8V-b?}r;qDr(+kXXa>nM;^RC{0{_K(}p7$kY#;OqO(#+c$+fy6e z3F(C?`91>vF|I*R4=49}N~`Lj@)Y zo769Tk^_K$WSfC?<^$pLc}Zzn54|?YFD8l&*;)eHRr=kY(_vB%%%hr8Uq!^G4x~d` z2fIUxu+xC80al%BUC^(!WD{2(XPM1EDf&Q%v*0V#Jsr487UbR&<9#zh@8kW!azpo= z=`cnWElgNi8#*nsqW~c;=Oy(_FRrUWLaV%({vKaN=X*rtdLD_Xtlw`B$;8F}cEwrm zpx?ej{-KY_k>r*j*#eTKPBK_(k{C+wUj2 zep;|%SyvHASp?5R=&gzy$Hp6_VP2A$90fdtO6i|gxRb^|M918|uB=##CePqotQ&Wb z-EIbG@u#!pCb!v)jPe*$+Kk!VOa@3e7qO*3Lzlm*%cdM;tw%U4*L1&5#jnjxYz!E! zcrhC71~y!7%!C?<2>jl^GQZ@f~b8;Q^2;WH&pOtUY+xVc%jba3kA*9 zU%57n@%PlT(w6GJ>oV(rKnl&YqMUO>T`5v|eu#T=RPa*`@jtbaC!! zbo*AY;Lrnuhg|h@$M5!2q^}e6ZCmYij@guSdmL#KZAm|xT9Pb_mtM9OSh7`ov`clj z*iGSLYq_Q=6JS;kZ}zyuBU`wNJn2Ab=#CcEtC@ zklUvnhKB;eMS~dGdI$!e&Ve^&7miUj?Fe zx^aR=8$xmVPZ49t_tQHm=5$tcu>2v8r=9#3404YhNnLvmd3b8ly?n@hEJFBQ zK7KSZdj8-6?F9hoYX~*0Ta~DZg+!%au^=PQ7CPL5y-t^6ry`_cFTjz;Dxy_$kN%)i9=n0EjCp=QAFs^c391a_M_($on}Tu;463WcJf}jKasdWzZg?CA62Y&<6^ZNSIT|PQkM5Pr5!>n4~};f zf!fgAYj=N}>*q^quZ@;3{(Q2L)r!AWU9T?O^@ME0=apQ6ox=9Ka;nca@7dLZ)eA@Z zzAq{uTRW>?rxdEMOA{PFwkX*>JhmB-@^XA%LN^KfR2vYAzfrOgY!%zOqEl0Q*;a4^ zkbeEn@2(fOQc(%M$K88@cfEFI1cPn+Of9;0jwgQJC*CK--M=aH#;jOgF~rmDr0JIU zHuodk_bK}9R-E#p4cZVVYwl|nF$3O|;P(5ntKNkq<~ze?jxkrL?I@J2Z%A9#(ryK^ zK6&Y`3%eBaS+(d==Y=|qgW)9)QE8s8376ff6s{K*+vb!hkW zYp(Wl5m@d|sFWrV?JVq{Y19-KcGA%Fn7wf2r%Aa*CEDKQO)|b`@+Ws$aoBZm4cZrL zC{AJo?A7_@t1m4njDLN&(8F&YeQeOb)p%G@!ZBLyv`hB_H`nHRU&Q#F?*~oocW)XW z)xPC?PzT%J-PsVnA&>dpp&6n&H;q#&_Zw~eS{go?>b!=JeS}FkKlgyRVoDcGYEI7v zJbfK_V*B0h{+~WB;tzDj>6HFKe&{Qt6+=Xn=(W~A7_b#uX}Qs>7dXBQms;cULYIe_ zG_CGjDlUp#_;pL4>Q97qMgD-hg!W}hhN6#eX*(%ki4o7m!Sh#Md)(c8A-+@EzUf)P zDwBt?dVic<)s8^fDB`GO$G75_d{v$?ZP2*u3HCGh!VhaiM~qdDt~|;&Z&~e^jdv1N z5aD7N_sa&EM1?%RL-(hQ%B0j^%SKc&2k`LL(|T;@c!AcWhuI513C$&>gd5V+k8kk1 zVd;kv5p2=zHJ@Os`_i@}Ok#HsmuGE8cOb(Z$}X4}vfdZuU5SGEMZ>cud3B%w-8ItvfELS_{u&5alpAjWzd_lH@Qp zWl_(j#MW7qZnJZkI_?6Ucov^lAf>b6WYp=uRa%*+Ip<7*i+4GSacd)FKEoW#(Ma1cGQHT zjDHIAL{|=-Z3Tx~T7_5D%KR-Gr6)xCp)7%L_V%Nhi3z%H~SW{7JVKG=#-y zGB3hZoo`pryN`Q%n=RaEPv0CE>_~|4dnNIz-9BRZvYJAZu}w)=e;iTr`?Ov13s3de zc#MR=EjR3I_l+(xCpq+Lu!Rk|V(+H2^$s1ZNkk^>`zZK!H1wKekB3Aj{OHfW3i;$p z(L!#dp{_-wvv`=x;l1*nbhe=Jwl3!Gch83rFlk+7oaZHrvn5)u-N)W9M)VcyBI7ee(T+gz{Cs`C zK2L&Bw$QM6`scd++n2>R&}|_O@&`H53)qn_6Qq0|DiA*ixrr8h07Ey9V;m7Bg(w*B z7A4wqWfAB%DB*qlRClLzLV{7|Nm1O$!XS z)+$f?`gs^{Udi64UMKrzKgfH96#XP5>7uz|S3GqDrpNu&*Mcv5Iqno@OR zm@uYy#@0d@_GLLivsjuh_Zb?D_3c}q+I*5PiBfOs@IyIM8jixUE^MU zga-RUhOmF=B@dql3iXXh%OoL^O1wIPM(Sexfl|XF8oav9Sot)=sP7d%{KUAU@y1Yh zBZ!-L;|mu{rfRGk?5P*=D~ji-0+vziCnuE?z%t-eYC@1eTs9FM?P5KnDE_mqgW1 zm!hD8X0!@ik5a^Yh+esGX&dP7e7Qcv8D{>g{?1X~Q2Eg3dBS~9PpD@WPh9TrOwh(azd-zN+w&RBTgq3EB#bNRoR^ zHo5%JX~Yqu<7BKfJxHAt)*i)cflA#Y|B|ZOer@&IGi|eK7oUA4$hLOkg1;i83a%}8 zR%3FtKINuaU0Lg^G^go+(bTRz9G4<9W+yyS=n~rKWtKj3;jP5`OOJ^bz4}Dh%Zy-T zkNOT7?>aKqgwwHCZ8bskbohI#y+aN^Wq@iQf3BZ zWJ~5`M8t5yI!n@cg)h2tpfnq|p?{hm=7o*7wb*f~Eh$T5Sk9r^g(isZ$CGNYtD>W} zNw0dZo90%$dUaVrq5r}BV0DHL2l4x!e1GlGl(9l>%J?FBm(GiMqVZggnIo?ld@#uG z2kCx}ug9IXlPpt_re>CV`8+-=pUL5ciQ}OzSvh{P%#;j6d53F8+QYJJ23yYj1bG+} zv1i80?Vroru)#=&SpKF`d-p^Ft$| ztU`(_SPpd8gtq8KKTf0bT8dU)v|d`~*(6p{d&zE^P}t3q9U@KFQdnFORN_4zxc@Ok z8Jz+LW0r(UoXM8(*Zs!x55 zUF_qJM^-1_pI8gNTE967I3CH+fLOUlUCRql?K(<{K>qqH1RXor}q0- z2$fyik69vy-I?QAgYn?1kF}Stc)eQ~Yr?rhrSgYKYRG$4MOu8E(x4ez!A1X$KpIIm!gDv0ZV`EzNc<1ik3J*Lw%*>-Vp}!^zR}b3qW&NnQ6Umj$OCElJ`Mi_V!&- z+J&~xUYEJ!uo#S!Q=AKa4@E zHm~%Qe=;+-vZE3&DzV`QXR87>N_nmPx<#aPDT;-S3vI zj>T=(b8{L%k*r1>?E(FSzl(F#BSQkA>{@bStC=$TX7rDe`QKK#o-zi9J$Lfp#Zi(=(j9mv(c)MnIp_zkTBTreW-+x*vv-Cf%nuWyLGY`rd5f*|!a4_E%R3vKq5| z?SH`gMDy0*?aZePm|SWW@t^sKjbjI^x4utzYRL7W3nseKbsj0jw#7+l*vf>ISXjU; zEqZHlH0y=k?#v`DC{N|!->^c94%jRao-bLSxs&@zX_B*X>X=%H=jay2;EfA8LpX22 z9id7QuQZb64y<11dt%^Wama_C;N0P*y!d?$xZ*;(e_d?m^#m&x`Ln`}-){{9goNJc z?cLw6Q%QfJy1yZW?X&tNUoMB51XpG21&paqzT=axuXJqnEK$f}!WLWVqX2U>cMK{i zBH@?&HE3(V%gLk?JM;8O&mz2=7?&T<;t-696PHGipkQBMyjN% zLHBxVJ%2M*9p1cmOlFqPd8MiE=`7R96LE@^hhGe)+?#a6k3tJ*_Wx+rV{UPk7pFaX zNfMTIov?*~p?EBw#9ak9N5H%N&hEhtI_=rj^2t3EB_Un}9pTJCg$62GOCD0uJ>MO2qxYeE&G}+?M|_OdBDT z5`c*hY}P?e@3=##3qz^{U%f#2|9=%_JXa2{=m)rz0P=K>q%xX-BUDBs{fze;H|u;KX^F-a3L;aIdI3ImmsvHOk)x7qWbMj3jQ~0YcB)S z4G>184s>{ofX4zgLYR>Rc+g;|VW-$*Q~lcz2$mOiO5%T5P&6ZW(ALAHUSOv*U~>VN zSHb2%P)VCWV+3hRf+bte&0gLrN_T`4=03l5f5f(V;1$!T}7AYDU z7I<%~5DKW12p$6|zlj*qo6jPEq!}#OmIVlHhES#?uuuR$P9Ow`!uq6dhbKvacRG5b zp)sK7IRrwQA^gbdmcZrPEaCDrDTkKSz$!NMG$irBv)nQ4JP~CkcoP06>XC=XFtd;c zzW`V1J;4`i3Md7z_@tCAG6IP$5J6-qjc`?rerHqy0H+nghGYq}f~>gUGZsGJ-U=Z@ zRKPXU3)>jHRrMO^3=tIlHNdl0h%&-kPH07Ggy8FuDexw8VHA*cCPF7;8-xW}l4=`R z(z_>cYRU$9ck$#LgaD!A@2${iXnZI-C<_p1!vbPpv+dO7>FuBzpH~P*$txnjZunHq z6`l=+GSCzoFb9J7N}m66LmL_prX;pQI1vS|onIx5h9-WF1DAY5n_Cfjk6URF<{=HI z>i|n!=||`=?SRlAsdwO1sV^W^FeT&*8&ErV785IQ4#~(VhYT2*gCK7P1`mA$IjM^v zM;w^kKf`~3Q?pk=DszhPZ|sz*RRZ8Q7-5K37?6jk8G|pA8bJr6wn7OY`suV4h~86? zpMappAV?6ULIzuKwLr-y2m{jW-cMj*z|L7=0C5+D3gML5Jkm!EU>?o_^$4KoSl&BB zr||9LAxuL^oZo{Db}7`h-#$2%AOrfk&Z;@x1(tm42w@L>H-rjNy?Xy@1wt^0iNJpX>?LID4LE2gbqR&)B3=SJJx-sbrsI4!#HE%0)n3*$h+bJ!_OdV7Yo4x zM6l86fLHCOv9bsq39SSxD+N{-)pQ2jb37hkkBg26{P}!V7I6=#kQx81EGS^qbJ|x> zZstaD9wrdl1JOfPqaQAB$A~Ndyti4dGsp=f`)>!v=1H_j4oV9>96I{BRyO z{Mv3#gzNChNr~@(eV-S+j#U|@Omu*>4`P65qr$1@@S!?p8s+~?R4OHKH#7qLWh9bylLUp03*T_Oh2ey*;5}0wH<)aAfT{q!-_qy6`Mh* z*11l2U&b?mL!|&)6Lbn-YT&F9HwHjwx|kz*AIwjA2#;!4VMRQ*0`+vGp~<1>N&rFz zA==2+_&f+Ih^d4t;08#(Kv)oV(9wiLyuk>zbo)1nv3-O?xd7iUXKfw#1=KLP3@0-J zG%M%~0RGyUd0TKE;U1EwKMcVKB!?i#>x2RQA&~b34M-XX<>0)uSq$pG4Wf7--_ZfQ z&Gs%hyrK3b56E8`;0V-*F!{}{g7qNyrt2BqzdfFb_#A&aPP+|*Ma$D8$pyn_qxB~^ zd6^MO#{3FlLnzLd+dcjYwsimhv@{JD5-L0b!3BE1LI{AnU(dYq@GGcGjTaTbj%b+A z9z*M?;Dyt{oc}sE1|S^)=e3BLtHB7Uz)2aY;Hff(1Y$5o^19$W7u9nfDL^@TRxtl4 z$h+%-)3`>~Eljd5uUOcuzbrB9kFpGfc&H6@CyJ zAJ|<`&CCW!#~`W*(A_^*ZhQwLBM2PIK^LC?azifw9%B#*gjEJ^lPR}BO)g-o$(%#r zJ?T~-yks`u_8usH?+?=yo>x`@X?tAqxTJpFM92coPeM@k3Apc;Nq4Qgub1QN#~ zN{F)lURD3^faNj**T)W!PMi(2f)ijde&3K}SMYz3r9Xg^xt5WogLl_6A{0|!?&Pxr zOP2&oM|H>6DiSKPhCv2=963#5-Q*5@5g(AFd$5UG*$kBx6C$}Pf?SY!Y?E=@E7<#a4t!HjMwDYU+=W_>&_HazJV3EVv#_gSyuKobw<+ z@AO#{uY)|yQVj40>MaabU;_h_>_37AGa%C%8xvq9!Q=oEX3m7(!0CGgr}T{(2o)^em&;&3w3sFGE4D%dlnGDUT2KzY(6_OqRr^nKrR#RXeLIjM^fnT-3r>IE8 zIvhd9_!n_HsWqAh>4$8m^!RxQHNt)&8@l;Uu&%@4gbcMUL%2_|_1u``z@M?R0`L|< zMUVJTnWOxeq=?8sXv2LMByR#%ZV{{;YEX9xoeJOygG~buC4|5xV|FenSiBclJnCHT zw&NOM+MZGc!$KPoWu7srv-ioEk2MvrB{DHd!m?v z)2kIv>5PkKVWF@H(qSs6^g0!=hVY<8`u8!M`C9FixuOQv=C5xK;mmH$QzpI^Cgp#a zc1s|WO6QcBwRAT7tAo=k3{L4sOAt1MYiLubl&3*owt>A2HBfSmPqFsPXA`e`%b<>4 zvr{_JB}{5W!3afKWtMu`pb{A8zlstpP6b$2&J-!GfQtOCAm}VWz{=UslL)7$x?%#P z-k7|=m@6jLe`4+k&fNAwFjWwAM8Wp9E@6^jBOQSK2(<>g_Yqhg;LYmkytFit>Wd*b zaAtzT5-&qk)31RA5#%6*nSjJmOf0}^?aV}XIMZzOFOveOKcB7i!kM3b zfc4tM6b9&joW+3Z50LJ)iJ^*?ZUxy3xM-n)M-u8A536t9bDyD`GZLe1bsQpfR4x7Ly?PjI0M;Q)J^ zX9EJ=7O2%m>_31v%n6> zQ+R%A*A9db2!D=6iRcIj3!`oXEe@#*8)Z*YVvm| zL_!62Pv@aKPSbh?pevWa|4?Iiz7Y=P2GVySq>nvmqpT?iXu7!Ccr6LB51 zi52WRN+^xe2Z-)L^br<04oYgwf}pQp>#3uFQitLCWPs&iuxr5wPo&Zvmd<&wDb|V5 z&~#DoqX5Z1#0qJU+dgOz*DO*&;4Buye^yA=;k@hxI8Pe*xqwCgpOoTy0P@V2ki7Z> z2scvQ3Y;vy3MWee3cpW-^qW1psvuamOO*c(aQ-Yn(jkN*W%>s$U_Xn63t)AeHD=*& zP}Mr$Up|olHaV~h>O>Yra0v3h@T2fq5DR&T>SxPfTHXYo4&1@^Mjcd3fW*VIhnLTA zB@V)HC7b}!5riBeYx`(1%L9~q4!Tbs#dRux$`M2dX+ZoDD2pcnm*oI@j!x^!=^HqY z22KJ(l$&5MxYkCCAppG_W>PS4#$yvhEJpoJH(u9+#f#8$VhX*#U*!VP1 z!*{UGs2Uo9#*?%0>KHEjL>DP5^5=9_&k1crt^kx30!v3t`x8dzP+Wk{7@PV(4~8{= zKwaR0z6d)u{y>BfE=^;F(qRmnol}VbnoFl*h??pdTM}i1ZDIw6H0l`q%^WF2WC8AS zJ%4P#B;_^f1#OE2Z9|>UHrpWa)aXzyglh4Ei|v+R-P1DvOzr*NH4baF);dZ(3Ido?${& z5Fn+CkdsHC;j3UFsD|^UV?mKC%dZ7DRzyHPDd=WY3|R%dOn%^A1vUg2AwF9#e})Cx zlURx5fybRw0>@ZqJVI=c$6k%(#aCl9A-X5Ri7;7n|2@zaPO!45*~z!&9FGUA)`0E# zcX9p@u5h>x4&Vb+>alVD_JZsS!?tjRJ7BAz4s6Bka6Ah@*a7B`!p_rPQ$lC8;SW}{ z9yCA?rJrth!tu<&EeMndu>XY33a~)VY9s=I8_<0YIDH;TfRp96kmOI0vv%Hqlj(mV z$xnV^;{or$WQU9aJt)Xi`gP7D`CAp@b$_}MuquWBQHb|g6$jGE81ar0B)Ki{rkGX;Kf1HdvMy3LG!O2)lTO^_yB&fgph0muQUICGiyZYz+&Np3fu)? zL{O$Z1()w(bZ0I~fb%K#kbH1288YzBcaeel0JWIagL73R@a<)%E4q5%zc4nAkh~!J zv$5+LoE(M*u(CjzfH8XL=|lJtoV<;NBugHqZjD?Kzm(80ra3dn4M8)K3V`As?372u?b8@;9|@9FE@1X rF%ZH6HYDmsBQ!KH(VzcvL;bUWS{5iB5fM5OdZZ&78buN4LA3t|N3T6- delta 44622 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 diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar index f405513f54d6425fb96e70fcf87f0fcbf25201f4..534a5953dd5438117f8be4cea0f067fd882cbcbb 100644 GIT binary patch delta 5497 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 PY1F+)PJDF0Mdbehn!bqf delta 5590 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 D&eh{$ delta 1208 zcmZok>`deh@MdP=VqoB4U`Ws|n8>Ta5vyI`<~L(P*hJeHHs8|8JiVe5=PRiKCEXa1 z01J?vUzDzos{NT7Gf?4Venwp|ZO>=~rb`%YStbYMxo+OdxPcME%4Gh|31Ox1#~%k7-!sQs%hJL(e{D^HaI~ZE#*{hB0;e8k zVvei4xpcQT$Er{7=SCJ}X--#Cxsmwn>}>OX;~kSNv)WlJnCsd%WVrbCUzxH`SS&F$ zDwadPx9zj*u3ro#F5GU)65LxiR#X+S?YwyJ)S9m%!OTh>rwxwe&QrDg!Xi%!@fv7qoP+h49-QzqxL z{Nk>;IZACeKdHQYb>JxPj)mH1e`ee&>{;CDuDI+&bHR?&p(Q5+p3gCs-0x>s(>QNc z_Qhs1xu|yc3qK|$Kkn4}xJp{J_1wpdP4(O5mK=Y~kz}N=5#Qo@V9N1K1sl;K-FWNw zv(Imiyk0tyqenS;_07ZsH)T)GT5`I((Nz3ycI&x`5&NSvJs+)MzbLReCgn(IXP>yl zG?8ikI#%9Uud}%F?${lc$$vRNgT2e-S0U3$H4`5(%_A>a_UT=+m}_*xdC%V1`}q$O zH{R5#pOm}DCvk7%>(V0O{KutE%SCl2x&IJTHxG80)bs0scXB1uBF#uYokMy2VO9YN zi$B~nopCzonaQkmQGtpf&m`BT%{R%&ep#`$k3)=Saf)v3hso9U;-*%%nklX47RPqZ zsk!UU=oqe<8Q*Og{pR_1>wJkN27OUWqT@^Rcc2o-<=s@LDbA(97B?8`r(`+okWHUvK~SxSiqn`?ae2 zd@465Uf3cT$@oZ`tFESY(cJGQ*|sd}G`drod?xJsK6{4Kd<~a1tZz*JW(9M&bVzOI zJrkF;b<4FI(OMy9M|gi4`1kD7Xnh`H*UzJ4c5G9;RCW>1Dn64%-z}av$36U$Sn-ej zP&_OHa4<{)rSM(iT`Z7v?IBaa3{L%r<;_?og5>_nZ(xG3HY#o60L!ImTfj5iDYqlJ{>18eObpBY{g_1-Dn7-SvL{Fc%d7QmX|{Gq7*8NgDgS%`r_4@J!irO6NUwI*j6h_S_JgJb}$d(OWA diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 22ee3a5fc..2fad37dfa 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -10,7 +10,7 @@ - + From 8ea6805f8d246b5046054e06d7e67123436c1fdc Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sun, 28 Jun 2015 19:43:57 +0000 Subject: [PATCH 088/258] Prevent double-save for now and auto start all torrents if autostart is already set (don't make the user restart each one). --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 5 ++++- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 42b2b792c..18c414289 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -626,7 +626,10 @@ public class Snark pc.halt(); Storage st = storage; if (st != null) { - boolean changed = storage.isChanged() || getUploaded() != savedUploaded; + // TODO: Cache the config-in-mem to compare vs config-on-disk + // (needed for auto-save to not double-save in some cases) + //boolean changed = storage.isChanged() || getUploaded() != savedUploaded; + boolean changed = true; try { storage.close(); } catch (IOException ioe) { diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index cb6fa9fe7..f051c560c 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -105,7 +105,7 @@ public class SnarkManager implements CompleteListener { public static final String PROP_FILES_PUBLIC = "i2psnark.filesPublic"; public static final String PROP_OLD_AUTO_START = "i2snark.autoStart"; // oops public static final String PROP_AUTO_START = "i2psnark.autoStart"; // convert in migration to new config file - public static final String DEFAULT_AUTO_START = "false"; + public static final String DEFAULT_AUTO_START = "true"; //public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix"; //public static final String DEFAULT_LINK_PREFIX = "file:///"; public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay"; @@ -2358,7 +2358,6 @@ public class SnarkManager implements CompleteListener { if (count == 0) addMessage(_("Stopping all torrents and closing the I2P tunnel.")); count++; - saveTorrentStatus(snark); if (finalShutdown) snark.stopTorrent(true); else From 4c516cd2af5582b0f8e9662a1a9dab8e434b7644 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 29 Jun 2015 15:58:41 +0000 Subject: [PATCH 089/258] log tweak --- core/java/src/net/i2p/client/impl/I2PSessionImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java index a0dbdcf55..6d264549b 100644 --- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -1254,6 +1254,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 protected String getPrefix() { StringBuilder buf = new StringBuilder(); buf.append('['); + buf.append(_state.toString()).append(' '); String s = _options.getProperty("inbound.nickname"); if (s != null) buf.append(s); @@ -1262,7 +1263,6 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 SessionId id = _sessionId; if (id != null) buf.append(" #").append(id.getSessionId()); - buf.append(' ').append(_state.toString()); buf.append("]: "); return buf.toString(); } From 34f6f6510421ebc124a088e53178fa77a2552114 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 29 Jun 2015 15:59:45 +0000 Subject: [PATCH 090/258] UPnP main() test tweak --- router/java/src/net/i2p/router/transport/UPnP.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java index 6753c09fc..29e0a037c 100644 --- a/router/java/src/net/i2p/router/transport/UPnP.java +++ b/router/java/src/net/i2p/router/transport/UPnP.java @@ -1067,9 +1067,16 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener { I2PAppContext ctx = new I2PAppContext(props); UPnP upnp = new UPnP(ctx); ControlPoint cp = new ControlPoint(); - System.out.println("Searching for UPnP devices:"); + long start = System.currentTimeMillis(); cp.start(); + long s2 = System.currentTimeMillis(); + System.out.println("Start took " + (s2 - start)); + System.out.println("Searching for UPnP devices"); + start = System.currentTimeMillis(); cp.search(); + s2 = System.currentTimeMillis(); + System.out.println("Search kickoff took " + (s2 - start)); + System.out.println("Waiting 10 seconds for responses"); Thread.sleep(10000); //while(true) { DeviceList list = cp.getDeviceList(); @@ -1081,7 +1088,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener { Device device = it.next(); upnp.listSubDev(device.toString(), device, sb); System.out.println("Here is the listing for device " + (++i) + - ' ' + device.getFriendlyName() + " :"); + ": " + device.getFriendlyName() + " :"); System.out.println(sb.toString()); sb.setLength(0); } From fcdd8be7a731b2f73871b28efef2a1a0c9d2fe50 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 29 Jun 2015 16:02:07 +0000 Subject: [PATCH 091/258] Transport: More fixes for SSU stalling - Don't skip further bandwidth allocations for SSU, since it needs the entire allocation to proceed. Log tweaks More synchronization of requests --- history.txt | 6 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- .../transport/FIFOBandwidthLimiter.java | 90 +++++++++---------- 3 files changed, 51 insertions(+), 47 deletions(-) diff --git a/history.txt b/history.txt index 02cec0312..4fcb50aaf 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2015-06-29 zzz + * Transport: More fixes for SSU stalling + +2015-06-28 zzz + * Apache Tomcat 6.0.44 + 2015-06-25 zzz * Console: Use registered host/port for eepsite link (ticket #1604) * Jetty starter: Register host/port when started diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e36cd3b14..7f4edb975 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 = 12; + public final static long BUILD = 13; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index 2f891ec64..fe3a06fc3 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -433,7 +433,7 @@ public class FIFOBandwidthLimiter { if (_log.shouldLog(Log.DEBUG)) _log.debug("Still denying the " + _pendingInboundRequests.size() + " pending inbound requests (status: " + getStatus().toString() - + ", longest waited " + locked_getLongestInboundWait() + " in)"); + + ", longest waited " + locked_getLongestInboundWait() + ')'); } } } @@ -505,7 +505,6 @@ public class FIFOBandwidthLimiter { */ private final void locked_satisfyInboundAvailable(List satisfied) { for (int i = 0; i < _pendingInboundRequests.size(); i++) { - if (_availableInbound.get() <= 0) break; SimpleRequest req = _pendingInboundRequests.get(i); long waited = now() - req.getRequestTime(); if (req.getAborted()) { @@ -520,17 +519,22 @@ public class FIFOBandwidthLimiter { i--; continue; } - if ( (req.getAllocationsSinceWait() > 0) && (req.getCompleteListener() == null) ) { + int avi = _availableInbound.get(); + if (avi <= 0) break; + // NO, don't do this, since SSU requires a full allocation to proceed. + // By stopping after a partial allocation, we stall SSU. + // This never affected NTCP (which also requires a full allocation) + // since it registers a CompleteListener, so getAllocationsSinceWait() was always zero. + //if (req.getAllocationsSinceWait() > 0) { // we have already allocated some values to this request, but // they haven't taken advantage of it yet (most likely they're // IO bound) // (also, the complete listener is only set for situations where // waitForNextAllocation() is never called) - continue; - } + // continue; + //} // ok, they are really waiting for us to give them stuff int requested = req.getPendingRequested(); - int avi = _availableInbound.get(); int allocated; if (avi >= requested) allocated = requested; @@ -579,7 +583,7 @@ public class FIFOBandwidthLimiter { if (_log.shouldLog(Log.INFO)) _log.info("Still denying the " + _pendingOutboundRequests.size() + " pending outbound requests (status: " + getStatus().toString() - + ", longest waited " + locked_getLongestOutboundWait() + " out)"); + + ", longest waited " + locked_getLongestOutboundWait() + ')'); } } } @@ -623,7 +627,6 @@ public class FIFOBandwidthLimiter { */ private final void locked_satisfyOutboundAvailable(List satisfied) { for (int i = 0; i < _pendingOutboundRequests.size(); i++) { - if (_availableOutbound.get() <= 0) break; SimpleRequest req = _pendingOutboundRequests.get(i); long waited = now() - req.getRequestTime(); if (req.getAborted()) { @@ -638,17 +641,22 @@ public class FIFOBandwidthLimiter { i--; continue; } - if (req.getAllocationsSinceWait() > 0) { + int avo = _availableOutbound.get(); + if (avo <= 0) break; + // NO, don't do this, since SSU requires a full allocation to proceed. + // By stopping after a partial allocation, we stall SSU. + // This never affected NTCP (which also requires a full allocation) + // since it registers a CompleteListener, so getAllocationsSinceWait() was always zero. + //if (req.getAllocationsSinceWait() > 0) { // we have already allocated some values to this request, but // they haven't taken advantage of it yet (most likely they're // IO bound) - if (_log.shouldLog(Log.WARN)) - _log.warn("multiple allocations since wait... ntcp shouldn't do this: " + req); - continue; - } + // if (_log.shouldLog(Log.WARN)) + // _log.warn("multiple allocations since wait... ntcp shouldn't do this: " + req); + // continue; + //} // ok, they are really waiting for us to give them stuff int requested = req.getPendingRequested(); - int avo = _availableOutbound.get(); int allocated; if (avo >= requested) allocated = requested; @@ -659,15 +667,6 @@ public class FIFOBandwidthLimiter { req.allocateBytes(allocated); satisfied.add(req); if (req.getPendingRequested() > 0) { - if (req.attachment() != null) { - if (_log.shouldLog(Log.INFO)) - _log.info("Allocating " + allocated + " bytes outbound as a partial grant to " - + req - + " waited " - + waited - + "ms) pending " + _pendingOutboundRequests.size() - + ", longest waited " + locked_getLongestOutboundWait() + " out"); - } if (_log.shouldLog(Log.DEBUG)) _log.debug("Allocating " + allocated + " bytes outbound as a partial grant to " + req @@ -676,15 +675,6 @@ public class FIFOBandwidthLimiter { + "ms) pending " + _pendingOutboundRequests.size() + ", longest waited " + locked_getLongestOutboundWait() + " out"); } else { - if (req.attachment() != null) { - if (_log.shouldLog(Log.INFO)) - _log.info("Allocating " + allocated + " bytes outbound to finish the partial grant to " - + req - + " waited " - + waited - + "ms) pending " + _pendingOutboundRequests.size() - + ", longest waited " + locked_getLongestOutboundWait() + " out)"); - } if (_log.shouldLog(Log.DEBUG)) _log.debug("Allocating " + allocated + " bytes outbound to finish the partial grant to " + req @@ -807,9 +797,9 @@ public class FIFOBandwidthLimiter { /** uses System clock, not context clock */ public long getRequestTime() { return _requestTime; } public int getTotalRequested() { return _total; } - public int getPendingRequested() { return _total - _allocated; } + public synchronized int getPendingRequested() { return _total - _allocated; } public boolean getAborted() { return _aborted; } - public void abort() { + public synchronized void abort() { _aborted = true; // so isComplete() will return true _allocated = _total; @@ -817,6 +807,9 @@ public class FIFOBandwidthLimiter { } public CompleteListener getCompleteListener() { return _lsnr; } + /** + * Only used by NTCP. + */ public void setCompleteListener(CompleteListener lsnr) { boolean complete = false; synchronized (this) { @@ -832,18 +825,19 @@ public class FIFOBandwidthLimiter { } } - private boolean isComplete() { return _allocated >= _total; } + private synchronized boolean isComplete() { return _allocated >= _total; } /** + * Only used by SSU. * May return without allocating. * Check getPendingRequested() > 0 in a loop. */ public void waitForNextAllocation() { - _waited = true; - _allocationsSinceWait = 0; boolean complete = false; try { synchronized (this) { + _waited = true; + _allocationsSinceWait = 0; if (isComplete()) complete = true; else @@ -854,17 +848,21 @@ public class FIFOBandwidthLimiter { _lsnr.complete(this); } - int getAllocationsSinceWait() { return _waited ? _allocationsSinceWait : 0; } + /** + * Only returns nonzero if there's no listener and waitForNextAllocation() + * has been called (i.e. SSU) + * Now unused. + */ + synchronized int getAllocationsSinceWait() { return _waited ? _allocationsSinceWait : 0; } - void allocateBytes(int bytes) { + /** + * Increments allocationsSinceWait only if there is a listener. + * Does not notify; caller must call notifyAllocation() + */ + synchronized void allocateBytes(int bytes) { _allocated += bytes; if (_lsnr == null) _allocationsSinceWait++; - //if (isComplete()) { - // if (_log.shouldLog(Log.INFO)) - // _log.info("allocate " + bytes + " completed, listener=" + _lsnr); - //} - //notifyAllocation(); // handled within the satisfy* methods } void notifyAllocation() { @@ -893,8 +891,8 @@ public class FIFOBandwidthLimiter { @Override public String toString() { - return "Req" + _requestId + " priority " + _priority + - _allocated + '/' + _total + " bytes"; + return "Req: " + _requestId + " priority: " + _priority + + ' ' + _allocated + '/' + _total + " bytes"; } } From 98a4460bde6b07275cf02f5b8ea76934dd05e687 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 2 Jul 2015 15:20:58 +0000 Subject: [PATCH 092/258] fix test compile --- .../test/junit/net/i2p/client/I2PClientTestSuite.java | 3 ++- .../junit/net/i2p/client/{ => impl}/I2PSessionTest.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) rename core/java/test/junit/net/i2p/client/{ => impl}/I2PSessionTest.java (93%) diff --git a/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java b/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java index 208ddf351..fef8aed52 100644 --- a/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java +++ b/core/java/test/junit/net/i2p/client/I2PClientTestSuite.java @@ -11,6 +11,7 @@ package net.i2p.client; import junit.framework.Test; import junit.framework.TestSuite; import net.i2p.client.datagram.DatagramTest; +import net.i2p.client.impl.I2PSessionTest; /** * @author Comwiz @@ -26,4 +27,4 @@ public class I2PClientTestSuite { return suite; } -} \ No newline at end of file +} diff --git a/core/java/test/junit/net/i2p/client/I2PSessionTest.java b/core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java similarity index 93% rename from core/java/test/junit/net/i2p/client/I2PSessionTest.java rename to core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java index a3a2cd603..14fbab676 100644 --- a/core/java/test/junit/net/i2p/client/I2PSessionTest.java +++ b/core/java/test/junit/net/i2p/client/impl/I2PSessionTest.java @@ -1,4 +1,4 @@ -package net.i2p.client; +package net.i2p.client.impl; /* * free (adj.): unencumbered; not under the control of others * Written by jrandom in 2003 and released into the public domain @@ -15,6 +15,10 @@ import java.util.Set; import junit.framework.TestCase; import net.i2p.I2PAppContext; +import net.i2p.client.I2PClientFactory; +import net.i2p.client.I2PSession; +import net.i2p.client.I2PSessionException; +import net.i2p.client.I2PSessionListener; import net.i2p.data.Destination; @@ -87,4 +91,4 @@ public class I2PSessionTest extends TestCase implements I2PSessionListener{ } } public void reportAbuse(I2PSession session, int severity){} -} \ No newline at end of file +} From 113a8a52f3d55ef7084c3b59508505cf1fb5a914 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 5 Jul 2015 12:08:33 +0000 Subject: [PATCH 093/258] Transport: Raise bandwidth refiller thread priority so I/O doesn't stall under high CPU load - Raise DH generator thread priority to keep DH building out of event pumper thread - Raise PRNG and YK generator thread priorites one notch - Set I2PThread priority in constructor Fixes problems mainly seen on Windows, which seems to be much more sensitive to priority settings --- core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java | 2 +- core/java/src/net/i2p/crypto/YKGenerator.java | 2 +- core/java/src/net/i2p/util/I2PThread.java | 8 ++++++++ .../net/i2p/router/transport/FIFOBandwidthLimiter.java | 2 +- .../i2p/router/transport/crypto/DHSessionKeyBuilder.java | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java index 12d6c6bee..0d138e87d 100644 --- a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java +++ b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java @@ -56,7 +56,7 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl _isRunning = true; _refillThread = new I2PThread(this, "PRNG"); _refillThread.setDaemon(true); - _refillThread.setPriority(Thread.MIN_PRIORITY+1); + _refillThread.setPriority(Thread.NORM_PRIORITY - 2); _refillThread.start(); } diff --git a/core/java/src/net/i2p/crypto/YKGenerator.java b/core/java/src/net/i2p/crypto/YKGenerator.java index a714c6c6a..30245c229 100644 --- a/core/java/src/net/i2p/crypto/YKGenerator.java +++ b/core/java/src/net/i2p/crypto/YKGenerator.java @@ -91,7 +91,7 @@ class YKGenerator { return; _precalcThread = new I2PThread(new YKPrecalcRunner(MIN_NUM_BUILDERS, MAX_NUM_BUILDERS), "YK Precalc", true); - _precalcThread.setPriority(Thread.MIN_PRIORITY); + _precalcThread.setPriority(Thread.NORM_PRIORITY - 2); _isRunning = true; _precalcThread.start(); } diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java index 044b82f54..22611ee3f 100644 --- a/core/java/src/net/i2p/util/I2PThread.java +++ b/core/java/src/net/i2p/util/I2PThread.java @@ -17,6 +17,8 @@ import java.util.concurrent.CopyOnWriteArraySet; * In case its useful later... * (e.g. w/ native programatic thread dumping, etc) * + * As of 0.9.21, I2PThreads are initialized to NORM_PRIORITY + * (not the priority of the creating thread). */ public class I2PThread extends Thread { /** @@ -31,36 +33,42 @@ public class I2PThread extends Thread { public I2PThread() { super(); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } public I2PThread(String name) { super(name); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } public I2PThread(Runnable r) { super(r); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } public I2PThread(Runnable r, String name) { super(r, name); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } public I2PThread(Runnable r, String name, boolean isDaemon) { super(r, name); setDaemon(isDaemon); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } public I2PThread(ThreadGroup g, Runnable r) { super(g, r); + setPriority(NORM_PRIORITY); //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) ) // _createdBy = new Exception("Created by"); } diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java index fe3a06fc3..209d7ba62 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java @@ -98,7 +98,7 @@ public class FIFOBandwidthLimiter { _lastStatsUpdated = now(); _refiller = new FIFOBandwidthRefiller(_context, this); _refillerThread = new I2PThread(_refiller, "BWRefiller", true); - _refillerThread.setPriority(I2PThread.NORM_PRIORITY-1); + _refillerThread.setPriority(I2PThread.NORM_PRIORITY + 1); _refillerThread.start(); } diff --git a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java index a30215ce3..ad9a3e43d 100644 --- a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java +++ b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java @@ -470,7 +470,8 @@ public class DHSessionKeyBuilder { _log.debug("DH Precalc (minimum: " + _minSize + " max: " + _maxSize + ", delay: " + _calcDelay + ")"); _builders = new LinkedBlockingQueue(_maxSize); - setPriority(Thread.MIN_PRIORITY); + if (!SystemVersion.isWindows()) + setPriority(Thread.NORM_PRIORITY - 1); } /** From 05959d519946f1bbbbdc68b41f2fddca8adfd38e Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 5 Jul 2015 12:30:01 +0000 Subject: [PATCH 094/258] SSU: Request outbound bandwidth on the way into the sender queue, not on the way out, so that SSU requests bandwidth allocations for each packet in parallel and competes more effectively with NTCP for bandwidth. Inbound stubbed-out only. --- history.txt | 4 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- .../router/transport/udp/PacketBuilder.java | 6 +-- .../i2p/router/transport/udp/UDPPacket.java | 54 ++++++++++++++++--- .../i2p/router/transport/udp/UDPSender.java | 28 ++++++---- 5 files changed, 73 insertions(+), 21 deletions(-) diff --git a/history.txt b/history.txt index 4fcb50aaf..0092e5f22 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-07-05 zzz + * SSU: Compete better with NTCP for outbound bandwidth allocations + * Transport: Adjust thread priorities to prevent I/O stalling + 2015-06-29 zzz * Transport: More fixes for SSU stalling diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7f4edb975..31c35f8c3 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 = 13; + public final static long BUILD = 14; /** for example "-test" */ public final static String EXTRA = ""; 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 35f2bb763..3029f96c3 100644 --- a/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java +++ b/router/java/src/net/i2p/router/transport/udp/PacketBuilder.java @@ -9,13 +9,13 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.Hash; import net.i2p.data.router.RouterIdentity; import net.i2p.data.SessionKey; import net.i2p.data.Signature; +import net.i2p.router.RouterContext; import net.i2p.router.transport.TransportUtil; import net.i2p.util.Addresses; import net.i2p.util.Log; @@ -99,7 +99,7 @@ around briefly, to address packet loss and reordering.

* */ class PacketBuilder { - private final I2PAppContext _context; + private final RouterContext _context; private final Log _log; private final UDPTransport _transport; @@ -169,7 +169,7 @@ class PacketBuilder { /** * @param transport may be null for unit testing only */ - public PacketBuilder(I2PAppContext ctx, UDPTransport transport) { + public PacketBuilder(RouterContext ctx, UDPTransport transport) { _context = ctx; _transport = transport; _log = ctx.logManager().getLog(PacketBuilder.class); 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 33eb2d2e6..e2e1b3f59 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPPacket.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPPacket.java @@ -6,11 +6,11 @@ import java.util.Arrays; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; -import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; import net.i2p.data.SessionKey; import net.i2p.router.RouterContext; +import net.i2p.router.transport.FIFOBandwidthLimiter; import net.i2p.router.util.CDQEntry; import net.i2p.util.Addresses; import net.i2p.util.Log; @@ -22,7 +22,7 @@ import net.i2p.util.SystemVersion; * */ class UDPPacket implements CDQEntry { - private I2PAppContext _context; + private RouterContext _context; private final DatagramPacket _packet; private volatile short _priority; private volatile long _initializeTime; @@ -43,6 +43,7 @@ class UDPPacket implements CDQEntry { //private long _afterHandlingTime; private int _validateCount; // private boolean _isInbound; + private FIFOBandwidthLimiter.Request _bandwidthRequest; // Warning - this mixes contexts in a multi-router JVM private static final Queue _packetCache; @@ -102,7 +103,7 @@ class UDPPacket implements CDQEntry { private static final int MAX_VALIDATE_SIZE = MAX_PACKET_SIZE; - private UDPPacket(I2PAppContext ctx) { + private UDPPacket(RouterContext ctx) { //ctx.statManager().createRateStat("udp.fetchRemoteSlow", "How long it takes to grab the remote ip info", "udp", UDPTransport.RATES); // the data buffer is clobbered on init(..), but we need it to bootstrap _data = new byte[MAX_PACKET_SIZE]; @@ -112,7 +113,7 @@ class UDPPacket implements CDQEntry { init(ctx); } - private synchronized void init(I2PAppContext ctx) { + private synchronized void init(RouterContext ctx) { _context = ctx; //_dataBuf = _dataCache.acquire(); Arrays.fill(_data, (byte)0); @@ -231,7 +232,7 @@ class UDPPacket implements CDQEntry { str.append("\n\tCalc HMAC: ").append(Base64.encode(calc, 0, MAC_SIZE)); str.append("\n\tRead HMAC: ").append(Base64.encode(_data, _packet.getOffset(), MAC_SIZE)); str.append("\n\tUsing key: ").append(macKey.toBase64()); - if (DataHelper.eq(macKey.getData(), 0, ((RouterContext)_context).routerHash().getData(), 0, 32)) + if (DataHelper.eq(macKey.getData(), 0, _context.routerHash().getData(), 0, 32)) str.append(" (Intro)"); else str.append(" (Session)"); @@ -300,6 +301,40 @@ class UDPPacket implements CDQEntry { /** a packet handler has finished parsing out the good bits */ //long getTimeSinceHandling() { return (_afterHandlingTime > 0 ? _context.clock().now() - _afterHandlingTime : 0); } + /** + * So that we can compete with NTCP, we want to request bandwidth + * in parallel, on the way into the queue, not on the way out. + * Call before enqueueing. + * @since 0.9.21 + * @deprecated unused + */ + public synchronized void requestInboundBandwidth() { + verifyNotReleased(); + _bandwidthRequest = _context.bandwidthLimiter().requestInbound(_packet.getLength(), "UDP receiver"); + } + + /** + * So that we can compete with NTCP, we want to request bandwidth + * in parallel, on the way into the queue, not on the way out. + * Call before enqueueing. + * @since 0.9.21 + */ + public synchronized void requestOutboundBandwidth() { + verifyNotReleased(); + _bandwidthRequest = _context.bandwidthLimiter().requestOutbound(_packet.getLength(), 0, "UDP sender"); + } + + /** + * So that we can compete with NTCP, we want to request bandwidth + * in parallel, on the way into the queue, not on the way out. + * Call after dequeueing. + * @since 0.9.21 + */ + public synchronized FIFOBandwidthLimiter.Request getBandwidthRequest() { + verifyNotReleased(); + return _bandwidthRequest; + } + // Following 5: All used only for stats in PacketHandler, commented out /** when it was pulled off the endpoint receive queue */ @@ -339,7 +374,7 @@ class UDPPacket implements CDQEntry { /** * @param inbound unused */ - public static UDPPacket acquire(I2PAppContext ctx, boolean inbound) { + public static UDPPacket acquire(RouterContext ctx, boolean inbound) { UDPPacket rv = null; if (CACHE) { rv = _packetCache.poll(); @@ -375,6 +410,13 @@ class UDPPacket implements CDQEntry { //_acquiredBy = null; // //_dataCache.release(_dataBuf); + if (_bandwidthRequest != null) { + synchronized(_bandwidthRequest) { + if (_bandwidthRequest.getPendingRequested() > 0) + _bandwidthRequest.abort(); + } + _bandwidthRequest = null; + } if (!CACHE) return; _packetCache.offer(this); diff --git a/router/java/src/net/i2p/router/transport/udp/UDPSender.java b/router/java/src/net/i2p/router/transport/udp/UDPSender.java index 7091b4ced..ebb2de795 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPSender.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPSender.java @@ -32,6 +32,9 @@ class UDPSender { private static final int TYPE_POISON = 99999; + // Queue needs to be big enough that we can compete with NTCP for + // bandwidth requests, and so CoDel can work well. + // When full, packets back up into the PacketPusher thread, pre-CoDel. private static final int MIN_QUEUE_SIZE = 64; private static final int MAX_QUEUE_SIZE = 384; @@ -195,9 +198,11 @@ class UDPSender { packet.release(); return; } + packet.requestOutboundBandwidth(); try { _outboundQueue.put(packet); } catch (InterruptedException ie) { + packet.release(); return; } //size = _outboundQueue.size(); @@ -229,17 +234,18 @@ class UDPSender { // ?? int size2 = packet.getPacket().getLength(); if (size > 0) { //_context.bandwidthLimiter().requestOutbound(req, size, "UDP sender"); - FIFOBandwidthLimiter.Request req = - _context.bandwidthLimiter().requestOutbound(size, 0, "UDP sender"); - // failsafe, don't wait forever - int waitCount = 0; - while (req.getPendingRequested() > 0 && waitCount++ < 5) { - req.waitForNextAllocation(); - } - if (waitCount >= 5) { - // tell FBL we didn't send it, but send it anyway - req.abort(); - _context.statManager().addRateData("udp.sendFailsafe", 1); + FIFOBandwidthLimiter.Request req = packet.getBandwidthRequest(); + if (req != null) { + // failsafe, don't wait forever + int waitCount = 0; + while (req.getPendingRequested() > 0 && waitCount++ < 5) { + req.waitForNextAllocation(); + } + if (waitCount >= 5) { + // tell FBL we didn't send it, but send it anyway + req.abort(); + _context.statManager().addRateData("udp.sendFailsafe", 1); + } } } From 2681c4b42ffab076f24c24d891f69be8d49ec546 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 7 Jul 2015 13:35:55 +0000 Subject: [PATCH 095/258] Streaming: New config to add to DSA-only list --- .../streaming/impl/I2PSocketManagerFull.java | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java index 452f715db..280c1549d 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; +import java.util.StringTokenizer; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; @@ -106,6 +107,11 @@ public class I2PSocketManagerFull implements I2PSocketManager { } } + /** cache of the property to detect changes */ + private static volatile String _userDsaList = ""; + private static final Set _userDsaOnly = new ConcurrentHashSet(4); + private static final String PROP_DSALIST = "i2p.streaming.dsalist"; + /** * How long to wait for the client app to accept() before sending back CLOSE? * This includes the time waiting in the queue. Currently set to 5 seconds. @@ -478,8 +484,9 @@ public class I2PSocketManagerFull implements I2PSocketManager { // pick the subsession here I2PSession session = _session; if (!_subsessions.isEmpty()) { + updateUserDsaList(); Hash h = peer.calculateHash(); - if (_dsaOnly.contains(h)) { + if (_dsaOnly.contains(h) || (!_userDsaOnly.isEmpty() && _userDsaOnly.contains(h))) { // FIXME just taking the first one for now for (I2PSession sess : _subsessions) { if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1) { @@ -503,6 +510,40 @@ public class I2PSocketManagerFull implements I2PSocketManager { return socket; } + /** + * Update the global user DSA-only list. + * This does not affect the hardcoded DSA_ONLY_HASHES list above, + * the user can only add, not remove. + * + * @since 0.9.21 + */ + private void updateUserDsaList() { + String hashes = _context.getProperty(PROP_DSALIST, ""); + if (!_userDsaList.equals(hashes)) { + // rebuild _userDsaOnly when property changes + synchronized(_userDsaOnly) { + if (hashes.length() > 0) { + Set newSet = new HashSet(); + StringTokenizer tok = new StringTokenizer(hashes, ",; "); + while (tok.hasMoreTokens()) { + String hashstr = tok.nextToken(); + Hash hh = ConvertToHash.getHash(hashstr); + if (hh != null) + newSet.add(hh); + else + _log.error("Bad " + PROP_DSALIST + " entry: " + hashstr); + } + _userDsaOnly.addAll(newSet); + _userDsaOnly.retainAll(newSet); + _userDsaList = hashes; + } else { + _userDsaOnly.clear(); + _userDsaList = ""; + } + } + } + } + /** * Create a new connected socket. Blocks until the socket is created, * unless the connectDelay option (i2p.streaming.connectDelay) is From 6cb3d1d3306647fd1acc548ca85bcc71b9fe882b Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 7 Jul 2015 13:38:44 +0000 Subject: [PATCH 096/258] Updates: New news URL --- .../java/src/net/i2p/router/web/ConfigUpdateHandler.java | 8 +++++--- .../java/src/net/i2p/router/web/ConfigUpdateHelper.java | 3 ++- installer/resources/hosts.txt | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index ef3fb4eb1..7f8c75dfd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -34,10 +34,12 @@ public class ConfigUpdateHandler extends FormHandler { // public static final String DEFAULT_NEWS_URL = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD"; /** very old default */ public static final String OLD_DEFAULT_NEWS_URL = "http://complication.i2p/news.xml"; - /** old default */ + /** older default */ public static final String DEFAULT_NEWS_URL = "http://echelon.i2p/i2p/news.xml"; - /** current default */ - public static final String DEFAULT_NEWS_URL_SU3 = "http://echelon.i2p/news/news.su3"; + /** old default */ + public static final String OLD_DEFAULT_NEWS_URL_SU3 = "http://echelon.i2p/news/news.su3"; + /** current default, i2pnews.i2p, run by echelon */ + public static final String DEFAULT_NEWS_URL_SU3 = "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3"; public static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency"; public static final long DEFAULT_REFRESH_FREQ = 36*60*60*1000l; public static final String DEFAULT_REFRESH_FREQUENCY = Long.toString(DEFAULT_REFRESH_FREQ); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index c5c13c0aa..3df84ceb5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -34,7 +34,8 @@ public class ConfigUpdateHelper extends HelperBase { public static String getNewsURL(I2PAppContext ctx) { String url = ctx.getProperty(ConfigUpdateHandler.PROP_NEWS_URL); if (url != null && !url.equals(ConfigUpdateHandler.OLD_DEFAULT_NEWS_URL) && - !url.equals(ConfigUpdateHandler.DEFAULT_NEWS_URL)) + !url.equals(ConfigUpdateHandler.DEFAULT_NEWS_URL) && + !url.equals(ConfigUpdateHandler.OLD_DEFAULT_NEWS_URL_SU3)) return url; else return ConfigUpdateHandler.DEFAULT_NEWS_URL_SU3; diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt index 46017c9c4..bc698afe9 100644 --- a/installer/resources/hosts.txt +++ b/installer/resources/hosts.txt @@ -360,3 +360,4 @@ i2pdocs.str4d.i2p=CRayYfxrPBELUQ4tYi723g8atsyHwkR0--N8fXggNqJgHsnrKxle0ovH5qj6aq mtn.i2p-projekt.i2p=I6Ha4I7rgR0JyExQnN~4sZz5CfRqdN7o-2t1i2YOExd2CxC4MHHz3nJ5KgBIqeNa0dZbugwMEYMWneXAf8nuy9RKUrjcDvGLqScuU8QCpG-e7UDR8lNregfaOwTuypBQiPh9nrc86Zc2JXyTv0eG3T5Yl1tydqs3qEz5w1vn64uRCrGLEMsnGMIZ4aXexseL6McW9ObIQ0qOIfRG9kc~3~bpD9UM4G04BXPZ1Ao5MUjGoQyxlaNCt1DrvAYcrRArzvv0QGyPjb6HpHLlK2UIoR6SumRuNYpEXCaqbXEnEicx1kB5Pyhcwm0cyaMCx-ZaUU-F1~23VurE41xNMbq4GwXtev4bVP4ycHGHjH-XYJmKrqnesIEp7InSAWfm0gdDHuy9377nSIyAhGLLFlWKtzrZPiKm57SN4~BZSQIF6CI4JutGa0x9EaO8hvzFgaYKgwS~a7-YuZNfx4VHEF2J34DrsJo4qetdPTWTKX1o-ztMP6f7DpWjp4JTKb36YstvAAAA tracker.thebland.i2p=gzBtMSRcMD6b36PmPCQWZhh30fYm2Ww2r4tRSref4N2T4~cnXK3DjJOuJwao2jRK4bZwX2Rkyjw849xrFMqaR3SdPe3-K61B~Kr9Uo1KLdm3~oahOWFmCaIlipPs-i3jdTT~721YUcYB09n4PGrDq5KZSOOBlLZKulJficO58QRUlDpva4OCCRrX9EUCoAavOciKpvKtnGwl6AiPFu8WnmEeGQ861vjdirjfkHWNp3gj9IjGuxJNcgyHi51BWYZM6il~LJTcbA4zuZn~qudHIx9uzUtO-t08yzSRrmfVwVVVru6-~BBX0ipADi9UGZjyB-PJEKKjizUPxSp2OCmiOlQ2iXpKs2j8yfjHJbn-eWKpIh4jfpNigy6AbDfzFivkvm8lt8CleYf-p3~SHdqIL0iEaacxi5BAU4Baj5yS818kPQP4hEEMMtq4WnKjl4IW64swXSg1wlVBTiKDJzzQGK20jySBuPxhEbd6sfAeirzn585g5EqeV8DLqsMfe5pZBQAEAAEAAA== opentracker.dg2.i2p=WSUjGXhqHr7TsBizCO0qV~Kk7G1-suPPSSyMs4AnLQ8wRlWWZ~9rl7AzS0tFG4Dbbl8Te0wtZmQeMhcartbJ3TY-TBnviFqA8zP-sEQf5UK0BA5zzrtpB7NnUo-65B61cVbqG51-p9cJZ~Crre0LEZm5bJs8P3J~oH3b3BJ0YXtuv0ccBgj~OAf1g8ZrHr431XLq8WPRkzAVEIDhFdiSCYAz8XTArNN7OnPUUCjZcw92Oqf9wajg0eXqnThDFbrCx54h0UKM7sVDqRnoXbuGVLTPVvmIOnwuwZrn4X60GMLW38Dg-38qSfJL61FIbn5HfK-VTjCOuC16PtvJAPS1qUBWa-Y3j3aGK3BpHQnlOl-XNB~tJU0GBzRvEnOPFbtqXw38LyTCsvXcY31C~sNC~jedATUfPSZK-UBeN6RkR5BQiXBV-YkzUvTM4s~oXXgw9WFe9DdEWP-XR9~2G1Qe-GkcRAKUXmTAzVnRjlHEDR0lLMfxDwe3OfZuBzM9Gda9AAAA +i2pnews.i2p=XHS99uhrvijk3KxU438LjNf-SMXXiNXsbV8uwHFXdqsDsHPZRdc6LH-hEMGWDR5g2b65KLlSm8plFrTusR-yxBfGHtZLa9vhXCwWXXbUlBe7Ty6NlwY7GmJItBKPO09BbUa0oJ5jITjLM1mVxeHShAZs8IMlLJjYaeYycDdaUInuPrng51~ySeiiKKxHa3qJkFOuPgQQiCXqy-9Qhi7t9j16iXzWWZ5yN7XcE9i1J7UQix66ntwILTnTAYBelNbONPiSJzKq-BiXj13bI3~liBgckJGf1a1dU8lOuAemtB-XM36cUcg~LQ6iHMuxK-AE8UDQHTNma6E0TxlK5DizV34UgiJ2CxRB5n8BBrZQEvIjYOExXyt6gbopL-aer1qrL1zoIKoMbGon5P4GV~f8NyClJKHXSS2NW7FV-kZbmA0WSLAxecyBfSLStIlw01gtnb2OAQt6OkMQ693N2-L~IJMg4f1lWK4Pv0bIqJUrHZS8YyeWbb4Y~pto6hkd0kgRBQAEAAEAAA== From 1eaf376ee7a71e6215ec83602110424ab8969338 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 7 Jul 2015 13:46:04 +0000 Subject: [PATCH 097/258] Crypto: Check for error return from sign() --- .../java/src/net/i2p/client/streaming/impl/PacketLocal.java | 2 ++ core/java/src/net/i2p/crypto/DSAEngine.java | 4 ++-- core/java/src/net/i2p/crypto/KeyGenerator.java | 2 ++ core/java/src/net/i2p/data/DatabaseEntry.java | 4 ++++ core/java/src/net/i2p/data/PrivateKeyFile.java | 5 ++++- core/java/src/net/i2p/data/i2cp/SessionConfig.java | 4 ++++ 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java index 542de8f2f..b6a55d351 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java @@ -216,6 +216,8 @@ class PacketLocal extends Packet implements MessageOutputStream.WriteStatus { SigningPrivateKey key = _session.getPrivateKey(); int size = writePacket(buffer, offset, key.getType().getSigLen()); _optionSignature = _context.dsa().sign(buffer, offset, size, key); + if (_optionSignature == null) + throw new IllegalStateException("Signature failed"); //if (false) { // Log l = ctx.logManager().getLog(Packet.class); // l.error("Signing: " + toString()); diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index e4a8e6758..d7dfe657a 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/core/java/src/net/i2p/crypto/DSAEngine.java @@ -285,8 +285,8 @@ public class DSAEngine { try { return altSign(data, offset, length, signingKey); } catch (GeneralSecurityException gse) { - if (_log.shouldLog(Log.WARN)) - _log.warn(type + " Sign Fail", gse); + if (_log.shouldLog(Log.ERROR)) + _log.error(type + " Sign Fail", gse); return null; } } diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index aa6164e30..60742c2fb 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/core/java/src/net/i2p/crypto/KeyGenerator.java @@ -417,6 +417,8 @@ public class KeyGenerator { RandomSource.getInstance().nextBytes(src); long start = System.nanoTime(); Signature sig = DSAEngine.getInstance().sign(src, privkey); + if (sig == null) + throw new GeneralSecurityException("signature generation failed"); long mid = System.nanoTime(); boolean ok = DSAEngine.getInstance().verifySignature(sig, src, pubkey); long end = System.nanoTime(); diff --git a/core/java/src/net/i2p/data/DatabaseEntry.java b/core/java/src/net/i2p/data/DatabaseEntry.java index c2dd42113..09fc6a50a 100644 --- a/core/java/src/net/i2p/data/DatabaseEntry.java +++ b/core/java/src/net/i2p/data/DatabaseEntry.java @@ -171,8 +171,12 @@ public abstract class DatabaseEntry extends DataStructureImpl { throw new IllegalStateException(); byte[] bytes = getBytes(); if (bytes == null) throw new DataFormatException("Not enough data to sign"); + if (key == null) + throw new DataFormatException("No signing key"); // now sign with the key _signature = DSAEngine.getInstance().sign(bytes, key); + if (_signature == null) + throw new DataFormatException("Signature failed with " + key.getType() + " key"); } /** diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java index 96cc8a47b..f42d8da15 100644 --- a/core/java/src/net/i2p/data/PrivateKeyFile.java +++ b/core/java/src/net/i2p/data/PrivateKeyFile.java @@ -405,7 +405,10 @@ public class PrivateKeyFile { System.arraycopy(this.dest.getPublicKey().getData(), 0, data, 0, PublicKey.KEYSIZE_BYTES); System.arraycopy(this.dest.getSigningPublicKey().getData(), 0, data, PublicKey.KEYSIZE_BYTES, SigningPublicKey.KEYSIZE_BYTES); byte[] payload = new byte[Hash.HASH_LENGTH + Signature.SIGNATURE_BYTES]; - byte[] sig = DSAEngine.getInstance().sign(new ByteArrayInputStream(data), spk2).getData(); + Signature sign = DSAEngine.getInstance().sign(new ByteArrayInputStream(data), spk2); + if (sign == null) + return null; + byte[] sig = sign.getData(); System.arraycopy(sig, 0, payload, 0, Signature.SIGNATURE_BYTES); // Add dest2's Hash for reference byte[] h2 = d2.calculateHash().getData(); diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index de6734349..531194d17 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -121,7 +121,11 @@ public class SessionConfig extends DataStructureImpl { public void signSessionConfig(SigningPrivateKey signingKey) throws DataFormatException { byte data[] = getBytes(); if (data == null) throw new DataFormatException("Unable to retrieve bytes for signing"); + if (signingKey == null) + throw new DataFormatException("No signing key"); _signature = DSAEngine.getInstance().sign(data, signingKey); + if (_signature == null) + throw new DataFormatException("Signature failed with " + signingKey.getType() + " key"); } /** From 817888c23ca4bf19878d5b6d693adcb302623431 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 7 Jul 2015 18:42:26 +0000 Subject: [PATCH 098/258] i2psnark: Tweak dest display in footer --- .../org/klomp/snark/web/I2PSnarkServlet.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 03a27c7d8..4582bba68 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -671,17 +671,6 @@ public class I2PSnarkServlet extends BasicServlet { out.write("
"); out.write(" "); - out.write(_("Dest") + ":"); - out.write(" "); - String IPString = _manager.util().getOurIPString(); - if(!IPString.equals("unknown")) { - // Only truncate if it's an actual dest - IPString = "" + IPString.substring(0, 4) + ""; - } else { - IPString = IPString + "."; - } - out.write(IPString); - out.write(" "); out.write(_("Totals")); out.write(": "); out.write(ngettext("1 torrent", "{0} torrents", total)); @@ -698,6 +687,17 @@ public class I2PSnarkServlet extends BasicServlet { out.write(", "); out.write(ngettext("1 DHT peer", "{0} DHT peers", dhts)); } + } + String IPString = _manager.util().getOurIPString(); + if(!IPString.equals("unknown")) { + // Only truncate if it's an actual dest + out.write("; "); + out.write(_("Dest")); + out.write(": "); + out.write(IPString.substring(0, 4)); + out.write(""); + } + if (dht != null) { if (showDebug) out.write(dht.renderStatusHTML()); } From 2c191e7bf807662a6636bd24c1d0d8f61a3a20b6 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 8 Jul 2015 13:40:26 +0000 Subject: [PATCH 099/258] Tunnels: New Bloom filter size, increase bandwidth limit (ticket #1505) --- .../router/transport/FIFOBandwidthRefiller.java | 2 +- .../router/tunnel/BloomFilterIVValidator.java | 6 ++++++ .../i2p/router/util/DecayingBloomFilter.java | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java index 1358686cd..3ba1515af 100644 --- a/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java +++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java @@ -75,7 +75,7 @@ public class FIFOBandwidthRefiller implements Runnable { * Do not increase without adding a new Bloom filter size! * See util/DecayingBloomFilter and tunnel/BloomFilterIVValidator. */ - public static final int MAX_OUTBOUND_BANDWIDTH = 8192; + public static final int MAX_OUTBOUND_BANDWIDTH = 16384; /** * how often we replenish the queues. diff --git a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java index beb6ec438..9c8bf9d77 100644 --- a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java @@ -30,10 +30,12 @@ class BloomFilterIVValidator implements IVValidator { private static final int MIN_SHARE_KBPS_FOR_BIG_BLOOM = 512; private static final int MIN_SHARE_KBPS_FOR_HUGE_BLOOM = 1536; private static final int MIN_SHARE_KBPS_FOR_HUGE2_BLOOM = 4096; + private static final int MIN_SHARE_KBPS_FOR_HUGE3_BLOOM = 8192; private static final long MIN_MEM_TO_USE_BLOOM = 64*1024*1024l; private static final long MIN_MEM_FOR_BIG_BLOOM = 128*1024*1024l; private static final long MIN_MEM_FOR_HUGE_BLOOM = 256*1024*1024l; private static final long MIN_MEM_FOR_HUGE2_BLOOM = 384*1024*1024l; + private static final long MIN_MEM_FOR_HUGE3_BLOOM = 512*1024*1024l; /** for testing */ private static final String PROP_FORCE = "router.forceDecayingBloomFilter"; /** for testing */ @@ -57,8 +59,12 @@ class BloomFilterIVValidator implements IVValidator { if (KBps >= MIN_SHARE_KBPS_TO_USE_BLOOM) warn(maxMemory, KBps, MIN_MEM_TO_USE_BLOOM, MIN_SHARE_KBPS_TO_USE_BLOOM); _filter = new DecayingHashSet(ctx, HALFLIFE_MS, 16, "TunnelIVV"); // appx. 4MB max + } else if (KBps >= MIN_SHARE_KBPS_FOR_HUGE3_BLOOM && maxMemory >= MIN_MEM_FOR_HUGE3_BLOOM) { + _filter = new DecayingBloomFilter(ctx, HALFLIFE_MS, 16, "TunnelIVV", 27); // 32MB fixed } else if (KBps >= MIN_SHARE_KBPS_FOR_HUGE2_BLOOM && maxMemory >= MIN_MEM_FOR_HUGE2_BLOOM) { _filter = new DecayingBloomFilter(ctx, HALFLIFE_MS, 16, "TunnelIVV", 26); // 16MB fixed + if (KBps >= MIN_SHARE_KBPS_FOR_HUGE3_BLOOM) + warn(maxMemory, KBps, MIN_MEM_FOR_HUGE3_BLOOM, MIN_SHARE_KBPS_FOR_HUGE3_BLOOM); } else if (KBps >= MIN_SHARE_KBPS_FOR_HUGE_BLOOM && maxMemory >= MIN_MEM_FOR_HUGE_BLOOM) { if (KBps >= MIN_SHARE_KBPS_FOR_HUGE2_BLOOM) warn(maxMemory, KBps, MIN_MEM_FOR_HUGE2_BLOOM, MIN_SHARE_KBPS_FOR_HUGE2_BLOOM); diff --git a/router/java/src/net/i2p/router/util/DecayingBloomFilter.java b/router/java/src/net/i2p/router/util/DecayingBloomFilter.java index a5910e36e..bafd1c2c8 100644 --- a/router/java/src/net/i2p/router/util/DecayingBloomFilter.java +++ b/router/java/src/net/i2p/router/util/DecayingBloomFilter.java @@ -86,16 +86,24 @@ public class DecayingBloomFilter { this(context, durationMs, entryBytes, name, context.getProperty("router.decayingBloomFilterM", DEFAULT_M)); } - /** @param m filter size exponent */ + /** + * @param m filter size exponent, max is 29 + */ public DecayingBloomFilter(I2PAppContext context, int durationMs, int entryBytes, String name, int m) { _context = context; _log = context.logManager().getLog(DecayingBloomFilter.class); _entryBytes = entryBytes; _name = name; int k = DEFAULT_K; - // max is (23,11) or (26,10); see KeySelector for details - if (m > DEFAULT_M) + // max is (23,11) or (26,10) or (29,9); see KeySelector for details + if (m > DEFAULT_M) { k--; + if (m > 26) { + k--; + if (m > 29) + throw new IllegalArgumentException("Max m is 29"); + } + } _current = new BloomSHA1(m, k); _previous = new BloomSHA1(m, k); _durationMs = durationMs; @@ -375,6 +383,9 @@ public class DecayingBloomFilter { * * Following stats for m=26, k=10: * 4096 7.3E-6; 5120 4.5E-5; 6144 1.8E-4; 8192 0.14%; 10240 0.6%, 12288 1.7% + * + * Following stats for m=27, k=9: + * 8192 1.1E-5; 10240 5.6E-5; 12288 2.0E-4; 14336 5.8E-4; 16384 0.14% * */ /***** From dc9d60e2614f02e9c089697698cb95018d0c4271 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Wed, 8 Jul 2015 21:22:45 +0000 Subject: [PATCH 100/258] I2PSnark: - Fix NPE (#1615, h/t kytv) - Fix start/stop status resumption on restart (#766, h/t backup) --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 6 +++--- .../java/src/org/klomp/snark/SnarkManager.java | 14 +++++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 18c414289..fe470bd10 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -617,7 +617,6 @@ public class Snark * @since 0.9.1 */ public synchronized void stopTorrent(boolean fast) { - stopped = true; TrackerClient tc = trackerclient; if (tc != null) tc.halt(fast); @@ -630,15 +629,16 @@ public class Snark // (needed for auto-save to not double-save in some cases) //boolean changed = storage.isChanged() || getUploaded() != savedUploaded; boolean changed = true; + if (changed && completeListener != null) + completeListener.updateStatus(this); try { storage.close(); } catch (IOException ioe) { System.out.println("Error closing " + torrent); ioe.printStackTrace(); } - if (changed && completeListener != null) - completeListener.updateStatus(this); } + stopped = true; if (pc != null && _peerCoordinatorSet != null) _peerCoordinatorSet.remove(pc); if (_peerCoordinatorSet == null) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index f051c560c..3cea051c7 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1272,7 +1272,13 @@ public class SnarkManager implements CompleteListener { } // ok, snark created, now lets start it up or configure it further Properties config = getConfig(torrent); - boolean running = Boolean.parseBoolean(config.getProperty(PROP_META_RUNNING)); + boolean running; + String prop = config.getProperty(PROP_META_RUNNING); + if(prop == null || Boolean.parseBoolean(prop)) { + running = true; + } else { + running = false; + } // Were we running last time? if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); @@ -1432,10 +1438,12 @@ public class SnarkManager implements CompleteListener { Snark snark = getTorrentByInfoHash(metainfo.getInfoHash()); if (snark != null) { addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); + saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, false); // no file priorities return false; + } else { + saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, true); // no file priorities } - // so addTorrent won't recheck - saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, snark.isStopped()); // no file priorities + // so addTorrent won't recheck try { locked_writeMetaInfo(metainfo, filename, areFilesPublic()); // hold the lock for a long time From 17d26976d5535adf5aa5bdcebb9f77f70d16b1ab Mon Sep 17 00:00:00 2001 From: dg2-new Date: Wed, 8 Jul 2015 21:25:33 +0000 Subject: [PATCH 101/258] lang fixups --- apps/BOB/src/net/i2p/BOB/NamedDB.java | 2 +- .../java/src/net/i2p/router/web/SummaryBarRenderer.java | 2 +- .../net/i2p/router/networkdb/kademlia/IterativeLookupJob.java | 2 +- router/java/src/net/i2p/router/time/NtpMessage.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/BOB/src/net/i2p/BOB/NamedDB.java b/apps/BOB/src/net/i2p/BOB/NamedDB.java index 5a1b8e45f..dda9ab268 100644 --- a/apps/BOB/src/net/i2p/BOB/NamedDB.java +++ b/apps/BOB/src/net/i2p/BOB/NamedDB.java @@ -64,7 +64,7 @@ public class NamedDB { } /** - * Find objects in the array, returns it's index or throws exception + * Find objects in the array, returns its index or throws exception * @param key * @return an objects index * @throws ArrayIndexOutOfBoundsException when key does not exist 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 344d36bd1..1dd724e95 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -506,7 +506,7 @@ public class SummaryBarRenderer { .append("
") .append(_("Participating")) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java index 6b243b769..26c69dca4 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java @@ -68,7 +68,7 @@ class IterativeLookupJob extends JobImpl { } RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri == null) { - // Take it on faith that it's ff to speed things up, we don't need the RI + // Take it on faith that its ff to speed things up, we don't need the RI // to query it. // Zero-hop outbound tunnel will be failed in ISJ.sendQuery() _search.newPeerToTry(peer); diff --git a/router/java/src/net/i2p/router/time/NtpMessage.java b/router/java/src/net/i2p/router/time/NtpMessage.java index 8a3aa0397..a2d530e7c 100644 --- a/router/java/src/net/i2p/router/time/NtpMessage.java +++ b/router/java/src/net/i2p/router/time/NtpMessage.java @@ -77,7 +77,7 @@ import net.i2p.util.RandomSource; class NtpMessage { /** * This is a two-bit code warning of an impending leap second to be - * inserted/deleted in the last minute of the current day. It's values + * inserted/deleted in the last minute of the current day. Its values * may be as follows: * * Value Meaning From 631a0674ab1f2b2d586e67422b73d690eca93ea9 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Wed, 8 Jul 2015 21:26:13 +0000 Subject: [PATCH 102/258] bump --- 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 31c35f8c3..ea17ad55f 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 = 14; + public final static long BUILD = 15; /** for example "-test" */ public final static String EXTRA = ""; From 914cc120adb90b9e3572668f579fe3db4dc99dd3 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 12 Jul 2015 14:02:55 +0000 Subject: [PATCH 103/258] Findbugs all over --- apps/BOB/src/net/i2p/BOB/I2Plistener.java | 12 ++-- apps/BOB/src/net/i2p/BOB/TCPlistener.java | 11 ++-- apps/BOB/src/net/i2p/BOB/UDPIOthread.java | 11 ++-- .../i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 1 - .../udpTunnel/I2PTunnelUDPClientBase.java | 3 +- .../udpTunnel/I2PTunnelUDPServerBase.java | 9 +-- .../src/net/i2p/router/news/NewsMetadata.java | 55 ++++++++++++++++++- .../i2p/router/web/WebAppConfiguration.java | 23 +++++--- .../i2p/susi/webmail/encoding/HeaderLine.java | 11 ++-- .../i2p/crypto/eddsa/math/FieldElement.java | 6 +- history.txt | 16 +++++- .../i2p/data/router/RouterKeyGenerator.java | 10 ++-- .../router/tunnel/BloomFilterIVValidator.java | 4 +- 13 files changed, 119 insertions(+), 53 deletions(-) diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java index 28c053a3a..f862c7cae 100644 --- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java +++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java @@ -30,16 +30,15 @@ import net.i2p.client.streaming.I2PSocketManager; */ public class I2Plistener implements Runnable { - private NamedDB info, database; - private Logger _log; - public I2PSocketManager socketManager; - public I2PServerSocket serverSocket; - private AtomicBoolean lives; + private final NamedDB info, database; + private final Logger _log; + private final I2PServerSocket serverSocket; + private final AtomicBoolean lives; /** * Constructor * @param SS - * @param S + * @param S unused * @param info * @param database * @param _log @@ -48,7 +47,6 @@ public class I2Plistener implements Runnable { this.database = database; this.info = info; this._log = _log; - this.socketManager = S; this.serverSocket = SS; this.lives = lives; } diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java index e5dd41d59..70ff52b14 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java +++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java @@ -30,12 +30,11 @@ import net.i2p.client.streaming.I2PSocketManager; */ public class TCPlistener implements Runnable { - private NamedDB info, database; - private Logger _log; - public I2PSocketManager socketManager; - public I2PServerSocket serverSocket; - private ServerSocket listener; - private AtomicBoolean lives; + private final NamedDB info, database; + private final Logger _log; + private final I2PSocketManager socketManager; + private final ServerSocket listener; + private final AtomicBoolean lives; /** * Constructor diff --git a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java index 1b6f4249d..9448d1d7b 100644 --- a/apps/BOB/src/net/i2p/BOB/UDPIOthread.java +++ b/apps/BOB/src/net/i2p/BOB/UDPIOthread.java @@ -34,15 +34,17 @@ import net.i2p.util.Log; * The skeletal frame is here, just needs to be finished. * * @author sponge + * @deprecated incomplete, unused */ public class UDPIOthread implements I2PSessionListener, Runnable { - private NamedDB info; - private Log _log; - private Socket socket; + private final NamedDB info; + private final Log _log; + private final Socket socket; private DataInputStream in; private DataOutputStream out; - private I2PSession _session; + private final I2PSession _session; + // FIXME never set private Destination _peerDestination; private boolean up; @@ -58,7 +60,6 @@ public class UDPIOthread implements I2PSessionListener, Runnable { this._log = _log; this.socket = socket; this._session = _session; - } /** 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 19ab11a46..916793941 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java @@ -27,7 +27,6 @@ import net.i2p.util.Log; public class I2PSOCKSTunnel extends I2PTunnelClientBase { private HashMap> proxies = null; // port# + "" or "default" -> hostname list - protected Destination outProxyDest = null; //public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest) { // I2PSOCKSTunnel(localPort, l, ownDest, (EventDispatcher)null); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java index a89e34898..75b0d683d 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java @@ -52,8 +52,6 @@ import net.i2p.util.EventDispatcher; private static final AtomicLong __clientId = new AtomicLong(); protected long _clientId; - protected Destination dest; - private final Object startLock = new Object(); private final I2PSession _session; @@ -98,6 +96,7 @@ import net.i2p.util.EventDispatcher; // create a session try { ByteArrayInputStream in = new ByteArrayInputStream(key); + // FIXME this may not pick up non-default I2CP host/port settings from tunnel _session = client.createSession(in, tunnel.getClientOptions()); connected(_session); } catch(Exception exc) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java index b5fc94b2e..ade6e3058 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java @@ -87,19 +87,12 @@ public class I2PTunnelUDPServerBase extends I2PTunnelTask implements Source, Sin private void init(boolean verify, InputStream privData, String privkeyname, Logging l) { this.l = l; - int portNum = 7654; - if (getTunnel().port != null) { - try { - portNum = Integer.parseInt(getTunnel().port); - } catch (NumberFormatException nfe) { - _log.log(Log.CRIT, "Invalid port specified [" + getTunnel().port + "], reverting to " + portNum); - } - } // create i2pclient I2PClient client = I2PClientFactory.createClient(); try { + // FIXME this may not pick up non-default I2CP host/port settings from tunnel _session = client.createSession(privData, getTunnel().getClientOptions()); connected(_session); } catch(I2PSessionException exc) { diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsMetadata.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsMetadata.java index 15adf5955..9abf512ef 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsMetadata.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsMetadata.java @@ -1,6 +1,8 @@ package net.i2p.router.news; import java.util.List; + +import net.i2p.data.DataHelper; import net.i2p.util.VersionComparator; /** @@ -16,7 +18,7 @@ public class NewsMetadata { public String feedID; public long feedUpdated; - // I2P metadata + /** I2P metadata */ public List releases; public static class Release implements Comparable { @@ -31,6 +33,31 @@ public class NewsMetadata { // Sort latest version first. return VersionComparator.comp(other.i2pVersion, i2pVersion); } + + /** + * For findbugs. + * Warning, not a complete comparison. + * Must be enhanced before using in a Map or Set. + * @since 0.9.21 + */ + @Override + public boolean equals(Object o) { + if (o == null) + return false; + if (!(o instanceof Release)) + return false; + Release r = (Release) o; + return DataHelper.eq(i2pVersion, r.i2pVersion); + } + + /** + * For findbugs. + * @since 0.9.21 + */ + @Override + public int hashCode() { + return DataHelper.hashCode(i2pVersion); + } } public static class Update implements Comparable { @@ -44,6 +71,7 @@ public class NewsMetadata { return getTypeOrder() - other.getTypeOrder(); } + /** lower is preferred */ protected int getTypeOrder() { if ("su3".equalsIgnoreCase(type)) return 1; @@ -52,5 +80,30 @@ public class NewsMetadata { else return 3; } + + /** + * For findbugs. + * Warning, not a complete comparison. + * Must be enhanced before using in a Map or Set. + * @since 0.9.21 + */ + @Override + public boolean equals(Object o) { + if (o == null) + return false; + if (!(o instanceof Update)) + return false; + Update u = (Update) o; + return getTypeOrder() == u.getTypeOrder(); + } + + /** + * For findbugs. + * @since 0.9.21 + */ + @Override + public int hashCode() { + return getTypeOrder(); + } } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java index d03795be0..440c61c03 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java @@ -1,6 +1,8 @@ package net.i2p.router.web; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.util.Arrays; @@ -108,7 +110,7 @@ public class WebAppConfiguration implements Configuration { return; StringTokenizer tok = new StringTokenizer(cp, " ,"); StringBuilder buf = new StringBuilder(); - Set systemCP = getSystemClassPath(); + Set systemCP = getSystemClassPath(); while (tok.hasMoreTokens()) { if (buf.length() > 0) buf.append(','); @@ -127,8 +129,8 @@ public class WebAppConfiguration implements Configuration { // TODO: Add a classpath to the command line in i2pstandalone.xml? File jfile = new File(path); File jdir = jfile.getParentFile(); - if (systemCP.contains(jfile.toURI().toURL()) || - (jdir != null && systemCP.contains(jdir.toURI().toURL()))) { + if (systemCP.contains(jfile.toURI()) || + (jdir != null && systemCP.contains(jdir.toURI()))) { //System.err.println("Not adding " + path + " to classpath for " + appName + ", already in system classpath"); // Ticket #957... don't know why... if (!ctxPath.equals("/susimail")) @@ -151,13 +153,20 @@ public class WebAppConfiguration implements Configuration { } } - /** @since 0.9 */ - private static Set getSystemClassPath() { + /** + * Convert URL to URI so there's no blocking equals(), + * not that there's really any hostnames in here, + * but keep findbugs happy. + * @since 0.9 + */ + private static Set getSystemClassPath() { URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader(); URL urls[] = urlClassLoader.getURLs(); - Set rv = new HashSet(32); + Set rv = new HashSet(32); for (int i = 0; i < urls.length; i++) { - rv.add(urls[i]); + try { + rv.add(urls[i].toURI()); + } catch (URISyntaxException use) {} } return rv; } diff --git a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java index c18b9eac8..4ed370dd2 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java +++ b/apps/susimail/src/src/i2p/susi/webmail/encoding/HeaderLine.java @@ -66,7 +66,7 @@ public class HeaderLine implements Encoding { boolean quoting = false; boolean quote = false; boolean linebreak = false; - String quotedSequence = null; + StringBuilder quotedSequence = null; int rest = in.length; int index = 0; while( true ) { @@ -102,14 +102,15 @@ public class HeaderLine implements Encoding { } if( quote ) { if( ! quoting ) { - quotedSequence = "=?utf-8?Q?"; + quotedSequence = new StringBuilder(64); + quotedSequence.append("=?utf-8?Q?"); quoting = true; } - quotedSequence += HexTable.table[ c < 0 ? 256 + c : c ]; + quotedSequence.append(HexTable.table[ c < 0 ? 256 + c : c ]); } else { if( quoting ) { - quotedSequence += "?="; + quotedSequence.append("?="); int sl = quotedSequence.length(); if( l + sl > 76 ) { /* @@ -138,7 +139,7 @@ public class HeaderLine implements Encoding { } } if( quoting ) { - quotedSequence += "?="; + quotedSequence.append("?="); int sl = quotedSequence.length(); if( l + sl > 76 ) { /* diff --git a/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java b/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java index 7b29590ef..4bea7c39e 100644 --- a/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java +++ b/core/java/src/net/i2p/crypto/eddsa/math/FieldElement.java @@ -1,11 +1,15 @@ package net.i2p.crypto.eddsa.math; +import java.io.Serializable; + /** * * @since 0.9.15 * */ -public abstract class FieldElement { +public abstract class FieldElement implements Serializable { + private static final long serialVersionUID = 1239527465875676L; + protected final Field f; public FieldElement(Field f) { diff --git a/history.txt b/history.txt index 0092e5f22..b58e40bbf 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,15 @@ +2015-07-12 zzz + * Findbugs all over + +2015-07-08 zzz + * Tunnels: New Bloom filter size, increase bandwidth limit (ticket #1505) + +2015-07-07 zzz + * Crypto: Check for error return from sign() + * i2psnark: Tweak dest display in footer + * Streaming: New config to add to DSA-only list + * Updates: New news URL + 2015-07-05 zzz * SSU: Compete better with NTCP for outbound bandwidth allocations * Transport: Adjust thread priorities to prevent I/O stalling @@ -26,8 +38,8 @@ raise class L/M boundary to match so defaulted routers are still L 2015-06-22 dg - * NetDB: Partially revert last NetDB change: flood because we don't want to create a hole in the DHT - before publisher resends to somebody else. + * NetDB: Partially revert last NetDB change: flood because we don't want + to create a hole in the DHT before publisher resends to somebody else. 2015-06-20 dg * I2PSnark: Auto-start now only starts torrents which were running at shutdown (#766) diff --git a/router/java/src/net/i2p/data/router/RouterKeyGenerator.java b/router/java/src/net/i2p/data/router/RouterKeyGenerator.java index 69e6aacec..02e49ede5 100644 --- a/router/java/src/net/i2p/data/router/RouterKeyGenerator.java +++ b/router/java/src/net/i2p/data/router/RouterKeyGenerator.java @@ -52,6 +52,8 @@ public class RouterKeyGenerator extends RoutingKeyGenerator { public RouterKeyGenerator(I2PAppContext context) { _log = context.logManager().getLog(RoutingKeyGenerator.class); _context = context; + // make sure GMT is set, azi2phelper Vuze plugin is disabling static JVM TZ setting in Router.java + _fmt.setCalendar(_cal); // ensure non-null mod data generateDateBasedModData(); } @@ -61,14 +63,10 @@ public class RouterKeyGenerator extends RoutingKeyGenerator { private volatile long _nextMidnight; private volatile long _lastChanged; - private final static Calendar _cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT")); + private final Calendar _cal = GregorianCalendar.getInstance(TimeZone.getTimeZone("GMT")); private static final String FORMAT = "yyyyMMdd"; private static final int LENGTH = FORMAT.length(); - private final static SimpleDateFormat _fmt = new SimpleDateFormat(FORMAT, Locale.US); - static { - // make sure GMT is set, azi2phelper Vuze plugin is disabling static JVM TZ setting in Router.java - _fmt.setCalendar(_cal); - } + private final SimpleDateFormat _fmt = new SimpleDateFormat(FORMAT, Locale.US); /** * The current (today's) mod data. diff --git a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java index 9c8bf9d77..62fa46231 100644 --- a/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java +++ b/router/java/src/net/i2p/router/tunnel/BloomFilterIVValidator.java @@ -113,7 +113,7 @@ class BloomFilterIVValidator implements IVValidator { path = _context.getBaseDir().toString(); } String msg = - "Configured for " + DataHelper.formatSize(KBps *1024) + + "Configured for " + DataHelper.formatSize(KBps *1024L) + "Bps share bandwidth but only " + DataHelper.formatSize(maxMemory) + "B available memory." + " Recommend increasing wrapper.java.maxmemory in " + @@ -121,7 +121,7 @@ class BloomFilterIVValidator implements IVValidator { // getMaxMemory() returns significantly lower than wrapper config, so add 10% " to at least " + (recMaxMem * 11 / 10 / (1024*1024)) + " (MB)" + " if the actual share bandwidth exceeds " + - DataHelper.formatSize(threshKBps * 1024) + "Bps."; + DataHelper.formatSize(threshKBps * 1024L) + "Bps."; System.out.println("WARN: " + msg); _context.logManager().getLog(BloomFilterIVValidator.class).logAlways(Log.WARN, msg); } From 1f9bb046f5d9c391a84c801d9a164f524f9dd9b9 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 12 Jul 2015 16:06:49 +0000 Subject: [PATCH 104/258] Findbugs all over #2 Mostly char encoding Use StringWriter rather than OSW->BAOS->String --- .../src/net/i2p/addressbook/AddressBook.java | 9 +++++++-- .../src/net/i2p/addressbook/ConfigIterator.java | 6 ++---- .../src/net/i2p/addressbook/ConfigParser.java | 4 ++-- .../java/src/net/i2p/addressbook/Log.java | 7 ++++--- .../src/org/klomp/snark/bencode/BEValue.java | 3 ++- .../i2p/i2ptunnel/HTTPResponseOutputStream.java | 7 ++++--- .../net/i2p/i2ptunnel/socks/SOCKS5Server.java | 3 ++- .../src/net/i2p/i2ptunnel/socks/SOCKSHeader.java | 3 ++- .../net/i2p/router/web/ConfigKeyringHelper.java | 9 ++++----- .../src/net/i2p/router/web/ConfigPeerHelper.java | 9 ++++----- .../src/net/i2p/router/web/JobQueueHelper.java | 9 ++++----- .../src/net/i2p/router/web/TunnelHelper.java | 9 ++++----- .../java/src/net/i2p/sam/client/SAMReader.java | 2 +- .../src/net/i2p/sam/client/SAMStreamSend.java | 2 +- .../src/src/i2p/susi/util/ReadBuffer.java | 4 +++- build.xml | 1 + .../net/i2p/crypto/eddsa/EdDSAPrivateKey.java | 12 ++++++------ core/java/src/net/i2p/data/Base32.java | 8 ++++---- core/java/src/net/i2p/data/Base64.java | 6 +++--- core/java/src/net/i2p/data/Certificate.java | 2 +- core/java/src/net/i2p/data/DataHelper.java | 1 - .../src/net/i2p/data/VerifiedDestination.java | 2 +- .../src/net/i2p/util/LogRecordFormatter.java | 16 ++++++---------- .../i2p/router/networkdb/reseed/Reseeder.java | 2 +- .../java/src/net/i2p/router/time/NtpMessage.java | 8 +++++++- 25 files changed, 76 insertions(+), 68 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java index 4a124e488..40eeff590 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java @@ -159,8 +159,13 @@ class AddressBook { * @since 0.8.7 */ public Iterator> iterator() { - if (this.subFile != null) - return new ConfigIterator(this.subFile); + if (this.subFile != null) { + try { + return new ConfigIterator(this.subFile); + } catch (IOException ioe) { + return new ConfigIterator(); + } + } return this.addresses.entrySet().iterator(); } diff --git a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java index 955363eaf..8b01fb854 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java @@ -54,11 +54,9 @@ class ConfigIterator implements Iterator> { /** * An iterator over the key/value pairs in the file. */ - public ConfigIterator(File file) { - try { + public ConfigIterator(File file) throws IOException { FileInputStream fileStream = new FileInputStream(file); - input = new BufferedReader(new InputStreamReader(fileStream)); - } catch (IOException ioe) {} + input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8")); } public boolean hasNext() { diff --git a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java index 5fda52940..e2cd8ab2a 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigParser.java @@ -116,7 +116,7 @@ class ConfigParser { public static Map parse(File file) throws IOException { FileInputStream fileStream = new FileInputStream(file); BufferedReader input = new BufferedReader(new InputStreamReader( - fileStream)); + fileStream, "UTF-8")); Map rv = parse(input); try { fileStream.close(); @@ -205,7 +205,7 @@ class ConfigParser { public static List parseSubscriptions(File file) throws IOException { FileInputStream fileStream = new FileInputStream(file); BufferedReader input = new BufferedReader(new InputStreamReader( - fileStream)); + fileStream, "UTF-8")); List rv = parseSubscriptions(input); try { fileStream.close(); diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Log.java b/apps/addressbook/java/src/net/i2p/addressbook/Log.java index d0f01904f..a87af2537 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Log.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Log.java @@ -23,8 +23,9 @@ package net.i2p.addressbook; import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.Date; /** @@ -56,8 +57,8 @@ class Log { public void append(String entry) { BufferedWriter bw = null; try { - bw = new BufferedWriter(new FileWriter(this.file, - true)); + bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(this.file, + true), "UTF-8")); String timestamp = new Date().toString(); bw.write(timestamp + " -- " + entry); bw.newLine(); diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java index 0664065fb..4fd943c89 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEValue.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import net.i2p.data.Base64; +import net.i2p.data.DataHelper; /** * Holds different types that a bencoded byte array can represent. @@ -208,7 +209,7 @@ public class BEValue } else if (bin) { buf.append(bs.length).append(" bytes: ").append(Base64.encode(bs)); } else { - buf.append('"').append(new String(bs)).append('"'); + buf.append('"').append(DataHelper.getUTF8(bs)).append('"'); } valueString = buf.toString(); } else diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java index 25f7fcf68..83fbb6d0a 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java @@ -15,6 +15,7 @@ import java.util.Locale; import net.i2p.I2PAppContext; import net.i2p.data.ByteArray; +import net.i2p.data.DataHelper; import net.i2p.util.ByteCache; import net.i2p.util.Log; @@ -145,7 +146,7 @@ class HTTPResponseOutputStream extends FilterOutputStream { for (int i = 0; i < _headerBuffer.getValid(); i++) { if (isNL(_headerBuffer.getData()[i])) { if (lastEnd == -1) { - responseLine = new String(_headerBuffer.getData(), 0, i+1); // includes NL + responseLine = DataHelper.getUTF8(_headerBuffer.getData(), 0, i+1); // includes NL responseLine = filterResponseLine(responseLine); responseLine = (responseLine.trim() + "\r\n"); if (_log.shouldLog(Log.INFO)) @@ -158,12 +159,12 @@ class HTTPResponseOutputStream extends FilterOutputStream { int valLen = i-(j+1); if ( (keyLen <= 0) || (valLen < 0) ) throw new IOException("Invalid header @ " + j); - String key = new String(_headerBuffer.getData(), lastEnd+1, keyLen); + String key = DataHelper.getUTF8(_headerBuffer.getData(), lastEnd+1, keyLen); String val = null; if (valLen == 0) val = ""; else - val = new String(_headerBuffer.getData(), j+2, valLen).trim(); + val = DataHelper.getUTF8(_headerBuffer.getData(), j+2, valLen).trim(); if (_log.shouldLog(Log.INFO)) _log.info("Response header [" + key + "] = [" + val + "]"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java index 02c5c3b0e..5fff2c1eb 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java @@ -24,6 +24,7 @@ import net.i2p.I2PException; import net.i2p.client.streaming.I2PSocket; import net.i2p.client.streaming.I2PSocketOptions; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.i2ptunnel.I2PTunnelHTTPClientBase; import net.i2p.i2ptunnel.I2PTunnel; @@ -226,7 +227,7 @@ public class SOCKS5Server extends SOCKSServer { } byte addr[] = new byte[addrLen]; in.readFully(addr); - connHostName = new String(addr); + connHostName = DataHelper.getUTF8(addr); } _log.debug("DOMAINNAME address type in request: " + connHostName); break; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java index e2e7edc72..9b8a2c6f4 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java @@ -1,6 +1,7 @@ package net.i2p.i2ptunnel.socks; import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; /** @@ -65,7 +66,7 @@ public class SOCKSHeader { int namelen = (this.header[4] & 0xff); byte[] nameBytes = new byte[namelen]; System.arraycopy(nameBytes, 0, this.header, 5, namelen); - return new String(nameBytes); + return DataHelper.getUTF8(nameBytes); } public Destination getDestination() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java index 8c147fcdd..cf0a5be4b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java @@ -1,20 +1,19 @@ package net.i2p.router.web; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; +import java.io.StringWriter; public class ConfigKeyringHelper extends HelperBase { public ConfigKeyringHelper() {} public String getSummary() { - ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024); + StringWriter sw = new StringWriter(4*1024); try { - _context.keyRing().renderStatusHTML(new OutputStreamWriter(baos)); + _context.keyRing().renderStatusHTML(sw); } catch (IOException ioe) { ioe.printStackTrace(); } - return new String(baos.toByteArray()); + return sw.toString(); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java index 9db6722b4..fe532d470 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java @@ -1,20 +1,19 @@ package net.i2p.router.web; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; +import java.io.StringWriter; public class ConfigPeerHelper extends HelperBase { public ConfigPeerHelper() {} public String getBlocklistSummary() { - ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024); + StringWriter sw = new StringWriter(4*1024); try { - _context.blocklist().renderStatusHTML(new OutputStreamWriter(baos)); + _context.blocklist().renderStatusHTML(sw); } catch (IOException ioe) { ioe.printStackTrace(); } - return new String(baos.toByteArray()); + return sw.toString(); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index e270bf7ff..e6dc09a20 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -1,8 +1,7 @@ package net.i2p.router.web; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; +import java.io.StringWriter; import java.io.Serializable; import java.io.Writer; import java.util.ArrayList; @@ -25,9 +24,9 @@ public class JobQueueHelper extends HelperBase { renderStatusHTML(_out); return ""; } else { - ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024); - renderStatusHTML(new OutputStreamWriter(baos)); - return new String(baos.toByteArray()); + StringWriter sw = new StringWriter(32*1024); + renderStatusHTML(sw); + return sw.toString(); } } catch (IOException ioe) { ioe.printStackTrace(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java index db64f77c2..c462c75d3 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelHelper.java @@ -1,8 +1,7 @@ package net.i2p.router.web; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.OutputStreamWriter; +import java.io.StringWriter; public class TunnelHelper extends HelperBase { @@ -15,9 +14,9 @@ public class TunnelHelper extends HelperBase { renderer.renderStatusHTML(_out); return ""; } else { - ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024); - renderer.renderStatusHTML(new OutputStreamWriter(baos)); - return new String(baos.toByteArray()); + StringWriter sw = new StringWriter(32*1024); + renderer.renderStatusHTML(sw); + return sw.toString(); } } catch (IOException ioe) { ioe.printStackTrace(); diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java index 0421a6458..f39394901 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMReader.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMReader.java @@ -94,7 +94,7 @@ public class SAMReader { _log.error("Error reading from SAM", ioe); } - String line = new String(baos.toByteArray()); + String line = DataHelper.getUTF8(baos.toByteArray()); baos.reset(); if (line == null) { diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java index a0d82d777..2ce8b3b02 100644 --- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java +++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java @@ -180,7 +180,7 @@ public class SAMStreamSend { byte dest[] = new byte[1024]; int read = DataHelper.read(fin, dest); - _remoteDestination = new String(dest, 0, read); + _remoteDestination = DataHelper.getUTF8(dest, 0, read); synchronized (_remotePeers) { _connectionId = _remotePeers.size() + 1; _remotePeers.put(Integer.valueOf(_connectionId), Sender.this); diff --git a/apps/susimail/src/src/i2p/susi/util/ReadBuffer.java b/apps/susimail/src/src/i2p/susi/util/ReadBuffer.java index 32d54c77e..fb65e33a1 100644 --- a/apps/susimail/src/src/i2p/susi/util/ReadBuffer.java +++ b/apps/susimail/src/src/i2p/susi/util/ReadBuffer.java @@ -23,6 +23,8 @@ */ package i2p.susi.util; +import net.i2p.data.DataHelper; + /** * @author susi */ @@ -39,6 +41,6 @@ public class ReadBuffer { public String toString() { - return content != null ? new String( content, offset, length ) : ""; + return content != null ? DataHelper.getUTF8(content, offset, length) : ""; } } diff --git a/build.xml b/build.xml index a3c344f3f..8b2ef5085 100644 --- a/build.xml +++ b/build.xml @@ -1735,6 +1735,7 @@ + diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java index d3945976a..4136b321a 100644 --- a/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java +++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java @@ -15,12 +15,12 @@ import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; */ public class EdDSAPrivateKey implements EdDSAKey, PrivateKey { private static final long serialVersionUID = 23495873459878957L; - private transient final byte[] seed; - private transient final byte[] h; - private transient final byte[] a; - private transient final GroupElement A; - private transient final byte[] Abyte; - private transient final EdDSAParameterSpec edDsaSpec; + private final byte[] seed; + private final byte[] h; + private final byte[] a; + private final GroupElement A; + private final byte[] Abyte; + private final EdDSAParameterSpec edDsaSpec; public EdDSAPrivateKey(EdDSAPrivateKeySpec spec) { this.seed = spec.getSeed(); diff --git a/core/java/src/net/i2p/data/Base32.java b/core/java/src/net/i2p/data/Base32.java index 4ca506b88..8270aa932 100644 --- a/core/java/src/net/i2p/data/Base32.java +++ b/core/java/src/net/i2p/data/Base32.java @@ -101,8 +101,8 @@ public class Base32 { } private static byte[] read(InputStream in) throws IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(4096); - byte buf[] = new byte[4096]; + ByteArrayOutputStream baos = new ByteArrayOutputStream(64); + byte buf[] = new byte[64]; while (true) { int read = in.read(buf); if (read < 0) break; @@ -118,7 +118,7 @@ public class Base32 { } private static void decode(InputStream in, OutputStream out) throws IOException { - byte decoded[] = decode(new String(read(in))); + byte decoded[] = decode(DataHelper.getUTF8(read(in))); if (decoded == null) { System.out.println("FAIL"); return; @@ -199,7 +199,7 @@ public class Base32 { byte[] b = decode(s); if (b == null) return null; - return new String(b); + return DataHelper.getUTF8(b); } /** diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java index 2633c1b69..3babe10ee 100644 --- a/core/java/src/net/i2p/data/Base64.java +++ b/core/java/src/net/i2p/data/Base64.java @@ -246,8 +246,8 @@ public class Base64 { } private static byte[] read(InputStream in) throws IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(4096); - byte buf[] = new byte[4096]; + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + byte buf[] = new byte[1024]; while (true) { int read = in.read(buf); if (read < 0) break; @@ -263,7 +263,7 @@ public class Base64 { } private static void decode(InputStream in, OutputStream out) throws IOException { - byte decoded[] = decode(new String(read(in))); + byte decoded[] = decode(DataHelper.getUTF8(read(in))); if (decoded == null) throw new IOException("Invalid base 64 string"); out.write(decoded); diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index 0f79b9d53..fdc343a63 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -262,7 +262,7 @@ public class Certificate extends DataStructureImpl { } else { buf.append(" payload size: ").append(_payload.length); if (getCertificateType() == CERTIFICATE_TYPE_HASHCASH) { - buf.append(" Stamp: ").append(new String(_payload)); + buf.append(" Stamp: ").append(DataHelper.getUTF8(_payload)); } else if (getCertificateType() == CERTIFICATE_TYPE_SIGNED && _payload.length == CERTIFICATE_LENGTH_SIGNED_WITH_HASH) { buf.append(" Signed by hash: ").append(Base64.encode(_payload, Signature.SIGNATURE_BYTES, Hash.HASH_LENGTH)); } else { diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 750d53ede..f35a6ddb6 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -1864,7 +1864,6 @@ public class DataHelper { * * @return null if orig is null * @throws RuntimeException - * @deprecated unused */ public static String getUTF8(byte orig[], int offset, int len) { if (orig == null) return null; diff --git a/core/java/src/net/i2p/data/VerifiedDestination.java b/core/java/src/net/i2p/data/VerifiedDestination.java index dee86800d..1123f6499 100644 --- a/core/java/src/net/i2p/data/VerifiedDestination.java +++ b/core/java/src/net/i2p/data/VerifiedDestination.java @@ -87,7 +87,7 @@ public class VerifiedDestination extends Destination { * zeros and see if it meets our minimum effort. */ protected boolean verifyHashCashCert() { - String hcs = new String(_certificate.getPayload()); + String hcs = DataHelper.getUTF8(_certificate.getPayload()); int end1 = 0; for (int i = 0; i < 3; i++) { end1 = 1 + hcs.indexOf(':', end1); diff --git a/core/java/src/net/i2p/util/LogRecordFormatter.java b/core/java/src/net/i2p/util/LogRecordFormatter.java index d46a6ec76..4f367defe 100644 --- a/core/java/src/net/i2p/util/LogRecordFormatter.java +++ b/core/java/src/net/i2p/util/LogRecordFormatter.java @@ -9,12 +9,13 @@ package net.i2p.util; * */ -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; +import java.io.StringWriter; import java.util.Date; import net.i2p.I2PAppContext; +import net.i2p.data.DataHelper; /** * Render a log record according to the log manager's settings @@ -71,16 +72,11 @@ class LogRecordFormatter { } buf.append(NL); if (rec.getThrowable() != null) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - PrintWriter pw = new PrintWriter(baos, true); + StringWriter sw = new StringWriter(512); + PrintWriter pw = new PrintWriter(sw, true); rec.getThrowable().printStackTrace(pw); - try { - pw.flush(); - baos.flush(); - } catch (IOException ioe) { // nop - } - byte tb[] = baos.toByteArray(); - buf.append(new String(tb)); + sw.flush(); + buf.append(sw.toString()); } return buf.toString(); } 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 3830db6d4..d930cac9b 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -572,7 +572,7 @@ public class Reseeder { System.err.println("Reseed got no router infos from " + seedURL); return 0; } - String content = new String(contentRaw); + String content = DataHelper.getUTF8(contentRaw); // This isn't really URLs, but Base64 hashes // but they may include % encoding Set urls = new HashSet(1024); diff --git a/router/java/src/net/i2p/router/time/NtpMessage.java b/router/java/src/net/i2p/router/time/NtpMessage.java index a2d530e7c..ea02cce5f 100644 --- a/router/java/src/net/i2p/router/time/NtpMessage.java +++ b/router/java/src/net/i2p/router/time/NtpMessage.java @@ -442,7 +442,13 @@ class NtpMessage { // or stratum-1 (primary) servers, this is a four-character ASCII // string, left justified and zero padded to 32 bits. if(stratum==0 || stratum==1) { - return new String(ref); + StringBuilder buf = new StringBuilder(4); + for (int i = 0; i < 4; i++) { + if (ref[i] == 0) + break; + buf.append((char) (ref[i] & 0xff)); + } + return buf.toString(); } // In NTP Version 3 secondary servers, this is the 32-bit IPv4 From d087fd674b4f40a441d58c11fe1b647b3c5b8b72 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 12 Jul 2015 16:34:24 +0000 Subject: [PATCH 105/258] Findbugs all over #3 char encoding, remove FileReader/FileWriter Fix TunnelConfig bug --- apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java | 3 +-- apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java | 5 +++-- .../java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java | 2 +- .../src/java/src/i2p/susi/dns/SubscriptionsBean.java | 8 +++++--- core/java/src/net/i2p/crypto/CertUtil.java | 3 ++- core/java/src/net/i2p/stat/BufferedStatLog.java | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index 621e11a29..7c0062075 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -35,7 +35,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -1605,7 +1604,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging { private void runRun(String args[], Logging l) { if (args.length == 1) { try { - BufferedReader br = new BufferedReader(new FileReader(args[0])); + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(args[0]), "UTF-8")); String line; while ((line = br.readLine()) != null) { runCommand(line, l); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java index 73c1dd74a..dd59042d8 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java @@ -4,8 +4,9 @@ package net.i2p.i2ptunnel; import java.io.BufferedReader; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.net.Socket; import java.util.ArrayList; import java.util.List; @@ -157,7 +158,7 @@ public class I2Ping extends I2PTunnelClientBase { } if (hostListFile != null) { - BufferedReader br = new BufferedReader(new FileReader(hostListFile)); + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(hostListFile), "UTF-8")); String line; List pingHandlers = new ArrayList(); int i = 0; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java index 17cb4e6ac..c0839e503 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java @@ -319,7 +319,7 @@ public class TunnelConfig { if (val) _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT); else - _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT); + _booleanOptions.remove(I2PTunnelHTTPClient.PROP_ACCEPT); } public void setAllowInternalSSL(boolean val) { if (val) 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 e1088557a..aae4d50a3 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java @@ -27,9 +27,11 @@ package i2p.susi.dns; import java.io.ByteArrayInputStream; import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collections; @@ -71,7 +73,7 @@ public class SubscriptionsBean extends BaseBean StringBuilder buf = new StringBuilder(); BufferedReader br = null; try { - br = new BufferedReader( new FileReader( file ) ); + br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8")); String line; while( ( line = br.readLine() ) != null ) { buf.append( line ); @@ -108,7 +110,7 @@ public class SubscriptionsBean extends BaseBean urls.add(line); } Collections.sort(urls); - PrintWriter out = new PrintWriter( new SecureFileOutputStream( file ) ); + PrintWriter out = new PrintWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8")); for (String url : urls) { out.println(url); } diff --git a/core/java/src/net/i2p/crypto/CertUtil.java b/core/java/src/net/i2p/crypto/CertUtil.java index 4d85aa691..e0b73cade 100644 --- a/core/java/src/net/i2p/crypto/CertUtil.java +++ b/core/java/src/net/i2p/crypto/CertUtil.java @@ -3,6 +3,7 @@ package net.i2p.crypto; import java.io.File; import java.io.IOException; import java.io.OutputStream; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; @@ -45,7 +46,7 @@ public class CertUtil { // Get the encoded form which is suitable for exporting byte[] buf = cert.getEncoded(); os = new SecureFileOutputStream(file); - wr = new PrintWriter(os); + wr = new PrintWriter(new OutputStreamWriter(os, "UTF-8")); wr.println("-----BEGIN CERTIFICATE-----"); String b64 = Base64.encode(buf, true); // true = use standard alphabet for (int i = 0; i < b64.length(); i += LINE_LENGTH) { diff --git a/core/java/src/net/i2p/stat/BufferedStatLog.java b/core/java/src/net/i2p/stat/BufferedStatLog.java index 20b6a2a49..7c9b7b723 100644 --- a/core/java/src/net/i2p/stat/BufferedStatLog.java +++ b/core/java/src/net/i2p/stat/BufferedStatLog.java @@ -2,8 +2,9 @@ package net.i2p.stat; import java.io.BufferedWriter; import java.io.File; -import java.io.FileWriter; +import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStreamWriter; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -115,7 +116,7 @@ public class BufferedStatLog implements StatLog { if (_out != null) try { _out.close(); } catch (IOException ioe) {} _outFile = filename; try { - _out = new BufferedWriter(new FileWriter(_outFile, true), 32*1024); + _out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(_outFile, true), "UTF-8"), 32*1024); } catch (IOException ioe) { ioe.printStackTrace(); } } } From 1ed1e4414bc8dcd579adb883196abb1999ef5d70 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 12 Jul 2015 19:19:32 +0000 Subject: [PATCH 106/258] Findbugs all over #4 char encoding --- apps/routerconsole/jsp/error500.jsp | 10 ++-- .../naming/SingleFileNamingService.java | 3 +- core/java/src/net/i2p/stat/RateStat.java | 4 +- core/java/src/net/i2p/util/HexDump.java | 46 ++++++++++++------- .../src/net/i2p/util/LogRecordFormatter.java | 4 +- .../net/i2p/router/peermanager/DBHistory.java | 2 +- .../peermanager/ProfilePersistenceHelper.java | 2 +- .../i2p/router/peermanager/TunnelHistory.java | 2 +- .../net/i2p/router/startup/WorkingDir.java | 2 +- .../net/i2p/router/tasks/MarkLiveliness.java | 3 +- 10 files changed, 47 insertions(+), 31 deletions(-) diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp index 70e82e9d2..223b4d5de 100644 --- a/apps/routerconsole/jsp/error500.jsp +++ b/apps/routerconsole/jsp/error500.jsp @@ -45,11 +45,11 @@

<% if (ERROR_THROWABLE != null) { - java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream(2048); - java.io.PrintStream ps = new java.io.PrintStream(baos); - ERROR_THROWABLE.printStackTrace(ps); - ps.close(); - String trace = baos.toString(); + java.io.StringWriter sw = new java.io.StringWriter(2048); + java.io.PrintWriter pw = new java.io.PrintWriter(sw); + ERROR_THROWABLE.printStackTrace(pw); + pw.flush(); + String trace = sw.toString(); trace = trace.replace("&", "&").replace("<", "<").replace(">", ">"); trace = trace.replace("\n", "
    \n"); out.print(trace); diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java index 6414f64b4..c331fae01 100644 --- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java +++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java @@ -28,6 +28,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import net.i2p.I2PAppContext; import net.i2p.data.DataFormatException; +import net.i2p.data.DataHelper; import net.i2p.data.Destination; import net.i2p.util.FileUtil; import net.i2p.util.Log; @@ -235,7 +236,7 @@ public class SingleFileNamingService extends NamingService { // FIXME fails if previous last line didn't have a trailing \n out.write(hostname.getBytes("UTF-8")); out.write('='); - out.write(d.toBase64().getBytes()); + out.write(DataHelper.getASCII(d.toBase64())); out.write('\n'); out.close(); for (NamingServiceListener nsl : _listeners) { diff --git a/core/java/src/net/i2p/stat/RateStat.java b/core/java/src/net/i2p/stat/RateStat.java index 512fd6402..018ef1973 100644 --- a/core/java/src/net/i2p/stat/RateStat.java +++ b/core/java/src/net/i2p/stat/RateStat.java @@ -184,7 +184,7 @@ public class RateStat { buf.append("# Rate: ").append(_groupName).append(": ").append(_statName).append(NL); buf.append("# ").append(_description).append(NL); buf.append("# ").append(NL).append(NL); - out.write(buf.toString().getBytes()); + out.write(buf.toString().getBytes("UTF-8")); buf.setLength(0); for (Rate r: _rates){ buf.append("#######").append(NL); @@ -193,7 +193,7 @@ public class RateStat { buf.append(NL); String curPrefix = prefix + "." + DataHelper.formatDuration(r.getPeriod()); r.store(curPrefix, buf); - out.write(buf.toString().getBytes()); + out.write(buf.toString().getBytes("UTF-8")); buf.setLength(0); } } diff --git a/core/java/src/net/i2p/util/HexDump.java b/core/java/src/net/i2p/util/HexDump.java index 0d56d2f98..9765f3317 100644 --- a/core/java/src/net/i2p/util/HexDump.java +++ b/core/java/src/net/i2p/util/HexDump.java @@ -13,6 +13,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; +import net.i2p.data.DataHelper; + /** * Hexdump class (well, it's actually a namespace with some functions, * but let's stick with java terminology :-). These methods generate @@ -25,7 +27,7 @@ public class HexDump { private static final int FORMAT_OFFSET_PADDING = 8; private static final int FORMAT_BYTES_PER_ROW = 16; - private static final byte[] HEXCHARS = "0123456789abcdef".getBytes(); + private static final byte[] HEXCHARS = DataHelper.getASCII("0123456789abcdef"); /** * Dump a byte array in a String. @@ -37,11 +39,10 @@ public class HexDump { try { dump(data, 0, data.length, out); + return out.toString("ISO-8859-1"); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException("no 8859?", e); } - - return out.toString(); } /** @@ -56,11 +57,10 @@ public class HexDump { try { dump(data, off, len, out); + return out.toString("ISO-8859-1"); } catch (IOException e) { - e.printStackTrace(); + throw new RuntimeException("no 8859?", e); } - - return out.toString(); } /** @@ -91,9 +91,10 @@ public class HexDump { hexoff = Integer.toString(dumpoff, 16); hexofflen = hexoff.length(); for (i = 0; i < FORMAT_OFFSET_PADDING - hexofflen; ++i) { - hexoff = "0" + hexoff; + out.write('0'); } - out.write((hexoff + " ").getBytes()); + out.write(DataHelper.getASCII(hexoff)); + out.write(' '); // Bytes to be printed in the current line nextbytes = (FORMAT_BYTES_PER_ROW < (end - dumpoff) ? FORMAT_BYTES_PER_ROW : (end - dumpoff)); @@ -101,15 +102,15 @@ public class HexDump { for (i = 0; i < FORMAT_BYTES_PER_ROW; ++i) { // Put two spaces to separate 8-bytes blocks if ((i % 8) == 0) { - out.write(" ".getBytes()); + out.write(' '); } if (i >= nextbytes) { - out.write(" ".getBytes()); + out.write(DataHelper.getASCII(" ")); } else { val = data[dumpoff + i] & 0xff; out.write(HEXCHARS[val >>> 4]); out.write(HEXCHARS[val & 0xf]); - out.write(" ".getBytes()); + out.write(' '); } } @@ -117,19 +118,32 @@ public class HexDump { for (i = 0; i < FORMAT_BYTES_PER_ROW; ++i) { if (i >= nextbytes) { - out.write(" ".getBytes()); + out.write(' '); } else { val = data[i + dumpoff]; // Is it a printable character? if ((val > 31) && (val < 127)) { out.write(val); } else { - out.write(".".getBytes()); + out.write('.'); } } } - out.write("|\n".getBytes()); + out.write('|'); + out.write('\n'); } } -} \ No newline at end of file + + /** + * @since 0.9.21 + */ +/**** + public static void main(String[] args) { + byte[] b = new byte[9993]; + RandomSource.getInstance().nextBytes(b); + System.out.println(dump(b)); + System.out.println(dump("test test test abcde xyz !!!".getBytes())); + } +****/ +} diff --git a/core/java/src/net/i2p/util/LogRecordFormatter.java b/core/java/src/net/i2p/util/LogRecordFormatter.java index 4f367defe..05d04b92b 100644 --- a/core/java/src/net/i2p/util/LogRecordFormatter.java +++ b/core/java/src/net/i2p/util/LogRecordFormatter.java @@ -73,9 +73,9 @@ class LogRecordFormatter { buf.append(NL); if (rec.getThrowable() != null) { StringWriter sw = new StringWriter(512); - PrintWriter pw = new PrintWriter(sw, true); + PrintWriter pw = new PrintWriter(sw); rec.getThrowable().printStackTrace(pw); - sw.flush(); + pw.flush(); buf.append(sw.toString()); } return buf.toString(); diff --git a/router/java/src/net/i2p/router/peermanager/DBHistory.java b/router/java/src/net/i2p/router/peermanager/DBHistory.java index c5c94c2ca..b2b46faca 100644 --- a/router/java/src/net/i2p/router/peermanager/DBHistory.java +++ b/router/java/src/net/i2p/router/peermanager/DBHistory.java @@ -228,7 +228,7 @@ public class DBHistory { add(buf, "unpromptedDbStoreOld", _unpromptedDbStoreOld, "How times have they sent us something we didn't ask for but have seen before?"); add(buf, "lastLookupReceived", _lastLookupReceived, "When was the last time they send us a lookup? (milliseconds since the epoch)"); add(buf, "avgDelayBetweenLookupsReceived", _avgDelayBetweenLookupsReceived, "How long is it typically between each db lookup they send us? (in milliseconds)"); - out.write(buf.toString().getBytes()); + out.write(buf.toString().getBytes("UTF-8")); _failedLookupRate.store(out, "dbHistory.failedLookupRate"); _invalidReplyRate.store(out, "dbHistory.invalidReplyRate"); } diff --git a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java index 32c15038c..305d0f343 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java +++ b/router/java/src/net/i2p/router/peermanager/ProfilePersistenceHelper.java @@ -139,7 +139,7 @@ class ProfilePersistenceHelper { add(buf, "tunnelPeakTunnel1mThroughput", profile.getPeakTunnel1mThroughputKBps(), "KBytes/sec"); buf.append(NL); - out.write(buf.toString().getBytes()); + out.write(buf.toString().getBytes("UTF-8")); if (profile.getIsExpanded()) { // only write out expanded data if, uh, we've got it diff --git a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java index 8cffc431f..37e91b3f2 100644 --- a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java +++ b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java @@ -151,7 +151,7 @@ public class TunnelHistory { add(buf, "lifetimeAgreedTo", _lifetimeAgreedTo.get(), "How many tunnels has the peer ever agreed to participate in?"); add(buf, "lifetimeFailed", _lifetimeFailed.get(), "How many tunnels has the peer ever agreed to participate in that failed prematurely?"); add(buf, "lifetimeRejected", _lifetimeRejected.get(), "How many tunnels has the peer ever refused to participate in?"); - out.write(buf.toString().getBytes()); + out.write(buf.toString().getBytes("UTF-8")); _rejectRate.store(out, "tunnelHistory.rejectRate"); _failRate.store(out, "tunnelHistory.failRate"); } diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java index b8503224f..8e3a19c93 100644 --- a/router/java/src/net/i2p/router/startup/WorkingDir.java +++ b/router/java/src/net/i2p/router/startup/WorkingDir.java @@ -252,7 +252,7 @@ public class WorkingDir { } System.setProperty(PROP_WRAPPER_LOG, logfile.getAbsolutePath()); try { - PrintStream ps = new PrintStream(new SecureFileOutputStream(logfile, true)); + PrintStream ps = new PrintStream(new SecureFileOutputStream(logfile, true), true, "UTF-8"); System.setOut(ps); System.setErr(ps); } catch (IOException ioe) { diff --git a/router/java/src/net/i2p/router/tasks/MarkLiveliness.java b/router/java/src/net/i2p/router/tasks/MarkLiveliness.java index 00bba1a5b..34420f2d9 100644 --- a/router/java/src/net/i2p/router/tasks/MarkLiveliness.java +++ b/router/java/src/net/i2p/router/tasks/MarkLiveliness.java @@ -12,6 +12,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import net.i2p.data.DataHelper; import net.i2p.router.Router; import net.i2p.util.Log; import net.i2p.util.SecureFileOutputStream; @@ -45,7 +46,7 @@ public class MarkLiveliness implements SimpleTimer.TimedEvent { FileOutputStream fos = null; try { fos = new SecureFileOutputStream(_pingFile); - fos.write(Long.toString(System.currentTimeMillis()).getBytes()); + fos.write(DataHelper.getASCII(Long.toString(System.currentTimeMillis()))); } catch (IOException ioe) { if (!_errorLogged) { Log log = _router.getContext().logManager().getLog(MarkLiveliness.class); From 35b0e99ff06ada340f8d5b0e7d88dddb82e5590c Mon Sep 17 00:00:00 2001 From: dg2-new Date: Tue, 14 Jul 2015 14:33:41 +0000 Subject: [PATCH 107/258] I2PSnark: Fix torrent-stopping (#766) --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 9 ++++++++- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 7 +++---- router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../router/networkdb/kademlia/IterativeLookupJob.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index fe470bd10..60e8f6189 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -624,6 +624,11 @@ public class Snark if (pc != null) pc.halt(); Storage st = storage; + if (!fast) + // HACK: Needed a way to distinguish between user-stop and + // shutdown-stop. stopTorrent(true) is in stopAllTorrents(). + // (#766) + stopped = true; if (st != null) { // TODO: Cache the config-in-mem to compare vs config-on-disk // (needed for auto-save to not double-save in some cases) @@ -638,7 +643,9 @@ public class Snark ioe.printStackTrace(); } } - stopped = true; + if (fast) + // HACK: See above if(!fast) + stopped = true; if (pc != null && _peerCoordinatorSet != null) _peerCoordinatorSet.remove(pc); if (_peerCoordinatorSet == null) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 3cea051c7..758df140b 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -105,7 +105,7 @@ public class SnarkManager implements CompleteListener { public static final String PROP_FILES_PUBLIC = "i2psnark.filesPublic"; public static final String PROP_OLD_AUTO_START = "i2snark.autoStart"; // oops public static final String PROP_AUTO_START = "i2psnark.autoStart"; // convert in migration to new config file - public static final String DEFAULT_AUTO_START = "true"; + public static final String DEFAULT_AUTO_START = "false"; //public static final String PROP_LINK_PREFIX = "i2psnark.linkPrefix"; //public static final String DEFAULT_LINK_PREFIX = "file:///"; public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay"; @@ -1278,7 +1278,7 @@ public class SnarkManager implements CompleteListener { running = true; } else { running = false; - } + } // Were we running last time? if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); @@ -1438,7 +1438,6 @@ public class SnarkManager implements CompleteListener { Snark snark = getTorrentByInfoHash(metainfo.getInfoHash()); if (snark != null) { addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); - saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, false); // no file priorities return false; } else { saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, true); // no file priorities @@ -2129,7 +2128,7 @@ public class SnarkManager implements CompleteListener { try { // Snark.fatal() throws a RuntimeException // don't let one bad torrent kill the whole loop - addTorrent(name, null, !shouldAutoStart()); + addTorrent(name, null, false); } catch (Exception e) { addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e); _log.error("Unable to add the torrent " + name, e); diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ea17ad55f..e1f87e077 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 = 15; + public final static long BUILD = 16; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java index 26c69dca4..6b243b769 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java @@ -68,7 +68,7 @@ class IterativeLookupJob extends JobImpl { } RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri == null) { - // Take it on faith that its ff to speed things up, we don't need the RI + // Take it on faith that it's ff to speed things up, we don't need the RI // to query it. // Zero-hop outbound tunnel will be failed in ISJ.sendQuery() _search.newPeerToTry(peer); From dd5f804150abd1a127a5aae968d13e077be95095 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 16 Jul 2015 18:06:48 +0000 Subject: [PATCH 108/258] Console: Add dates to news headings Spacing for news headings in summary bar --- .../java/src/net/i2p/router/update/NewsFetcher.java | 12 +++++++++++- history.txt | 3 +++ installer/resources/themes/console/light/console.css | 1 + router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index b00043597..aa2782e68 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -10,6 +10,7 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.net.URI; import java.net.URISyntaxException; +import java.text.DateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -18,6 +19,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.StringTokenizer; +import java.util.TimeZone; import net.i2p.crypto.SU3File; import net.i2p.crypto.TrustedUpdate; @@ -553,11 +555,19 @@ class NewsFetcher extends UpdateRunner { out.write("-->\n"); if (entries == null) return; + DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT); + // the router sets the JVM time zone to UTC but saves the original here so we can get it + String systemTimeZone = _context.getProperty("i2p.systemTimeZone"); + if (systemTimeZone != null) + fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone)); for (NewsEntry e : entries) { if (e.title == null || e.content == null) continue; - out.write("\n"); + Date date = new Date(e.updated); + out.write("\n"); out.write("

"); + out.write(fmt.format(date)); + out.write(": "); out.write(e.title); out.write("

\n"); out.write(e.content); diff --git a/history.txt b/history.txt index b58e40bbf..7fac6524d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-07-16 zzz + * Console: Add dates to news headings + 2015-07-12 zzz * Findbugs all over diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 62b7969f3..463b8e1df 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -251,6 +251,7 @@ div.newsheadings { div.newsheadings li { list-style: none outside url('images/newsbullet_mini.png'); margin: 0 -4px 2px 8px; + line-height: 140%; } div.tunnels { diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e1f87e077..098e16d49 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 16; + public final static long BUILD = 17; /** 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 63e934f8f2ebf3702b1869b59168d1de7acf6c5c Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 17 Jul 2015 01:36:45 +0000 Subject: [PATCH 109/258] Update English PO files --- apps/i2psnark/locale/messages_en.po | 648 ++++++------- .../locale-countries/messages_en.po | 44 +- apps/routerconsole/locale/messages_en.po | 894 +++++++++--------- apps/susidns/locale/messages_en.po | 16 +- installer/resources/locale/po/messages_en.po | 92 +- 5 files changed, 850 insertions(+), 844 deletions(-) diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po index eac186185..d29a692a6 100644 --- a/apps/i2psnark/locale/messages_en.po +++ b/apps/i2psnark/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P i2psnark\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"POT-Creation-Date: 2015-07-17 01:33+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -23,383 +23,383 @@ msgid "No more torrents running." msgstr "" #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2376 -#: ../java/src/org/klomp/snark/SnarkManager.java:2387 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:2080 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:771 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:773 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:785 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:787 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:799 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:810 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:812 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:828 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:837 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:839 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:841 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:843 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:848 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:903 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:907 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:913 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:915 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:920 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:924 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:926 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:933 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:947 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:949 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:956 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:958 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:964 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:966 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:973 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:975 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:977 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:984 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:994 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1026 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1036 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1082 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1163 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1166 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1175 -#: ../java/src/org/klomp/snark/SnarkManager.java:2117 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1198 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "" #. TODO - if the existing one is a magnet, delete it and add the metainfo instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1217 -#: ../java/src/org/klomp/snark/SnarkManager.java:1342 -#: ../java/src/org/klomp/snark/SnarkManager.java:1430 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1223 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1225 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and " "DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1228 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1230 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " "disabled, you should enable open trackers or DHT before starting the torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1256 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1263 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1275 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1277 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1353 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1359 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " "succeed until you start another torrent, enable open trackers, or enable DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1363 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1396 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1440 -#: ../java/src/org/klomp/snark/SnarkManager.java:1466 -#: ../java/src/org/klomp/snark/SnarkManager.java:2036 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1815 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1817 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1819 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1821 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1823 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1826 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1834 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1851 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1874 -#: ../java/src/org/klomp/snark/SnarkManager.java:1893 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1913 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1921 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1953 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1979 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2032 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2033 -#: ../java/src/org/klomp/snark/SnarkManager.java:2264 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2048 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2111 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2263 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2287 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2350 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2369 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" @@ -451,14 +451,14 @@ msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1751 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2650 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2137 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "" @@ -491,842 +491,846 @@ msgid "clear messages" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2636 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2806 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2824 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1164 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1058 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1069 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1143 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1154 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1169 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1208 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1230 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, 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:1234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1238 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2395 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1344 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1347 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2398 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1352 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1464 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1487 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1480 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1526 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1531 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1537 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1542 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1518 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2819 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1523 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1581 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1618 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1670 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1672 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1700 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1705 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1709 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1727 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1731 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1767 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1802 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1804 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1824 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1826 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1942 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1959 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2032 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2038 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or " "info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2056 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2069 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2076 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2079 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2325 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2083 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2104 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2141 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2146 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2150 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2154 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2176 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2189 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2197 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2203 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2227 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2230 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2243 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2247 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2251 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2271 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2277 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2285 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2290 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2305 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2310 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2340 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2384 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2427 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2435 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2679 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2696 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2715 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2724 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2749 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2759 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2770 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2795 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2815 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2844 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2861 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2867 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2921 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3032 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3045 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3092 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3097 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3102 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3116 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3117 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "" diff --git a/apps/routerconsole/locale-countries/messages_en.po b/apps/routerconsole/locale-countries/messages_en.po index 0b3ecd279..5267c8ba4 100644 --- a/apps/routerconsole/locale-countries/messages_en.po +++ b/apps/routerconsole/locale-countries/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" +"POT-Creation-Date: 2015-07-17 01:33+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -51,6 +51,9 @@ msgstr "" msgid "Angola" msgstr "" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "" @@ -102,6 +105,9 @@ msgstr "" msgid "Benin" msgstr "" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "" @@ -111,6 +117,9 @@ msgstr "" msgid "Bolivia" msgstr "" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "" @@ -138,15 +147,12 @@ msgstr "" msgid "Cocos (Keeling) Islands" msgstr "" -msgid "The Democratic Republic of the Congo" +msgid "Congo" msgstr "" msgid "Central African Republic" msgstr "" -msgid "Congo" -msgstr "" - msgid "Switzerland" msgstr "" @@ -243,7 +249,7 @@ msgstr "" msgid "Falkland Islands (Malvinas)" msgstr "" -msgid "Federated States of Micronesia" +msgid "Micronesia" msgstr "" msgid "Faroe Islands" @@ -345,7 +351,7 @@ msgstr "" msgid "Iraq" msgstr "" -msgid "Islamic Republic of Iran" +msgid "Iran" msgstr "" msgid "Iceland" @@ -384,7 +390,7 @@ msgstr "" msgid "Saint Kitts and Nevis" msgstr "" -msgid "The Democratic People's Republic of Korea" +msgid "North Korea" msgstr "" msgid "Republic of Korea" @@ -429,7 +435,7 @@ msgstr "" msgid "Latvia" msgstr "" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "" msgid "Morocco" @@ -438,7 +444,7 @@ msgstr "" msgid "Monaco" msgstr "" -msgid "Republic of Moldova" +msgid "Moldova" msgstr "" msgid "Montenegro" @@ -453,7 +459,7 @@ msgstr "" msgid "Marshall Islands" msgstr "" -msgid "The Former Yugoslav Republic of Macedonia" +msgid "Macedonia" msgstr "" msgid "Mali" @@ -465,7 +471,7 @@ msgstr "" msgid "Mongolia" msgstr "" -msgid "Macao" +msgid "Macau" msgstr "" msgid "Northern Mariana Islands" @@ -645,13 +651,19 @@ msgstr "" msgid "Suriname" msgstr "" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "" msgid "El Salvador" msgstr "" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" msgstr "" msgid "Swaziland" @@ -702,7 +714,7 @@ msgstr "" msgid "Taiwan" msgstr "" -msgid "United Republic of Tanzania" +msgid "Tanzania" msgstr "" msgid "Ukraine" @@ -723,7 +735,7 @@ msgstr "" msgid "Uzbekistan" msgstr "" -msgid "Holy See (Vatican City State)" +msgid "Vatican" msgstr "" msgid "Saint Vincent and the Grenadines" @@ -735,7 +747,7 @@ msgstr "" msgid "Virgin Islands" msgstr "" -msgid "Viet Nam" +msgid "Vietnam" msgstr "" msgid "Vanuatu" diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po index 4d9eee639..8751c55b0 100644 --- a/apps/routerconsole/locale/messages_en.po +++ b/apps/routerconsole/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P routerconsole\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"POT-Creation-Date: 2015-07-17 01:33+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -26,8 +26,8 @@ msgstr "" #. {0,number,####} prevents 1234 from being output as 1,234 in the English locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -36,8 +36,8 @@ msgstr[1] "" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -46,8 +46,8 @@ msgstr[1] "" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -56,37 +56,46 @@ msgstr[1] "" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -129,7 +138,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "" @@ -265,43 +274,43 @@ msgstr "" msgid "Rejecting tunnels" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -369,7 +378,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "" @@ -384,7 +393,7 @@ msgid "{0} is used for outbound connections only" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "" @@ -407,13 +416,13 @@ msgid "" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -428,7 +437,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "" @@ -454,13 +463,13 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "" @@ -475,14 +484,14 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "" @@ -529,7 +538,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "" @@ -539,7 +548,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "" @@ -548,7 +557,7 @@ msgid "The total number of packets received from the peer" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "" @@ -557,7 +566,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "" @@ -596,8 +605,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -691,17 +700,17 @@ msgid "NTCP connections" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "" @@ -714,126 +723,126 @@ msgid "Backlogged?" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -871,66 +880,66 @@ msgstr "" msgid "Dropping tunnel requests: Queue time" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "" @@ -943,7 +952,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -957,20 +966,20 @@ msgstr "" msgid "Updating" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1159,16 +1168,20 @@ msgid "No new version found at {0}" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1269,18 +1282,18 @@ msgstr "" msgid "I2P Router Console" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1488,7 +1501,7 @@ msgid "Add Client" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "" @@ -1520,9 +1533,9 @@ msgid "Plugin" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "" @@ -1544,7 +1557,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "" @@ -1557,7 +1571,7 @@ msgid "Stop" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "" @@ -1579,7 +1593,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1589,7 +1603,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1608,7 +1622,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1737,8 +1751,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "" @@ -1748,7 +1762,7 @@ msgstr "" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "" @@ -1757,7 +1771,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "" @@ -1813,9 +1827,9 @@ msgid "UI" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "" @@ -1833,15 +1847,15 @@ msgid "Logging" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "" @@ -1853,8 +1867,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2115,7 +2129,7 @@ msgstr "" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "" @@ -2585,8 +2599,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2595,91 +2609,91 @@ msgstr "" msgid "Password" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "" @@ -2805,7 +2819,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2955,12 +2969,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -2991,17 +3005,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "" @@ -3011,17 +3025,17 @@ msgid "Router Console" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3186,97 +3200,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3294,223 +3308,223 @@ msgid "No log messages" msgstr "" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3560,19 +3574,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "" @@ -3595,7 +3609,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "" @@ -3672,71 +3686,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3862,276 +3876,276 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4235,26 +4249,26 @@ msgstr "" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4262,7 +4276,7 @@ msgstr "" #. Note to translators: parameter is a router version, e.g. "0.9.19-16" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4270,69 +4284,85 @@ msgstr "" #. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" +msgid "avg" msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "" @@ -4509,175 +4539,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 -msgid "IRC proxy" +msgid "shared clients (DSA)" msgstr "" #: ../java/strings/Strings.java:38 -msgid "eepsite" +msgid "IRC proxy" msgstr "" #: ../java/strings/Strings.java:39 -msgid "I2P webserver" +msgid "eepsite" msgstr "" #: ../java/strings/Strings.java:40 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4845,7 +4827,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4886,7 +4868,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4925,27 +4907,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/susidns/locale/messages_en.po b/apps/susidns/locale/messages_en.po index af1287e52..f2c41273e 100644 --- a/apps/susidns/locale/messages_en.po +++ b/apps/susidns/locale/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P susidns\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"POT-Creation-Date: 2015-07-17 01:33+0000\n" "PO-Revision-Date: 2010-06-15 14:09+0100\n" "Last-Translator: duck \n" "Language-Team: duck \n" @@ -222,7 +222,7 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or \"reload" "\" button on your browser. Please resubmit." @@ -231,14 +231,14 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -249,7 +249,7 @@ msgid "Configuration saved." msgstr "" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -278,16 +278,16 @@ msgstr "" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "" diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po index 81921f7f7..813b061ea 100644 --- a/installer/resources/locale/po/messages_en.po +++ b/installer/resources/locale/po/messages_en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P startup script\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-18 20:15+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2012-12-21 23:34+0000\n" "Last-Translator: kytv \n" "Language-Team: English \n" @@ -22,176 +22,176 @@ msgstr "" msgid "Failed to load the wrapper" msgstr "" -#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069 -#: ../i2prouter:1090 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "" -#: ../i2prouter:954 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "" -#: ../i2prouter:974 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1021 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "" -#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "" -#: ../i2prouter:1079 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1101 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "" -#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1144 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "" -#: ../i2prouter:1158 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1161 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1169 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "" -#: ../i2prouter:1215 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "" -#: ../i2prouter:1220 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "" -#: ../i2prouter:1223 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" -#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324 -#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439 -#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "" -#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428 -#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508 -#: ../i2prouter:1543 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1550 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602 -#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661 -#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606 -#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655 -#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "" -#: ../i2prouter:1715 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1802 +#: ../i2prouter:1841 msgid "Commands:" msgstr "" -#: ../i2prouter:1803 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "" -#: ../i2prouter:1804 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "" -#: ../i2prouter:1805 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "" -#: ../i2prouter:1806 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "" -#: ../i2prouter:1807 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "" -#: ../i2prouter:1808 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "" -#: ../i2prouter:1809 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "" -#: ../i2prouter:1810 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "" -#: ../i2prouter:1811 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "" -#: ../i2prouter:1812 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "" -#: ../i2prouter:1825 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "" -#: ../i2prouter:1830 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "" -#: ../i2prouter:1833 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" From 2f59a4b3e646aaaa0210d2353dba55507649477a Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 21 Jul 2015 00:40:35 +0000 Subject: [PATCH 110/258] Fix test --- .../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java | 2 +- .../junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java index 4b06ae078..6b3b41720 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java @@ -817,7 +817,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer { * @throws BadRequestException on bad headers * @throws IOException on other errors in the underlying stream */ - private static Map> readHeaders(I2PSocket socket, InputStream in, StringBuilder command, + static Map> readHeaders(I2PSocket socket, InputStream in, StringBuilder command, String[] skipHeaders, I2PAppContext ctx) throws IOException { HashMap> headers = new HashMap>(); StringBuilder buf = new StringBuilder(128); diff --git a/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java b/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java index 19302a624..7132a7da2 100644 --- a/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java +++ b/apps/i2ptunnel/java/test/junit/net/i2p/i2ptunnel/I2PTunnelHTTPServerTest.java @@ -28,7 +28,7 @@ public class I2PTunnelHTTPServerTest extends TestCase { headerString += "BLAH: something\r\n"; headerString += "\r\n"; InputStream in = fillInputStream(headerString); - Map> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext()); + Map> headers = I2PTunnelHTTPServer.readHeaders(null, in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext()); assertEquals(headers.size(), 1); //One header } @@ -38,7 +38,7 @@ public class I2PTunnelHTTPServerTest extends TestCase { headerString += "someHeader: oh my, duplication!\r\n"; headerString += "\r\n"; InputStream in = fillInputStream(headerString); - Map> headers = I2PTunnelHTTPServer.readHeaders(in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext()); + Map> headers = I2PTunnelHTTPServer.readHeaders(null, in, new StringBuilder(128), new String[0], I2PAppContext.getGlobalContext()); assertEquals(headers.size(), 1); assertEquals(headers.get("someHeader").size(), 2); } @@ -51,7 +51,7 @@ public class I2PTunnelHTTPServerTest extends TestCase { headerString += "\r\n"; InputStream in = fillInputStream(headerString); StringBuilder builder = new StringBuilder(128); - Map> headers = I2PTunnelHTTPServer.readHeaders(in, builder, new String[0], I2PAppContext.getGlobalContext()); + Map> headers = I2PTunnelHTTPServer.readHeaders(null, in, builder, new String[0], I2PAppContext.getGlobalContext()); String result = I2PTunnelHTTPServer.formatHeaders(headers, builder); int first = result.indexOf("abc"); assertTrue(first >= 0); From 9af197e5908523b895c715a043b0beed1270fe02 Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 21 Jul 2015 01:19:23 +0000 Subject: [PATCH 111/258] Add KeyCert test that fails --- .../net/i2p/data/KeyCertificateTest.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 core/java/test/junit/net/i2p/data/KeyCertificateTest.java diff --git a/core/java/test/junit/net/i2p/data/KeyCertificateTest.java b/core/java/test/junit/net/i2p/data/KeyCertificateTest.java new file mode 100644 index 000000000..032b3ef70 --- /dev/null +++ b/core/java/test/junit/net/i2p/data/KeyCertificateTest.java @@ -0,0 +1,45 @@ +package net.i2p.data; +/* + * free (adj.): unencumbered; not under the control of others + * Written by str4d in 2015 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 static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import net.i2p.crypto.EncType; +import net.i2p.crypto.SigType; +import junit.framework.TestCase; + +/** + * @author str4d + */ +public class KeyCertificateTest extends TestCase { + private static final byte[] P256_PAYLOAD = new byte[] { + 0, (byte) (SigType.ECDSA_SHA256_P256.getCode()), + 0, (byte) (EncType.EC_P256.getCode()) + }; + + private static final byte[] P521_PAYLOAD = new byte[] { + 0, (byte) (SigType.ECDSA_SHA512_P521.getCode()), + 0, (byte) (EncType.ELGAMAL_2048.getCode()), + 0, 0, 0, 0 + }; + + public void testFromP256Payload() throws DataFormatException { + KeyCertificate cert = new KeyCertificate(P256_PAYLOAD); + assertThat(cert.getSigTypeCode(), is(equalTo(SigType.ECDSA_SHA256_P256.getCode()))); + assertThat(cert.getCryptoTypeCode(), is(equalTo(EncType.EC_P256.getCode()))); + assertThat(cert.getExtraSigningKeyData(), is(nullValue())); + } + + public void testFromEd25519Payload() throws DataFormatException { + KeyCertificate cert = new KeyCertificate(P521_PAYLOAD); + assertThat(cert.getSigTypeCode(), is(equalTo(SigType.ECDSA_SHA512_P521.getCode()))); + assertThat(cert.getCryptoTypeCode(), is(equalTo(EncType.ELGAMAL_2048.getCode()))); + assertThat(cert.getExtraSigningKeyData().length, is(4)); + } +} \ No newline at end of file From ba5af15c6f08aabbbd2dde9a04a0b5af7feeae32 Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 21 Jul 2015 01:19:37 +0000 Subject: [PATCH 112/258] Fix KeyCert bug --- core/java/src/net/i2p/data/KeyCertificate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/src/net/i2p/data/KeyCertificate.java b/core/java/src/net/i2p/data/KeyCertificate.java index 904f77388..86078658f 100644 --- a/core/java/src/net/i2p/data/KeyCertificate.java +++ b/core/java/src/net/i2p/data/KeyCertificate.java @@ -122,7 +122,7 @@ public class KeyCertificate extends Certificate { /** * Signing Key extra data, if any, is first in the array. * Crypto Key extra data, if any, is second in the array, - * at offset max(0, 128 - getSigType().getPubkeyLen() + * at offset max(0, getSigType().getPubkeyLen() - 128) * * @return null if unset or none */ @@ -148,7 +148,7 @@ public class KeyCertificate extends Certificate { SigType type = getSigType(); if (type == null) throw new UnsupportedOperationException("unknown sig type"); - int extra = 128 - type.getPubkeyLen(); + int extra = Math.max(0, type.getPubkeyLen() - 128); if (_payload.length == HEADER_LENGTH + extra) return getExtraKeyData(); byte[] rv = new byte[extra]; From c20772702a789fe34beb2ceae453fef4549afa42 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Wed, 22 Jul 2015 22:05:44 +0000 Subject: [PATCH 113/258] I2PSnark: Don't let tunnels start unless we're starting torrents (regression, #766) --- apps/i2psnark/java/src/org/klomp/snark/Peer.java | 2 +- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Peer.java b/apps/i2psnark/java/src/org/klomp/snark/Peer.java index d612ce027..cba955f69 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Peer.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Peer.java @@ -297,7 +297,7 @@ public class Peer implements Comparable if (_log.shouldLog(Log.DEBUG)) _log.debug("Start running the reader with " + toString()); - // Use this thread for running the incomming connection. + // Use this thread for running the incoming connection. // The outgoing connection creates its own Thread. out.startup(); Thread.currentThread().setName("Snark reader from " + peerID); diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 758df140b..771821827 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1278,7 +1278,7 @@ public class SnarkManager implements CompleteListener { running = true; } else { running = false; - } + } // Were we running last time? if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); @@ -2128,7 +2128,7 @@ public class SnarkManager implements CompleteListener { try { // Snark.fatal() throws a RuntimeException // don't let one bad torrent kill the whole loop - addTorrent(name, null, false); + addTorrent(name, null, !shouldAutoStart()); } catch (Exception e) { addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e); _log.error("Unable to add the torrent " + name, e); From 93854e93b5c8cec6b7c8e8d6dc598662687c1523 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Wed, 22 Jul 2015 23:36:19 +0000 Subject: [PATCH 114/258] bump -18-rc --- 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 098e16d49..14408f1ed 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 = 17; + public final static long BUILD = 18; /** for example "-test" */ public final static String EXTRA = "-rc"; From 265e4b58a5d4f86e357acd9aceb492e592d9a748 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 23 Jul 2015 01:15:11 +0000 Subject: [PATCH 115/258] Throw DataFormatException if not enough bytes --- core/java/src/net/i2p/data/Certificate.java | 28 +++++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index fdc343a63..7b40b5099 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -48,19 +48,25 @@ public class Certificate extends DataStructureImpl { /** * If null cert, return immutable static instance, else create new - * @throws AIOOBE if not enough bytes, FIXME should throw DataFormatException + * @throws DataFormatException if not enough bytes * @since 0.8.3 */ - public static Certificate create(byte[] data, int off) { - int type = data[off] & 0xff; - int length = (int) DataHelper.fromLong(data, off + 1, 2); - if (type == 0 && length == 0) - return NULL_CERT; - // from here down roughly the same as readBytes() below - if (length == 0) - return new Certificate(type, null); - byte[] payload = new byte[length]; - System.arraycopy(data, off + 3, payload, 0, length); + public static Certificate create(byte[] data, int off) throws DataFormatException { + int type; + byte[] payload; + try { + type = data[off] & 0xff; + int length = (int) DataHelper.fromLong(data, off + 1, 2); + if (type == 0 && length == 0) + return NULL_CERT; + // from here down roughly the same as readBytes() below + if (length == 0) + return new Certificate(type, null); + payload = new byte[length]; + System.arraycopy(data, off + 3, payload, 0, length); + } catch (ArrayIndexOutOfBoundsException aioobe) { + throw new DataFormatException("not enough bytes", aioobe); + } if (type == CERTIFICATE_TYPE_KEY) { try { return new KeyCertificate(payload); From 809a533573c9ac814335d2fd6198c9cce0a505f7 Mon Sep 17 00:00:00 2001 From: str4d Date: Thu, 23 Jul 2015 01:22:12 +0000 Subject: [PATCH 116/258] Updated history --- history.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/history.txt b/history.txt index 7fac6524d..d91d44177 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2015-07-21 str4d + * Core: Throw DFE in Certificate.create() instead of AIOOBE (ticket #1016) + +2015-07-21 str4d + * Core: Fix parsing bug in KeyCertificate + 2015-07-16 zzz * Console: Add dates to news headings From fea6b8aec3db026385d7ec7daef554470035922b Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 25 Jul 2015 13:15:56 +0000 Subject: [PATCH 117/258] i2psnark: Fix total_size in metadata message (ticket #1618) --- .../src/org/klomp/snark/ExtensionHandler.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java index 1835ffe90..53247a699 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java +++ b/apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java @@ -207,30 +207,31 @@ abstract class ExtensionHandler { if (log.shouldLog(Log.DEBUG)) log.debug("Got request for " + piece + " from: " + peer); byte[] pc; + int totalSize; synchronized(state) { pc = state.getChunk(piece); + totalSize = state.getSize(); } - sendPiece(peer, piece, pc); + sendPiece(peer, piece, pc, totalSize); // Do this here because PeerConnectionOut only reports for PIECE messages peer.uploaded(pc.length); listener.uploaded(peer, pc.length); } else if (type == TYPE_DATA) { - int size = map.get("total_size").getInt(); - if (log.shouldLog(Log.DEBUG)) - log.debug("Got data for " + piece + " length " + size + " from: " + peer); + // On close reading of BEP 9, this is the total metadata size. + // Prior to 0.9.21, we sent the piece size, so we can't count on it. + // just ignore it. The actual length will be verified in saveChunk() + //int size = map.get("total_size").getInt(); + //if (log.shouldLog(Log.DEBUG)) + // log.debug("Got data for " + piece + " length " + size + " from: " + peer); boolean done; int chk = -1; synchronized(state) { if (state.isComplete()) return; int len = is.available(); - if (len != size) { - // probably fatal - if (log.shouldLog(Log.WARN)) - log.warn("total_size " + size + " but avail data " + len); - } peer.downloaded(len); listener.downloaded(peer, len); + // this checks the size done = state.saveChunk(piece, bs, bs.length - len, len); if (log.shouldLog(Log.INFO)) log.info("Got chunk " + piece + " from " + peer); @@ -293,11 +294,15 @@ abstract class ExtensionHandler { } } - private static void sendPiece(Peer peer, int piece, byte[] data) { + private static void sendPiece(Peer peer, int piece, byte[] data, int totalSize) { Map map = new HashMap(); map.put("msg_type", Integer.valueOf(TYPE_DATA)); map.put("piece", Integer.valueOf(piece)); - map.put("total_size", Integer.valueOf(data.length)); + // BEP 9 + // "This key has the same semantics as the 'metadata_size' in the extension header" + // which apparently means the same value. Fixed in 0.9.21. + //map.put("total_size", Integer.valueOf(data.length)); + map.put("total_size", Integer.valueOf(totalSize)); byte[] dict = BEncoder.bencode(map); byte[] payload = new byte[dict.length + data.length]; System.arraycopy(dict, 0, payload, 0, dict.length); From bfde521cf920acc84f3094b54140ef39e2b6bf27 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 25 Jul 2015 13:37:45 +0000 Subject: [PATCH 118/258] NetDB: Fix NPE (ticket #1619) --- history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- .../net/i2p/router/networkdb/kademlia/ExploreJob.java | 3 ++- .../net/i2p/router/networkdb/kademlia/SearchJob.java | 10 +++++++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/history.txt b/history.txt index d91d44177..53111fedb 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-07-25 zzz + * i2psnark: Fix total_size in metadata message (ticket #1618) + * NetDB: Fix NPE (ticket #1619) + 2015-07-21 str4d * Core: Throw DFE in Certificate.create() instead of AIOOBE (ticket #1016) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 14408f1ed..987fc2f75 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 = 18; + public final static long BUILD = 19; /** for example "-test" */ public final static String EXTRA = "-rc"; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java index bb75b6825..768511fc9 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java @@ -78,7 +78,7 @@ class ExploreJob extends SearchJob { * @param expiration when the search should stop * @param peer the peer to send it to * - * @return a DatabaseLookupMessage or GarlicMessage + * @return a DatabaseLookupMessage or GarlicMessage or null on error */ @Override protected I2NPMessage buildMessage(TunnelId replyTunnelId, Hash replyGateway, long expiration, RouterInfo peer) { @@ -146,6 +146,7 @@ class ExploreJob extends SearchJob { ' ' + sess.key + ' ' + sess.tag); msg.setReplySession(sess.key, sess.tag); } + // may be null outMsg = MessageWrapper.wrap(getContext(), msg, peer); if (_log.shouldLog(Log.DEBUG)) _log.debug(getJobId() + ": Encrypted exploratory DLM for " + getState().getTarget() + " to " + diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index ee75f47ec..18fa99b5f 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -445,7 +445,11 @@ class SearchJob extends JobImpl { long expiration = getContext().clock().now() + timeout; I2NPMessage msg = buildMessage(inTunnelId, inTunnel.getPeer(0), expiration, router); - + if (msg == null) { + getContext().jobQueue().addJob(new FailedJob(getContext(), router)); + return; + } + TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(to); if (outTunnel == null) { _log.warn("No tunnels to send search out through! Impossible?"); @@ -480,6 +484,10 @@ class SearchJob extends JobImpl { // use the 4-arg one so we pick up the override in ExploreJob //I2NPMessage msg = buildMessage(expiration); I2NPMessage msg = buildMessage(null, router.getIdentity().getHash(), expiration, router); + if (msg == null) { + getContext().jobQueue().addJob(new FailedJob(getContext(), router)); + return; + } if (_log.shouldLog(Log.DEBUG)) _log.debug(getJobId() + ": Sending router search directly to " + router.getIdentity().getHash() From d848a19ab0af68f3ddd94cd6b1e89ff6ef0e61e2 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 26 Jul 2015 14:22:33 +0000 Subject: [PATCH 119/258] update translations, bump -20-rc --- .tx/config | 5 + apps/i2psnark/locale/messages_ar.po | 660 +++++----- apps/i2psnark/locale/messages_cs.po | 660 +++++----- apps/i2psnark/locale/messages_de.po | 656 +++++----- apps/i2psnark/locale/messages_es.po | 658 +++++----- apps/i2psnark/locale/messages_fr.po | 658 +++++----- apps/i2psnark/locale/messages_hu.po | 663 +++++----- apps/i2psnark/locale/messages_it.po | 660 +++++----- apps/i2psnark/locale/messages_nb.po | 660 +++++----- apps/i2psnark/locale/messages_nl.po | 654 +++++----- apps/i2psnark/locale/messages_pl.po | 662 +++++----- apps/i2psnark/locale/messages_pt.po | 660 +++++----- apps/i2psnark/locale/messages_pt_bR.po | 656 +++++----- apps/i2psnark/locale/messages_ru.po | 674 +++++----- apps/i2psnark/locale/messages_sk.po | 660 +++++----- apps/i2psnark/locale/messages_sv.po | 650 +++++----- apps/i2psnark/locale/messages_vi.po | 660 +++++----- apps/i2psnark/locale/messages_zh.po | 674 +++++----- apps/i2ptunnel/locale-proxy/messages_pt_BR.po | 24 +- apps/i2ptunnel/locale-proxy/messages_sv.po | 111 +- apps/i2ptunnel/locale-proxy/messages_zh.po | 54 +- apps/i2ptunnel/locale/messages_zh.po | 18 +- apps/ministreaming/locale/messages_ca.po | 95 ++ apps/ministreaming/locale/messages_sv.po | 94 ++ .../locale-countries/messages_ca.po | 72 +- .../locale-countries/messages_da.po | 72 +- .../locale-countries/messages_de.po | 64 +- .../locale-countries/messages_el.po | 85 +- .../locale-countries/messages_es.po | 77 +- .../locale-countries/messages_et.po | 72 +- .../locale-countries/messages_fi.po | 72 +- .../locale-countries/messages_fr.po | 74 +- .../locale-countries/messages_hu.po | 85 +- .../locale-countries/messages_it.po | 85 +- .../locale-countries/messages_ja.po | 74 +- .../locale-countries/messages_mg.po | 79 +- .../locale-countries/messages_nb.po | 74 +- .../locale-countries/messages_nl.po | 65 +- .../locale-countries/messages_pl.po | 72 +- .../locale-countries/messages_pt.po | 72 +- .../locale-countries/messages_pt_BR.po | 55 +- .../locale-countries/messages_ro.po | 83 +- .../locale-countries/messages_ru.po | 95 +- .../locale-countries/messages_sk.po | 74 +- .../locale-countries/messages_sq.po | 72 +- .../locale-countries/messages_sv.po | 76 +- .../locale-countries/messages_tr.po | 130 +- .../locale-countries/messages_uk.po | 72 +- .../locale-countries/messages_vi.po | 349 ++---- .../locale-countries/messages_zh.po | 74 +- apps/routerconsole/locale/messages_ar.po | 898 +++++++------- apps/routerconsole/locale/messages_cs.po | 897 +++++++------- apps/routerconsole/locale/messages_da.po | 894 +++++++------- apps/routerconsole/locale/messages_de.po | 935 +++++++------- apps/routerconsole/locale/messages_el.po | 907 +++++++------- apps/routerconsole/locale/messages_es.po | 892 +++++++------- apps/routerconsole/locale/messages_et.po | 894 +++++++------- apps/routerconsole/locale/messages_fi.po | 935 +++++++------- apps/routerconsole/locale/messages_fr.po | 942 +++++++------- apps/routerconsole/locale/messages_hu.po | 1061 ++++++++-------- apps/routerconsole/locale/messages_it.po | 894 +++++++------- apps/routerconsole/locale/messages_ja.po | 893 +++++++------- apps/routerconsole/locale/messages_nb.po | 896 +++++++------- apps/routerconsole/locale/messages_nl.po | 896 +++++++------- apps/routerconsole/locale/messages_pt.po | 894 +++++++------- apps/routerconsole/locale/messages_pt_BR.po | 900 +++++++------- apps/routerconsole/locale/messages_ro.po | 1089 ++++++++--------- apps/routerconsole/locale/messages_sv.po | 890 +++++++------- apps/routerconsole/locale/messages_tr.po | 893 +++++++------- apps/routerconsole/locale/messages_uk.po | 907 +++++++------- apps/routerconsole/locale/messages_vi.po | 895 +++++++------- apps/routerconsole/locale/messages_zh.po | 939 +++++++------- apps/susidns/locale/messages_hu.po | 35 +- apps/susidns/locale/messages_pl.po | 30 +- apps/susidns/locale/messages_pt.po | 27 +- apps/susidns/locale/messages_pt_BR.po | 32 +- apps/susidns/locale/messages_ro.po | 23 +- apps/susidns/locale/messages_zh.po | 42 +- .../gnu/getopt/MessagesBundle_fi.properties | 31 + debian/po/hu.po | 9 +- debian/po/id.po | 14 +- debian/po/pl.po | 9 +- debian/po/pt_BR.po | 14 +- debian/po/zh.po | 10 +- .../resources/locale/po/messages_pt_BR.po | 130 +- .../src/net/i2p/router/RouterVersion.java | 2 +- 86 files changed, 17360 insertions(+), 17189 deletions(-) create mode 100644 apps/ministreaming/locale/messages_ca.po create mode 100644 apps/ministreaming/locale/messages_sv.po create mode 100644 core/java/src/gnu/getopt/MessagesBundle_fi.properties diff --git a/.tx/config b/.tx/config index befa61f59..795d3959f 100644 --- a/.tx/config +++ b/.tx/config @@ -270,6 +270,8 @@ source_lang = en ;;trans.ca = installer/resources/locale/po/messages_ca.po trans.de = installer/resources/locale/po/messages_de.po trans.es = installer/resources/locale/po/messages_es.po +;; currently fails check +;;trans.fi = installer/resources/locale/po/messages_fi.po trans.fr = installer/resources/locale/po/messages_fr.po trans.id = installer/resources/locale/po/messages_id.po trans.it = installer/resources/locale/po/messages_it.po @@ -297,6 +299,7 @@ type = PROPERTIES trans.cs = core/java/src/gnu/getopt/MessagesBundle_cs.properties trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties +trans.fi = core/java/src/gnu/getopt/MessagesBundle_fi.properties trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties ;; Java converts id to in @@ -322,6 +325,7 @@ trans.zh_CN = core/java/src/gnu/getopt/MessagesBundle_zh.properties [I2P.streaming] source_file = apps/ministreaming/locale/messages_en.po source_lang = en +trans.ca = apps/ministreaming/locale/messages_ca.po trans.de = apps/ministreaming/locale/messages_de.po trans.es = apps/ministreaming/locale/messages_es.po trans.fr = apps/ministreaming/locale/messages_fr.po @@ -332,6 +336,7 @@ trans.nb = apps/ministreaming/locale/messages_nb.po trans.pl = apps/ministreaming/locale/messages_pl.po trans.ro = apps/ministreaming/locale/messages_ro.po trans.ru_RU = apps/ministreaming/locale/messages_ru.po +trans.sv_SE = apps/ministreaming/locale/messages_sv.po trans.uk_UA = apps/ministreaming/locale/messages_uk.po trans.zh_CN = apps/ministreaming/locale/messages_zh.po diff --git a/apps/i2psnark/locale/messages_ar.po b/apps/i2psnark/locale/messages_ar.po index 9d37a395a..5410a2daa 100644 --- a/apps/i2psnark/locale/messages_ar.po +++ b/apps/i2psnark/locale/messages_ar.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n" "MIME-Version: 1.0\n" @@ -20,227 +20,227 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "تم قفل النفق" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "تم تغببر مجموع حد الرفع الى {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "اقل حد الرفع الى {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "حولت سرعة الرفع الى {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "اقل سرعة رفع هي{0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "تغير تأخير البداية الى {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "سيتم تفعيل التغيير بعد اعادة التشغيل" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "فك الاتصال" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr " تغيرت الاعدادات الى {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "فشل في الاتصال بالاعدادات الجديدة، سيتم الرجوع الى الاعدادات القديمة" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "فشل في اعادة الاتصال بالاعدادات القديمة!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "اتصال بوجهة جديدة" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "اعادة التشغيل \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "تشغيل عند البداية" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "الغاء التشغيل عند البداية" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "تفعيل open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "الغاء تفعيل open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} تم تحميل التيمة ارجع الى صفحة للمشاهدة i2psnark." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "لم تتغير الاعدادات" -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "تغيير open trackers - يجب اعادة تشغيل التورنت لتفعيل التغيير." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "فشل في حفظ الاعدادات {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "جاري الاتصال بشبكة I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "فشل في الاتصال ب I2P - تخقق من اعدادات I2CP !" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "خطأ: فشل في اضافة التورنت {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "فشل في فتح \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "تورنت بهذه المعلومات مشغل: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -248,34 +248,34 @@ msgid "" "torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "تورنت في \"{0}\"غير صحيح" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "خطأ - لا توجد ذاكرة كافية، لا يمكن انشاء تورنت {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "تم اضافة وتشغيل التورنت: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "تمت اضافة: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "يحمل {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -283,132 +283,132 @@ msgid "" "DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "اضافة {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "فشل في نسخ التورنت الى {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "ملفات كثيرة في \"{0}\" ({1}) تم حذف" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "ملف التورنت \"{0}\" لا يمكنه الانتهاء ب \".torrent\", سيتم حذفه!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "ﻻ أجزاء في \"{0}\", حذف!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "الأجزاء كبيرة في \"{0}\" ({1}B), حذف." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "حدود {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, 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:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "خطأ: ﻻيمكن حذف التورنت {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "تورنت متوقف: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "تورنت محذوف: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "اضف تورنت في {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "انتهى التحميل: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "بداية التورنت {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "فشل في اضافة I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "فتح النفق واطلاق جميع التورنت" -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "توقيف جميع التورنت و قفل النفق I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "" @@ -456,14 +456,14 @@ msgstr "تورنت غير صحيح {0} " #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark برنامج تورنت" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "اعدادات" @@ -496,135 +496,135 @@ msgid "clear messages" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "الحالة" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "اخفاء النظائر" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "أظهر النظائر" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "تورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "تقدير للوقت الباقي" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "محمل" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "الحجم" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "رفع" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "معدل التحميل" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "توقيف جمبع التورنت و النفق I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "توقيف الجمبع" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "شغل الجمبع" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "شغل جمبع التورنت و النفق I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "لم يحمل تورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "مجموع" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" @@ -635,7 +635,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" @@ -646,7 +646,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" @@ -657,203 +657,207 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "تم حذف ملف مغناطيس: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "تم خذف ملف التورنت: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "خذف ملف البيانات: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "فشل في حذف الملف: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "تم انشاء تورنت لـ \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "العديد من trackers يطلبون تسجيل التورنت قبل مشاركتها، قم بذلك قبل البداية {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "فشل في انشاء تورنت لـ \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "لا يمكن انشاء تورنت لبيانات غير موجودة: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "فشل في انشاء تورنت - عليك اختيار ملف أو مجلد" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Tracker خطأ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" @@ -864,366 +868,366 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "بشارك" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "اكتمل" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "موافق" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "متوقف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "لا بوجد نظائر" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "متوقف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "تفاصيل التورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "أظهر الملفات" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "فتح ملف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "قف التورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "قف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "ابدأ التورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "ابدأ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "حذف التورنت من القائمة، حذف ملف .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "حذف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "خذف ملف التورنت و الملفات المرتبطة به" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "هل أنت متأكد من حذف التورنت \\''{0}\\'' وجمبع البيانات المحملة؟" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "حذف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "غير معروف" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "شارك" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "غير مهم (النظير لا يحتوي على اجزاء نحتاجها)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "مشكلة (لا يمكن الحصول على اجزاء الملف من النظائر)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "تفاصيل حول {0} tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "معلومات" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "أضف تورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "من عنوان" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "أضف تورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "يمكن ايضا .نقل ملفات تورنت الى: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "سيتم القاف التورنت عند حذف الملف torrent." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "أنشئ تورنت" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "البيانات المشاركة" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "أنشئ تورنت" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "مجلد البيانات" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "اذا تم تفعيل، يقوم بتشغيل التورنت تلقائيا عند اضافته" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "تيمة" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "تأخر البداية" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "دقائق" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "اقصى حد للرفع" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "النظائر" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "اقصى حد لسرعة الاتصال" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "ينصح باستعمال نصف سرعة الشبكة" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "أظهر أو غير سرعة الموجه" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "استعمال open trackers ايضا" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "اعدادت الاتصال الداخلي" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "اعدادت الاتصال الخارجي" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "حفظ الاعدادات" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "فتح" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "غنوان مغناطيس غير صحيح {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" @@ -1234,7 +1238,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" @@ -1245,119 +1249,119 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "وصلة مغناطيس" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "انتهاء" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "الملفات" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "القطع" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "حجم القطعة" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "المجلد" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "الأولوية" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "تورنت غير موجود؟" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "الملف غير موجود في التورنت؟" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "اكتمل" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "عالي" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "عادي" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "تجاوز" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "حفظ الأولويات" diff --git a/apps/i2psnark/locale/messages_cs.po b/apps/i2psnark/locale/messages_cs.po index bd68b9086..b107d9e86 100644 --- a/apps/i2psnark/locale/messages_cs.po +++ b/apps/i2psnark/locale/messages_cs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n" "MIME-Version: 1.0\n" @@ -20,227 +20,227 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "Neběží žádné další torrenty." -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P tunel uzavřen." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Celkový limit sdílečů změněn na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Nejmenší celkový limit sdílečů je {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Horní BW limit změněn na {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Nejmenší horní limit přenosové rychlist je {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Prodleva při startu změněna na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Doba aktualizace stavu (refresh time) změněna na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Aktualizace stavu vypnuta" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Změny I2CP a tunelu se projeví až po zastavení všech torrentů" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Nastavení (options) I2CP změněno na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Odpojuji se od starého I2CP cíle" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Nastavení (settings) I2CP změněno na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Nemůžu se připojit s novým nastavením I2CP, vracím se k předhozímu." -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Nemohu se opětovně připojit ani s předchozím nastavením!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Opětovně připojeno k novému I2CP cíli" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP listener restartován pro \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nové soubory budou veřejně přístupné" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nové soubory nebudou veřejně přístupné" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Automatické spuštění zapnuto" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Automatické spuštění vypnuto" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Zapnuto automatické spuštění" -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Otevřené trackery vypnuty - aby se změna projevila je nutné restartovat všechny torrenty" -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT povoleno." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT zakázáno." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Téma {0} bylo nahráno, přejděte prosím na hlavní stránku i2snark" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Nastavení nebylo změněno." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Seznam otevřených trackerů změněn - aby se změna projevila je nutné restartovat všechny torrenty" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Nemůžu uložit soubor s nastavením do souboru {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Připojuji se k I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Při připojování k I2P nastala chyba, zkontrolujte prosím nastavení I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Chyba: nepodařilo se přidat torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Nejde otevřít \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent s tímto infohašišem již běží: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -248,34 +248,34 @@ msgid "" "torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent v \"{0}\" je chybný" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "CHYBA - nedostatek paměti, nemohu vytvořit torrent z {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent přidán a spuštěn: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent přidán: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Získávám {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -283,132 +283,132 @@ msgid "" "DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Přídávám {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Chyba: nepodařilo se zkopírovat soubor torrentu do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "V \"{0}\" ({1}) je příliš mnoho souborů, mažu je!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Jméno souboru torrentu \"{0}\" nemůže končit na \".torrent\", mažu ho!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "\"{0}\" neobsahuje žádné části, mažu to!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Příliš mnoho částí v \"{0}\", maximum je {1}, mažu to!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent zastaven: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent smazán: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Stahování dokončeno: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "" @@ -456,14 +456,14 @@ msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "" @@ -496,135 +496,135 @@ msgid "clear messages" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Skrýt peery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Ukázat peery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" @@ -632,7 +632,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" @@ -640,7 +640,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" @@ -648,203 +648,207 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent vytvořen pro \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, 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:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Přidat tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" @@ -852,366 +856,366 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Neznámý" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Přidat torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Z URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Přidat torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Můžete také zkopírovat .torrent soubory do: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Vytvořit torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Hlavní" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Vytvořit torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Vzhled" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" @@ -1219,7 +1223,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" @@ -1227,119 +1231,119 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "" diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index f5cfc3624..ad4612891 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-07 12:54+0000\n" -"Last-Translator: blabla \n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" +"Last-Translator: kytv \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,222 +37,222 @@ msgid "No more torrents running." msgstr "Keine weiteren Torrents laufen." #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P-Tunnel geschlossen." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Gesamthochladerbegrenzung geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minimale Gesamthochladerbegrenzung ist {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Hochladebandbreitenbegrenzung geändert auf {0}kbyte/s." -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minimale Hochladebandbreitenbegrenzung ist {0} kbyte/s." -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Startverzögerung geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Aktualisierungsrate geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Aktualisierung deaktiviert" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Seitengröße geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Datenverzeichnis muss ein absoluter Pfad sein" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Datenverzeichnis nicht vorhanden" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Kein Verzeichnis" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Unlesbar" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Datenverzeichnis geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Änderungen an I2CP und am Tunnel werden nach dem Stoppen aller Torrents wirksam" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP-Optionen geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Altes I2CP-Ziel wird getrennt" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP-Einstellungen geändert auf {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Verbinden mit den neuen Einstellungen nicht möglich, benutze wieder die alten I2CP-Einstellungen" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Verbinden mit den alten Einstellungen nicht möglich!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Verbunden auf dem neuem I2CP-Ziel" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP-Lauscher neu gestartet für \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Neu Dateien werden allgemein lesbar sein." -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Neue Dateien werden nicht allgemein lesbar sein." -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Autostart wird aktiviert" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Autostart wird deaktiviert" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "OpenTracker aktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "OpenTracker deaktiviert - Um dies anzuwenden, müssen die Torrents neu gestartet werden." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT aktiviert." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT deaktiviert." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "DHT-Änderungen erfordern das Anhalten und erneutes Öffnen des Tunnels" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} Theme geladen. Gehen Sie zurück zur Hauptseite von i2psnark, um die Änderungen zu sehen!" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Konfiguration nicht geändert." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "OpenTracker-Liste geändert - Um dies anzuwenden, müssen die Torrents neu gestartet werden" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Liste privater Tracker geändert - betrifft nur neu erstellte Torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Konnte Konfiguration nicht in {0} speichern" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Verbinde mit I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Fehler beim Verbinden mit I2P - Überprüfen Sie Ihre I2CP-Einstellungen!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Fehler: Konnte den Torrent \"{0}\" nicht hinzufügen" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Kann \"{0}\" nicht öffnen" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent mit diesem Infohash läuft schon: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "FEHLER - Keine I2P-Tracker im privaten Torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Warnung - Keine I2P-Tracker in \"{0}\", es wird nur bei I2P-OpenTrackern und mittels DHT bekanntgeben" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Warnung - Keine I2P-Tracker in \"{0}\" und OpenTrackers sind deaktiviert. Bekanntgabe erfolgt nur mittels DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -260,34 +260,34 @@ msgid "" "torrent." msgstr "Warnung - Keine I2P-Tracker in \"{0}\", und DHT und OpenTrackers sind deaktiviert. Sie sollten DHT oder OpenTrackers vor dem Starten des Torrents aktivieren." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent in \"{0}\" ist nicht gültig" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "FEHLER - Unzureichender Arbeitsspeicher, kann keinen Torrent von {0} erstellen." -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent hinzugefügt und gestartet: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent hinzugefügt: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "{0} wird abgerufen" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -295,128 +295,128 @@ msgid "" "DHT." msgstr "Das Verwenden von OpenTrackern ist deaktiviert und wir haben keine DHT-Gegenstellen. Das Abrufen von {0} könnte scheitern, sofern Sie keinen anderen Torrent starten. Aktivieren Sie OpenTracker oder DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "{0} wird hinzugefügt" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Herunterladen läuft bereits: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Fehler beim Kopieren der Torrentdatei nach {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Zu viele Dateien in \"{0}\" ({1}), wird gelöscht! " -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrentdatei \"{0}\" darf nicht auf '.torrent' enden, wird gelöscht!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Keine Teile in \"{0}\", wird gelöscht!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Zu viele Teile in \"{0}\", das Limit sind {1}, werden gelöscht!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Teile in \"{0}\" sind zu groß ({1}B), werden gelöscht!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Limit ist \"{0}\"Bytes" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" enthält keine Daten und wird gelöscht!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrents größer als \"{0}\"Bytes werden nicht unterstützt, \"{1}\" wird gelöscht." -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Fehler: Konnte den Torrent \"{0}\" nicht entfernen" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent gestoppt: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent entfernt: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Torrents in {0} werden hinzugefügt" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Hochladebandbreitenbegrenzung ist {0} KByte/s." -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Herunterladen abgeschlossen: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo für {0} erhalten" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Torrent {0} wird gestartet" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Fehler bei Torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Konnte keine Verbindung zu I2P herstellen!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "I2P-Tunnel wird geöffnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Den I2P-Tunnel öffnen und alle Torrents starten." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Alle Torrents stoppen und den I2P-Tunnel schließen." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Der I2P-Tunnel wird nach Benachrichtigung der Tracker geschlossen." @@ -468,14 +468,14 @@ msgstr "Torrent in {0} war nicht gültig" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Konfiguration" @@ -508,844 +508,848 @@ msgid "clear messages" msgstr "Nachrichten löschen" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Sortieren nach {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Teilnehmer ausblenden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Teilnehmer einblenden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Dateityp" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Geschätzte verbleibende Zeit" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr " Empf." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Heruntergeladen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Größe" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr " Send." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Hochladeverhältnis" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Hochgeladen" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Übertragungsrate für den Empfang" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Herunterladegeschwindigkeit" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Übertragungsrate fürs Senden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Hochladegeschwindigkeit" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Alle Torrents und den I2P-Tunnel stoppen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Alle stoppen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Alle gestoppten Torrents fortsetzen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Alle starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Alle Torrents und den I2P-Tunnel starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Keine Torrents geladen." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Gesamt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 Torrent" msgstr[1] "{0} Torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 verbundener Teilnehmer" msgstr[1] "{0} verbundene Teilnehmer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 DHT-Gegenstelle" msgstr[1] "{0} DHT-Gegenstellen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Erste" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Erste Seite" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Vorherige" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Vorherige Seite" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Nächste" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Nächste Seite" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Letzte" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Letzte Seite" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Datenverzeichnis kann nicht erstellt werden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Kann den Torrent {0} nicht hinzufügen, da dieser in einem anderen Torrent ist: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Ungültige URL - muss mit \"http://\", \"{0}\" oder \"{1}\" anfangen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnetlink gelöscht: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Torrentdatei gelöscht: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Download gelöscht: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Datendatei gelöscht: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Daten konnten nicht gelöscht werden: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Das Verzeichnis {0} konnte nicht gelöscht werden." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Verzeichnis gelöscht: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Kann keinen Torrent mit der Endung \".torrent\" hinzufügen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Torrent mit diesem Namen ist schon aktiv: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Kann keinen Torrent hinzufügen, der das I2P Verzeichnis beinhaltet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Kann den Torrent {0} nicht hinzufügen, da dieser den Torrent {1} enthält." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Fehler - Einfügen alternativer Tracker ohne primären Tracker nicht möglich" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Fehler - Mischen von privaten und öffentlichen Trackern in einem Torrent nicht möglich" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent erstellt für \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Viele I2P-Tracker erfordern eine Registrierung, bevor der Torrent verteilt wird. Bitte tun Sie dies vor dem Start von \"{0}\"!" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Fehler beim Erstellen eines Torrents für \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Kann keinen Torrent für nicht existente vorhandene erstellen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Fehler beim Erstellen des Torrents - Sie müssen eine Datei oder ein Verzeichnis angeben." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Ausgewählte löschen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Trackerkonfiguration speichern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Entfernt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Tracker hinzufügen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Geben Sie einen gültigen Tracker-Namen und die URLs ein" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Auf Standardeinstellungen zurücksetzen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Auf Standard-Tracker zurückgesetzt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Überprüfe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Reserviere" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Trackerfehler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 Teilnehmer" msgstr[1] "{0} Teilnehmern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Verteile" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Vollständig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Stillstand" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Keine Teilnehmer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Gestoppt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Details" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Dateien ansehen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Datei öffnen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Torrent stoppen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Stopp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Torrent starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Start" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Entfernt den Torrent von der aktiven Liste und löscht die .torrent-Datei" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Sind Sie sicher, dass Sie die Datei \\''{0}\\'' löschen möchten (Heruntergeladene Daten werden nicht gelöscht)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Entfernen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Löscht die .torrent-Datei und (die) dazugehörige Datendatei(en)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Sind Sie sicher, dass Sie die Torrentdatei \\''{0}\\'' und alle heruntergeladenen Daten löschen wollen?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Löschen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Unbekannt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Quelle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Uninteressant (Der Teilnehmer hat keine Teile, die wir benötigen)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Gedrosselt (Der Teilnehmer hat uns nicht erlaubt, Teile anzufordern)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Uninteressiert (Wir haben keine Teile, die der Teilnehmer benötigt)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Gedrosselt (Wir erlauben dem Teilnehmer nicht, Teile anzufordern)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Details beim Tracker {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Torrent hinzufügen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Von URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Geben Sie die URL zum Herunterladen einer Torrentdatei (I2P-Link), einen Magnet-Link, einen Maggot-Link oder einen Info-Hash ein!" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Füge Torrent hinzu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Datenverzeichnis" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Geben Sie das Verzeichnis zum Speichern der Daten ein (Standardeinstellung {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Alternativ können Sie die .torrent-Dateien auch nach {0} kopieren." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Das Entfernen der .torrent-Datei stoppt den jeweiligen Torrent." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Torrent erstellen" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Daten zum Verteilen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Datei oder Verzeichnis zum Verteilen (Gesamter Pfad oder aus dem Verzeichnis {0} )" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primär" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Torrent erstellen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "keiner" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Datenverzeichnis" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Dateien von allen lesbar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Wenn abgehakt, können andere Benutzer auf die heruntergeladenen Dateien zugreifen." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Torrents automatisch starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Wenn abgehakt, werden hinzugefügte Torrents automatisch gestartet." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Aufmachung" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Aktualisierungsintervall" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Startverzögerung" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "Minuten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Seitengröße" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "Torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Gesamtlimit an Hochladern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "Teilnehmer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Bandbreitenbegrenzung beim Hochladen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Halbe verfügbare Bandbreite wird empfohlen." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Routerbandbreite ansehen oder ändern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Auch OpenTracker verwenden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Wenn abgehakt, wird der Torrent neben dem in der Torrentdatei angegebenen Tracker auch bei den OpenTrackern bekanntgegeben." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "DHT aktivieren" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Wenn abgehakt, wird DHT verwendet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Einstellungen eingehend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Einstellungen ausgehend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP-Host" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP-Port" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP-Optionen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Einstellungen speichern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Name" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "Webseiten-URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Standard" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Offen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Ankündigungs-URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Hinzufügen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Ungültige Magnet-URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 Zwischenstation" msgstr[1] "{0} Zwischenstationen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 Tunnel" msgstr[1] "{0} Tunnel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrentdatei" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Datenadresse" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Info-Hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Primärer Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Tracker-Liste" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Kommentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Erstellt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Erstellt von" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnetlink" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Privater Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Fortschritt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Verbleibend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Dateien" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Stücke" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Stückgröße" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Verzeichnis" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Priorität" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Eine Hierarchie nach oben" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrentdatei nicht gefunden?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Datei nicht gefunden im Torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "vollständig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "verbleibend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Hoch" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Überspringen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Alle auf hoch festlegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Alle auf normal festlegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Alle überspringen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Prioritäten speichern" diff --git a/apps/i2psnark/locale/messages_es.po b/apps/i2psnark/locale/messages_es.po index 337bdad1d..b173cff24 100644 --- a/apps/i2psnark/locale/messages_es.po +++ b/apps/i2psnark/locale/messages_es.po @@ -14,15 +14,15 @@ # mixxy, 2011 # punkibastardo , 2011, 2012 # punkibastardo , 2011 -# strel, 2013-2014 +# strel, 2013-2015 # Trolly, 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-02-23 21:33+0000\n" -"Last-Translator: blabla \n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:57+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,222 +35,222 @@ msgid "No more torrents running." msgstr "No hay más torrents intercambiandose." #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Túnel I2P cerrado." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Enlace magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "El límite total de usuarios subiendo ha cambiado a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "El límite mínimo total de usuarios subiendo es {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "El límite de ancho de banda de subida cambió a {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "El límite mínimo de ancho de banda de subida es {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "El retardo en el arranque cambió a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Hora de actualización cambiado a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Actualización deshabilitada" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Tamaño de página cambiado a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "La carpeta de datos tiene que ser una ruta absoluta" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "La carpeta de datos no existe" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "No es una carpeta" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "No se pudo leer" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Carpeta de datos cambiada a {0} " -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Los cambios de I2CP (protocolo cliente I2P) y túnel serán efectivos después de detener todos los torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Opciones I2CP cambiadas a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Desconectando destino I2CP antiguo" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Preferencias de I2CP cambiadas a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "No se pudo conectar usando las nuevas preferencias de I2CP (protocolo cliente I2P), volviendo a las antiguas" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "¡No se pudo reconectar usando las preferencias antiguas!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Reconectado con el nuevo destino I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "El escuchador de I2CP se reinició para \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Los ficheros nuevos serán públicamente legibles" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Los ficheros nuevos no serán públicamente legibles" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Arranque automático activado" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Arranque automático desactivado" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Trackers (rastreadores) abiertos activados - requiere reiniciar el torrent para que sea efectivo." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Trackers (rastreadores) abiertos desactivados - requiere reiniciar el torrent para que sea efectivo." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT habilitada." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT deshabilitada." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Cambiar la DHT (tabla de hash distribuida) requiere cerrar el túnel y volver a abrirlo" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Tema {0} cargado, vuelva a la página principal de i2psnark para verlo" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "La configuración no cambió." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "La lista de trackers (rastreadores) abiertos cambió - requiere reiniciar el torrent para que sea efectiva." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "La lista de trackers (rastreadores) privados cambió - afactará sólo a los torrents creados a partir de ahora." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "No se pudo guardar la configuración en {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Conectando a I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Error al conectar a I2P - ¡compruebe sus preferencias de I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Error: No se pudo añadir el torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "No se pudo abrir \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Ya hay un torrent con esta información de hash (identificador criptográfico): {0}." -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "ERROR - No hay trackers I2P en el torrent privado \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", sólo se anunciará a trackers abiertos I2P y a la DHT (tabla de hash distribuida)." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", y los trackers abiertos están deshabilitados. Sólo se anunciará a la DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -258,34 +258,34 @@ msgid "" "torrent." msgstr "Advertencia - No hay trackers (rastreadores) I2P en \"{0}\", y la DHT (tabla de hash distribuida) y los trackers abiertos están deshabilitados, debe habilitar los trackers abiertos o la DHT antes de iniciar el torrent." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "El torrent en \"{0}\" no es válido." -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ERROR - Sin memoria disponible, no se pudo crear un torrent a partir de {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent añadido e iniciado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent añadido: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Obteniendo {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -293,128 +293,128 @@ msgid "" "DHT." msgstr "Los rastreadores abiertos están desactivados y no hay pares DHT. Es posible que no se puedan obtener para {0} hasta que no inicie otro torrent, active los rastreadores abiertos o active la DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Añadiendo {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Descarga ya en marcha: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "No se pudo copiar el fichero torrent a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Hay demasiados ficheros en \"{0}\" ({1}), ¡borrándolos!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "El fichero torrent \"{0}\" no puede terminar en \".torrent\". ¡borrándolo!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "No hay partes en \"{0}\", ¡borrándolo!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Hay demasiadas partes en \"{0}\", el límite es {1}, ¡borrándolo!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Las partes en \"{0}\" ({1}Bytes) son demasiado grandes, ¡borrándolas!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "El límite es de \"{0}\"Bytes" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "El torrent \"{0}\" no contiene datos, ¡borrándolo!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Los torrents mayores de \"{0}\"Bytes aún no están soportados, borrando \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Error: No se pudo eliminar el torrent \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent detenido: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent eliminado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Añadiendo torrents en {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "El limite de ancho de banda de subida es {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Descarga finalizada: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo recibida para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Iniciando el torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Error en el torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "¡No se pudo conectar con I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Abriendo el túnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Abriendo el túnel I2P e iniciando todos los torrents ..." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Deteniendo todos los torrents y cerrando el túnel I2P." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Cerrando túnel I2P después de avisar a los trackers" @@ -466,14 +466,14 @@ msgstr "El torrent en {0} no era válido" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Configuración" @@ -506,844 +506,848 @@ msgid "clear messages" msgstr "eliminar mensajes" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Estado" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Ordenado por {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Ocultar pares ('peers')" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Mostrar pares ('peers')" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Tipo de fichero" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Llegada" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Tiempo restante estimado" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "Receptor" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Descargado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Tamaño" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "Transmisor" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Tasa de subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Subido" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Tasa de descarga" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Tasa de descarga" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Tasa de subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Tasa de subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Detener todos los torrents y el túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Detener todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Iniciar todos los torrents parados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Iniciar todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Iniciar todos los torrents y el túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "No hay torrents cargados." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totales" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 par conectado" msgstr[1] "{0} pares conectados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 par DHT" msgstr[1] "{0} pares DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "Dest" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Primera" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Primera página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Anterior" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Página anterior" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Siguiente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Página siguiente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Última" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Última página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "No se pudo crear el directorio de datos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "No puede añadir un torrent {0} dentro de otro torrent: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "URL no válida: debe comenzar con \"http://\", \"{0}\", o \"{1}\"." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet borrado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Fichero torrent borrado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Descarga borrada: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Fichero de datos borrado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "No se pudo borrar el fichero de datos: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "No se pudo borrar la carpeta {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Carpeta borrada: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "No se pudo añadir un torrent que acaba en \".torrent\": {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Un torrent con este nombre ya está intercambiandose: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "No puede añadir un torrent que incluye un directorio I2P: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "No puede añadir un torrent {0} que incluye otro torrent: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Error - No se pueden incluir trackers alternativos sin un tracker principal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Error - No se pueden mezclar trackers privados y públicos en un torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent creado para \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Muchos trackers (rastreadores) I2P requieren que registre los nuevos torrents antes del seeding (sembrado) - por favor hágalo antes de iniciar \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Error al crear un torrent para \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "No se pudo crear un torrent para los datos inexistentes: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Error al crear torrent - ha de introducir un fichero o carpeta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Borrar seleccionados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Guardar configuración de tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Eliminado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Añadir tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Introduzca nombre y URLs de tracker (rastreador) válidos" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Restaurar predeterminados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Trackers (rastreadores) predeterminados restaurados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Comprobando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Asignando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Error del tracker (rastreador)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 par" msgstr[1] "{0} pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Iniciando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Sembrando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "Bien" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Estancado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Sin pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Detenido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Detalles del torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Ver ficheros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Abrir fichero" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Detener el torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Detener" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Iniciar el torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Iniciar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Eliminar el torrent de la lista de torrents activos, borrando el fichero .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "¿Está seguro de que quiere borrar el fichero \\''{0}\\'' (los datos descargados no serán borrados)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Eliminar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Borrar el fichero .torrent y el(los) ficheros(s) de datos asociado(s)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "¿Está seguro de que quiere borrar el torrent \\''{0}\\'' y todos los datos descargados correspondientes?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Borrar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Desconocido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Semilla (seed)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Sin interés (el par no tiene las partes que necesitamos)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Restringido (el par no nos está permitiendo solicitar partes)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "No interesado (no tenemos las partes que el par precisa)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Restringiendo (no estamos permitiendo al par solicitar partes)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detalles en el tracker (rastreador) {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Información" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Añadir torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Desde la URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Introduzca URL de descarga del fichero torrent (sólo I2P), enlace magnet, enlace maggot, o información de hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Añadir torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Dir de datos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Introduzca el directorio en el que guardar los datos (por defecto {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "También puede copiar ficheros .torrent a: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Eliminar un fichero .torrent provocará que se detengan sus transferencias." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Crear un torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Datos a sembrar ('seed')" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Fichero o directorio a sembrar (seed) (ruta completa o dentro del directorio {0} ) " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Principal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Crear torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "ninguno" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Carpeta de datos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Ficheros legibles por todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Si está marcada, otros usuarios pueden acceder a los ficheros descargados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Auto iniciar torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Si está marcado, iniciará automáticamente los torrents se añadan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Tema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Hora de actualización" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nunca" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Retardo al arrancar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minutos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Tamaño de página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Límite total de usuarios subiendo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Límite de velocidad de subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Se recomienda la mitad del ancho de banda disponible." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Mostrar o cambiar ancho de banda del router (enrutador)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Usar también trackers (rastreadores) abiertos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Si está marcado, anuncia los torrents a los trackers (rastreadores) abiertos así como a los listados en el fichero torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Habilitar DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Si está marcada, usar DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Preferencias de entrada" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Preferencias de salida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Anfitrión I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Puerto I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Opciones de I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Guardar configuración" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nombre" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL del sitio web" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Estándar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Abrir" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL de anunciamientos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Añadir" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "URL de magnet no válida: {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 salto" msgstr[1] "{0} saltos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 túnel" msgstr[1] "{0} túneles" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Fichero torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Ubicación de los datos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Información de hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Tracker principal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Lista de trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Comentario" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Creado en" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Creado por" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Enlace de magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Torrent privado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Finalización" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Restante" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Ficheros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Partes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Tamaño de las partes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Carpeta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioridad" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Subir a la carpeta del siguiente nivel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "¿No se encotró el fichero torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "¿No se encontró el fichero en el torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "restante" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Alta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Saltar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Configurar todos a alto " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Configurar todos a normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Omitir todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Guardar prioridades" diff --git a/apps/i2psnark/locale/messages_fr.po b/apps/i2psnark/locale/messages_fr.po index 08437ba71..9aa06fb15 100644 --- a/apps/i2psnark/locale/messages_fr.po +++ b/apps/i2psnark/locale/messages_fr.po @@ -12,14 +12,14 @@ # Boxoa590, 2012 # jackjack , 2011 # syl_, 2015 -# Towinet, 2013-2014 +# Towinet, 2013-2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-01 02:59+0000\n" -"Last-Translator: syl_\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-22 09:07+0000\n" +"Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,222 +32,222 @@ msgid "No more torrents running." msgstr "Il n'y a plus de torrents en fonctionnement." #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Tunnel I2P fermé." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Limite totale uploaders modifiée à : {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "La limite de nombre minimal d''uploaders est {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Limite d’envoi modifiée à : {0} ko/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "La limite minimale d’envoi est {0} ko/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Délai de démarrage modifié à {0} minutes" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Temps de rafraîchissement changé pour {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Rafraîchissement désactivé" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Taille de la page changée pour {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Répertoire des données doit être un chemin absolu" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Répertoire de données n'existe pas" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Pas un répertoire" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Illisible" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Répertoire des données changé pour {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Les modifications sur I2CP et les tunnels seront pris en compte après avoir arrêté tous les torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Options I2CP changées pour {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Déconnexion des anciennes destination I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Les paramètres I2CP ont été changés à {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Impossible de se connecter avec les nouveaux paramètres, retour à l'ancienne configuration I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Impossible de se reconnecter avec les anciens paramètres!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Reconnexion sur la nouvelle destination I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "Écouteur I2CP redémarré pour \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Les nouveaux fichiers seront publiquement lisibles" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Les nouveaux fichiers ne seront pas publiquement lisibles" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Démarrage automatique activé" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Démarrage automatique désactivé" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Trackers ouverts activés - redémarrage des torrents requis pour prise en compte." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Trackers ouverts désactivés - redémarrage des torrents requis pour prise en compte." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT activée." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT désactivée." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Le changement DHT nécessite la fermeture puis réouverture du tunnel" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Thème {0} chargé, revenez à la page d''accueil d''i2psnark pour voir comme il est beau !" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Aucun changement de configuration." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Liste des trackers ouverts modifiée - redémarrage des torrents requis pour prise en compte" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Liste tracker privé modifiée - affecte seulement les torrents nouvellement créés." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Impossible de sauvegarder la configuration vers {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Connexion à I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Erreur de connexion à I2P - Vérifiez vos paramètres I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Erreur : Impossible d’ajouter le torrent : {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Impossible d’ouvrir: \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Un torrent avec cette empreinte est déjà actif: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "ERREUR - Pas de trackers I2P dans le torrent privé \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", vais annoncer aux trackers I2P ouverts et DHT seulement." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", et les trackers ouverts sont désactivés, vais annoncer à DHT seulement." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -255,34 +255,34 @@ msgid "" "torrent." msgstr "Avertissement - Pas de trackers I2P dans \"{0}\", et DHT et les trackers ouverts sont désactivés, vous devriez activer les trackers ouverts ou DHT avant de démarrer le torrent." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Le torrent dans \"{0}\" est invalide" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ERREUR - Mémoire insuffisante, impossible de créer le torrent depuis {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent ajouté et démarré: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent ajouté: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Envoi {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -290,128 +290,128 @@ msgid "" "DHT." msgstr "Les trackers ouverts sont désactivés et nous n''avons pas de pairs DHT. La recherche de {0} pourrait ne pas réussir jusqu''à ce que vous démarriez un autre torrent, activiez trackers ouverts, ou activeiz DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Ajout {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Téléchargements déjà en cours: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Impossible de copier le torrent vers {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Trop de fichiers dans \"{0}\" ({1}), suppression! " -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Le fichier torrent \"{0}\" ne peut pas se terminer par \".torrent\", suppression!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Pas de tronçon dans \"{0}\", suppression!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Trop de tronçons dans \"{0}\" , la limite est {1}, suppression!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Les tronçons sont trop larges dans \"{0}\" ({1}B), suppression." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "La limite est de \"{0}\"octets" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Le fichier torrent \"{0}\" n'a pas de données, suppression!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Les torrents dont la taille est supérieure à \"{0}\"octets ne sont pas encore supportés, suppression \"{1}\"." -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Erreur: Impossible de supprimer le torrent \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent arrêté: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent supprimé: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Ajout des torrents dans {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Limite bande passante haute est {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Téléchargement terminé: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo reçue pour {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Démarrage du torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Erreur sur torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Impossible de se connecter à I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Ouverture du tunnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Ouverture du tunnel I2P et démarrage de tous les torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Arrêt de tous les torrents et fermeture du tunnel I2P." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Fermeture du tunnel I2P après notification aux trackers." @@ -463,14 +463,14 @@ msgstr "Le torrent {0} est invalide" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Configuration" @@ -503,844 +503,848 @@ msgid "clear messages" msgstr "nettoyer messages" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "État" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Trier par {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Cacher les pairs" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Afficher les pairs" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Type de fichier" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Temps" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Temps restant estimé" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "Reçu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Téléchargé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Taille" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "Envoyé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Ratio en upload" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Envoyé" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Taux RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Taux de téléchargement" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Taux TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Taux d'envoi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Arrêter tous les torrents et le tunnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Arrêter tout" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Démarrer tous les torrents arrêtés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Démarrer tout" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Démarrer tous les torrents et le tunnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Aucun torrent chargé." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totaux" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "{0} torrent" msgstr[1] "{0} torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "{0} pair connecté" msgstr[1] "{0} pairs connectés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 pair DHT" msgstr[1] "{0} pairs DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "Dest" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Premier" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Première page" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Préc" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Page suivante" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Suivant" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Page suivante" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Dernier" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Dernière page" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Le répertoire données ne peut pas être créé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Ne peut pas ajouter le torrent {0} à l'intérieur d'un autre torrent: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "URL incorrecte - elle doit débuter par \"http://\", \"{0}\", ou \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet supprimé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Fichier torrent effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Téléchargement effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Fichier de données effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Le fichier de données ne peut être effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Le répertoire n''a pas pu être effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Répertoire effacé: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Ne peut pas ajouter un torrent se terminant par \".torrent\": {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Un torrent avec ce nom est déjà en cours: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Ne peut pas ajouter un torrent incluant un dossier d''I2P: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Ne peut pas ajouter le torrent {0} incluant un autre torrent: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Erreur - Ne peut pas inclure de trackers trackers alternatifs sans un tracker primaire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Erreur - Ne peut pas mixer dans un torrent trackers public et privés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent créé pour \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "De nombreux trackers I2P nécessitent d’enregistrer les nouveaux torrents avant de seeder - faites-le avant de démarrer \"{0}\"!" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Erreur de création du torrent pour \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Impossible de créer un torrent pour des données inexistantes: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Erreur de création du torrent - vous devez saisir un fichier ou un répertoire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Effacer les sélectionnés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Sauvegarder la configuration du tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Retiré" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Ajout tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Entrez nom de tracker valide et URLs" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Restaurer les paramètres d'origine" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Restaurer les trackers d'origine" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Vérification" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Allocation" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Erreur du tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "{0} pair" msgstr[1] "{0} pairs" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Démarrage" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seed en cours" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Complet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Figé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Pas de pair" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Arrêté" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Détails du torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Voir les fichiers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Ouvrir fichier" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Arrêter le torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Arrêter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Démarrer le torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Démarrer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Enlever le torrent de la liste active, suprression du fichier .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Êtes-vous sûr que vous voulez supprimer le fichier \\''{0}\\'' (les données téléchargées ne seront pas supprimées) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Enlever" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Supprimer le fichier .torrent et le(s) fichier(s) de données associé(s)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Êtes-vous certain de vouloir supprimer le torrent \\''{0}\\'' ainsi que toutes les données téléchargées ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Supprimer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Inconnu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Aucun intérêt (le pair n'a aucun tronçon utile)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "bridé (le pair ne nous permet pas de demander des tronçons)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Pas intéressé (aucun tronçon utile au pair)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "bridage (nous ne permettons pas au pair de demander un tronçon)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Détails au tracker {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Ajouter torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Depuis l'URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Entrez l'URL de téléchargement du fichier torrent (I2P seulement), lien magnet, lien maggot, or l'info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Ajouter torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Répertoire données" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Saisissez le répertoire où sauvegarder les données par défaut (default {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Vous pouvez aussi copier les fichiers .torrent vers {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "La suppression d'un fichier .torrent entraîne l'arrêt du torrent." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Créer torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Données à seeder" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Fichier ou dossier à seeder (chemin complet ou dans le dossier {0} )" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primaire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternatifs" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Créer torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "aucun" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Répertoire de données" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Fichiers lisibles par tous" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Si coché, les autres utilisateurs pourront accéder aux fichiers téléchargés." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Démarrer automatiquement les torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Si coché, les torrents démarreront automatiquement lors de l'ajout" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Thème" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Temps de rafraîchissement " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Jamais" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Délais de démarrage" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minutes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Taille page" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Limite totale d'envoi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "pairs" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Limite de bande passante en envoi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "La moitié de la bande passante est recommandée." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Consulter ou modifier la bande passante du routeur" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Utiliser également les trackers ouverts" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Si coché, les torrents seront annoncés vers les open trackers ainsi que vers les trackers indiqués dans le fichier torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Active DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Si coché, utilise DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Paramètres entrants" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Paramètres sortants" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Hôte I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Port I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Options I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Sauvegarder la configuration" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nom" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL du site web" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Standard" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Ouvrir le fichier" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Annoncer URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Ajout" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "URL magnet {0} incorrecte" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "{0} saut" msgstr[1] "{0} sauts" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "{0} tunnel" msgstr[1] "{0} tunnels" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Fichier torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Emplacement donnée" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Info hachage" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Tracker primaire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Liste tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Commentaire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Créé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Créé par" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Lien magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Torrent privé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Finalisation" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Restant" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Fichiers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Tronçons" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Taille des tronçons" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Répertoire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Priorité" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Vers le répertoire parent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent non trouvé?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Fichier non trouvé dans le torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "complet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "restant" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Haut" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Ignorer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Mettre tous à haute" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Mettre tous à normale" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Tout sauter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Sauvegarder les priorités" diff --git a/apps/i2psnark/locale/messages_hu.po b/apps/i2psnark/locale/messages_hu.po index d5a03b354..102974283 100644 --- a/apps/i2psnark/locale/messages_hu.po +++ b/apps/i2psnark/locale/messages_hu.po @@ -5,12 +5,13 @@ # # Translators: # omgitsadalek , 2013 +# benewfy , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n" "MIME-Version: 1.0\n" @@ -19,227 +20,227 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." -msgstr "" +msgstr "Nincs több futó torrent." -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P alagút lezárva." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Mágnes" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Teljes feltöltők korlátja megváltoztatva a következőre: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Teljes feltöltők minimum korlátja a következő: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Feltöltési sávszélesség korlátja megváltoztatva a következőre: {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "A minimum feltöltési sávszélesség korlátja {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Késleltetés indításkor megváltoztatva a következőre: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Frissítési idő a következőre változott: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Frissítés kikapcsolva" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Az I2CP-re és alagutakra vonatkozó változtatások az összes torrent leállítása után lépnek érvénybe" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP opciók a következőre lettek változtatva: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Lekapcsolódás a régi I2CP célállomásról" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP beállítások a következőre változtak: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Sikertelen kapcsolódás az új beállításokat használva, visszatérés a régi I2CP beállításokhoz" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Sikertelen újrakapcsolódás a régi beállításokat használva!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Újracsatlakozva az új I2CP célállomásra" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP figyelő újraindítva a következőhöz: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Az új fájlok nyilvánosan olvashatók lesznek" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Az új fájlok nyilvánosan nem lesznek olvashatók" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Automatikus indítás engedélyezve" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Automatikus indítás kikapcsolva" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Nyílt követők (tracker) engedélyezve - az érvénybe lépéshez a torrent újraindítása szükséges." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Nyílt követők (tracker) kikapcsolva - az érvénybe lépéshez a torrent újraindítása szükséges." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT engedélyezve." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT letiltva." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} téma betöltve, megtekintéséhez térj vissza az i2psnark főoldalára." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Beállítások nem lettek megváltoztatva." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Nyílt Követők (tracker) listája megváltozott - az érvénybe lépéshez a torrent újraindítása szükséges." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Megváltozott a privát tracker lista - csak az újonnan létrehozott torrentekre vonatkozik." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Nem sikerült a beállítások mentése a következőre: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Kapcsolódás az I2P-hez" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Hiba az I2P-hez való csatlakozáskor - ellenőrizd az I2CP beállításait!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Hiba: a következő torrent hozzáadása sikertelen: {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "\"{0}\" megnyitása sikertelen" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "A torrent már fut ezzel az infó hash-el: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "HIBA - Nincsenek I2P követők (trackerek) a következő privát torrentben: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -247,34 +248,34 @@ msgid "" "torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Érvénytelen torrent a következőben: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "HIBA - nincs több memória, torrent létrehozása sikertelen a következőből: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent hozzáadva és elindítva: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent hozzáadva: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Leszedés: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -282,132 +283,132 @@ msgid "" "DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "{0} Hozzáadása" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Futó letöltés: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Nem sikerült a torrent fájl másolása a következőre: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Túl sok fájl a következőben: \"{0}\" ({1}), törlésre kerül!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrent fájl \"{0}\" nem végződhet így: \".torrent\", törlésre kerül!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Nincsenek részek a következőben: \"{0}\", törlésre kerül!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Túl sok rész a következőben: \"{0}\", a határ {1}, törlésre kerül!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "A részek túl nagyok a következőben: \"{0}\" ({1}B), törlésre kerül." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "A határ {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "\"{0}\" torrent nem tartalmaz adatot, törlésre kerül!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Nincsenek támogatva torrentek, melyek nagyobbak, mint {0}B, \"{1}\" törlésre kerül" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Hiba: a következő torrent eltávolítása sikertelen: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent leállítva: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent eltávolítva: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Torrentek hozzáadása a következőben: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Feltöltési sebesség korlát {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "A letöltés befejeződött: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainformáció letöltve a következőhöz: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "{0} torrent indítása" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Hiba a következő torrenten: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Sikertelen csatlakozás az I2P-hez!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Az I2P alagút megnyitása" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Az I2P alagút megnyitás, minden torrent indítás alatt." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Az összes torrent leállítás és az I2P alagút lezárás alatt." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "" @@ -455,14 +456,14 @@ msgstr "Érvénytelen torrent a következő helyen: {0}" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Beállítások" @@ -495,844 +496,848 @@ msgid "clear messages" msgstr "üzenetek törlése" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Állapot" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Társak Elrejtése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Társak Megjelenítése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "BIE" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Becsült hátralévő idő" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "Be" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Letöltött" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Méret" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "Ki" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Feltöltött" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Letöltési Sebesség" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Feltöltési Sebesség" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Minden torrent és az I2P alagút leállítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Mindet Leállít" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Mind Indítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Minden torrent és az I2P alagút indítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Egy torrent sem került betöltésre." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Összesen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 csatlakozott társ" msgstr[1] "{0} csatlakzott társ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Érvénytelen URL: \"http://\", \"{0}\", vagy \"{1}\" kell kezdődnie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Mágnes észlelve: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Torrent fájl törölve: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Letöltés törölve: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Adatfájl törölve: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Adatfájl törlése nem sikerült: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Könyvtár nem törölhető: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Könyvtár törölve: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent létrehozva a következőnek: \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Sok I2P követő (tracker) megköveteli az új torrentek regisztrációját táplálás (seed) előtt - kérlek, regisztrálj, mielőtt elindítod a következőt: \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Hiba történt a torrent létrehozásakor \"{0}\" számára" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Nem sikerült torrent létrehozása, nemlétező adat: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Hiba a torrent létrehozásakor - Fájl vagy könyvtár megadása kötelező" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Kijelöltek törlése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Eltávolítva" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Követő (tracker) hozzáadása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Adj meg érvényes követő (tracker) nevet és URL címeket" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Alapértelmezések visszaállítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Alapértelmezett követők (trackerek) visszaállítva" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Ellenőrzés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Helyfoglalás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Követő (tracker) Hiba" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 társ" msgstr[1] "{0} társ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Indítás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Táplálás (seeding)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Kész" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "Rendben" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Beragadt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Nincsenek Társak" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Leállítva" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Torrent részletek" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Fájlok megtekintése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Fájl megnyitása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Torrent leállítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Leállítás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Torrent indítása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Indítás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Torrent eltávolítása az aktív listáról, a .torrent fájl törlésével" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Eltávolítás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr ".torrent fájl törlése a hozzá tartozó adatfájlokkal együtt" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Biztos, hogy törlöd a következő torrentet és az összes letöltött adatot: \\''{0}\\'' ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Törlés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Ismeretlen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Táplálás (Seed)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Érdektelen (társ nem rendelkezik számunkra szükséges részekkel)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Eltömődött (a társ nem engedi részek igénylését)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Érdektelen (nem rendelkezünk a társak számára szükséges részekkel)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Eltömődött (a társak számára a részek igénylése nem engedélyezett)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Részletek a következő követőn (tracker): {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Infó" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Torrent Hozzáadása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "URL címről" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Add meg a torrent fájl letöltési URL-jét (csak I2P), mágnes linket, maggot linket vagy infó hash-t" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Torrent hozzáadása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Másolhatsz .torrent fájlokat a következőhöz is: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "A .torrent fájl eltávolításával meg fog állni." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Torrent létrehozása" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Adat táplálásra (seed)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Követők (trackerek)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Torrent létrehozása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Adatkönyvtár" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Mindenki által olvasható fájlok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Ha be van jelölve, más felhasználók is elérhetik a letöltött fájlokat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Ha be van jelölve, a hozzáadott torrentek automatikusan elindulnak" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Téma" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Idő frissítése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Soha" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Indítási késleltetés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "perc" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Teljes feltöltők korlát" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "társak" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Feltöltési sávszélesség korlát" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "A rendelkezésre álló sávszélesség fele javasolt." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "A router sávszélesség megtekintése vagy megváltoztatása" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Nyílt követőket (tracker) is használjon" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Ha be van jelölve, bejelenti a torrenteket a nyílt követőkre (tracker) és torrent fájlban feltüntetett követőre is" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "DHT engedélyezése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Bejövő Beállítások" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Kimenő Beállítások" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP hoszt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP port" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP opciók" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Beállítások mentése" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Név" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "Weboldal URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Megnyitás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privát" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Bejelentési URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Hozzáadás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Érvénytelen mágnes URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 ugrás" msgstr[1] "{0} ugrás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 alagút" msgstr[1] "{0} alagút" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrent fájl" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Mágnes link" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Privát torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Befejezés" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Hátralévő" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Fájlok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Részek" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Rész méret" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Könyvtár" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioritás" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Vissza a felsőbb szintű könyvtárba" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent nem található?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "File nem található a torrentben?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "kész" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "hátralévő" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Magas" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normál" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Kihagy" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Tulajdonságok mentése" diff --git a/apps/i2psnark/locale/messages_it.po b/apps/i2psnark/locale/messages_it.po index 150d39fc1..5ad5f6edc 100644 --- a/apps/i2psnark/locale/messages_it.po +++ b/apps/i2psnark/locale/messages_it.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n" "MIME-Version: 1.0\n" @@ -24,227 +24,227 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Tunnel I2P chiuso." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Limite del totale di uploaders modificato a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Il minimo limite del totale di uploaders è {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Il minimo limite della banda in up modificato a {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Il minimo limite della banda in up è {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Ritardo startup modificato a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Tempo di aggiornamento cambiato in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Aggiornamento disabilitato" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Dimensione pagina cambiata a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "La cartella dei dati deve essere un percorso assoluto" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "La cartella dei dati non esiste" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Non è una cartella" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Illeggibile" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Cartella dei dati cambiata a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I cambiamenti di tunnel ed I2CP saranno effettivi dopo aver fermato tutti i torrent " -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Opzioni I2CP modificate in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "La vecchia destinazione I2CP è in disconnessione" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Impostazioni I2CP cambiate a {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Impossibile connettersi con le nuove impostazioni, ritorno alle vecchie impostazioni I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Impossibile riconnettersi con le vecchie impostazioni!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Riconnesso sulla nuova destinazione I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "Listener I2CP riavviato per \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "I nuovi file saranno visibili pubblicamente" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "I nuovi file non saranno visibili pubblicamente" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Autostart abilitato" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Autostart disabilitato" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Tracker aperti abilitati - è richiesto il riavvio dei torrent perchè la modifica abbia effetto." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Tracker aperti disabilitati - è richiesto il riavvio dei torrent perchè la modifica abbia effetto." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "Abilita DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "Disabilita DHT" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "La modifica DHT richiede il riavvio dei tunnel" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} tema caricato, ritornare alla pagina i2psnark principale per vederlo." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Configurazione non modificata." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Lista dei tracker aperti modificata - è richiesto il riavvio dei torrent perchè la modifica abbia effetto." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Elenco tracker privati modificato - solo per i nuovi torrent creati." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Impossibile salvare la configurazione su {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "In connessione a I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Errore nella connessione a I2P - controlla le tue impostazioni I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Errore: Non è stato possibile aggiungere il torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Impossibile aprire \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Un torrent con questo info hash è già attivo: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "ERRORE - Nessun tracker I2P nel torrent privato \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", sarà richiesto alla rete i2P di aprire solamente trackers e peers DHT" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", l'apertura di trackers è disabilitata e sarà richiesto di aprire solo peers DHT" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -252,34 +252,34 @@ msgid "" "torrent." msgstr "Attenzione - No i2P trackers entranti (in) \"{0}\", l'apertura di trackers e client DHT sono disabilitati. Dovresti, prima di far partire un torrent, abilitare l'apertura di trackers o peers DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Il torrent in \"{0}\" non è valido" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ERRORE - Memoria piena, impossibile creare torrent da {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent aggounto e avviato: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent aggiunto: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Recupero di {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -287,132 +287,132 @@ msgid "" "DHT." msgstr "I trackers aperti sono disabilitati e non ci sono peers DHT. Il recupero {0} potrebbe non riuscire fino a che non fai partire un altro torrent, abiliti i trackers aperti o abiliti il DHT. " -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "{0} in aggiunta" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Download già attivo: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Fallimento nella copia del file torrent su {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Troppi file in \"{0}\" ({1}), in rimozione!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Il file torrent \"{0}\" non può finire in \".torrent\", in rimozione!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Non ci sono pezzi in \"{0}\", in rimozione!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Troppi pezzi in \"{0}\", il limite è {1}, in rimozione!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "I pezzi sono troppo larghi in \"{0}\" ({1}B), in rimozione." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Il limite è {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Il torrent \"{0}\" non ha dati, in rimozione!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrent più grandi di {0}B non sono ancora supportati, \"{1}\" in rimozione" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Errore: Non è stato possibile rimuovere il torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent fermato: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent rimosso: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Torrent in aggiunta in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "La banda di Upload massima è {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Download completato: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo ricevute per {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Avvio del torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Errore sul torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Impossibile connettersi a I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Apertura tunnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Avvio di tutti i torrent e apertura del tunnel I2P in corso. " -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Stop di tutti i torrent e chiusura del tunnel I2P in corso." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Chiusura tunnel I2P dopo la notifica ai trackers." -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Trackers non validi {0} - abilitare i trackers aperti o il DHT?" @@ -460,14 +460,14 @@ msgstr "Il torrent a {0} non è stato valido" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Configurazione" @@ -500,844 +500,848 @@ msgid "clear messages" msgstr "pulisci messaggi" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Stato" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Nascondi Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Mostra Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Stima del tempo rimanente" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Scaricato" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Dimensione" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Inviato" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Velocità Ricezione (RX) " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Tasso di Download" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Velocità Trasmissione (TX)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Tasso di Upload" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Ferma tutti i torrent e il tunnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Ferma Tutto" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Avvia tutti i torrent fermati" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Avvia Tutti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Avvia tutti i torrent e il tunnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Nessun torrent caricato." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totali" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 peer connesso" msgstr[1] "{0} peer connessi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "uno: 1 DHT peer" msgstr[1] "altri: {0} DHT peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Primo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Prima pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Ind" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Pagina precedente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Avanti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Pagina successiva" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Ultimo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Ultima pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "URL non valido: Deve cominciare con \"http://\", \"{0}\", o \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet eliminato: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "File torrent eliminato: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Downloads cancellati: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "File di dati eliminato: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Non è stato possibile eliminare il file di dati: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "La Cartella non può essere cancellata: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Cartella cancellata: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Errore - Impossibile includere tracker alternativi senza un tracker primario" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Errore - Impossibile fare un mix di tracker privati e pubblici in un torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent creato per \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Molti tracker I2P ti richiedono di registrare nuovi torrent prima del seeding - per cortesia fallo, prima di avviare \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Errore nella creazione di un torrent per \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Impossibile creare un torrent per i dati nonesistenti: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Errore nella creazione del torrent - devi inserire un file o una directory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Elimina selezionati" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Salva configurazione tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Rimosso" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Aggiungi tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Inserisci nome e URL validi per il tracker" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Ripristina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Ripristina tracker di default" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Controllo (Check)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Allocando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Errore del Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 peer" msgstr[1] "{0} peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "In partenza" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seeding" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "In Stallo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Nessun Peer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Fermato" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Dettagli torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Vedi files" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Apri file" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Ferma il torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Ferma" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Avvia il torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Avvia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Rimuovi il torrent dalla lista attiva eliminando il file .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Sei sicuro di voler cancellare il file \\\"{0}\\\" (i dati scaricati non verranno cancellati)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Rimuovi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Elimina il file .torrent e i file dati associati" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Sei sicuro di voler eliminare il torrent \\\"{0}\\\" e tutti i dati scaricati?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Elimina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Sconosciuto" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Non interessante (Il peer non ha pezzi di nostro interesse)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Soffocato (Il peer non ci sta permettendo di richiedere pezzi)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Non interessato (Non abbiamo pezzi di interesse per il peer)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Soffocando (Non stiamo permettendo al peer di richiedere pezzi)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Dettagli al tracker {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Aggiungi Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Da URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Inserisci l'URL del file torrent da scaricare (solo I2P), link magnet, link maggot o info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Aggiungi torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Puoi anche copiare files .torrent su: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Rimuovere un .torrent lo fermerà." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Crea Torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Dati da mandare in seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primario" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Crea torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "nessuno" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Directory dati" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "File visibili da tutti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Se selezionato, gli altri utenti potrebbero accedere ai file scaricati" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Se selezionato, avvia automaticamente torrent che vengono aggiunti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Tema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Tempo di aggiornamento" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Mai" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Ritardo di avvio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minuti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Dimensione pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Limite di uploader totale" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Limite di banda in upload" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Raccomandata metà della banda disponibile." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Vedi o cambia la banda del router" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Usa anche tracker aperti" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Se selezionato, annuncia i torrent sia a tracker aperti che ai tracker elencati nel file torrent " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Abilita DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Se selezionato, usa DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Impostazioni d'Entrata" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Impostazioni d'Uscita" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Host I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Porta I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Opzioni I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Salva configurazione" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nome" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL Sitoweb" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Apri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privato" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL Announce" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Aggiungi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Magnet URL {0} non valido" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 hop" msgstr[1] "{0} hop" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 tunnel" msgstr[1] "{0} tunnel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "File torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Tracker primario" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Elenco dei tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Commento" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Creato" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Creato da" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Link magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Torrent privato" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Completamento" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Rimanente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Files" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Pezzi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Dimensione pezzo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Cartella" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Priorità" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Fino a cartella di livello superiore" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent non trovato?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "File non trovato nel torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "rimanente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Alto" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normale" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Salta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Salva priorità " diff --git a/apps/i2psnark/locale/messages_nb.po b/apps/i2psnark/locale/messages_nb.po index 259289868..dc7cde85e 100644 --- a/apps/i2psnark/locale/messages_nb.po +++ b/apps/i2psnark/locale/messages_nb.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n" "MIME-Version: 1.0\n" @@ -19,227 +19,227 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P tunnelen lukket." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Total opplaster grense satt til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minimum total opplaster grense er {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Opp båndbredde endret til {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minimum opp båndbredde grense er {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Oppstart utsettelse sett til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Oppdaterings tid endret til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Oppdatering skrudd av" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I2CP og tunnel endringer vil ta effekt etter sopping av alle torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP instillinger endret til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Frakobler fra gammel I2CP destinasjon" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP instillinger endret til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Umulig å få tilkobling med de nye instillingene, går tilbake til de gamle I2CP instillingene" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Umulig å koble seg til på nytt med gammle instillinger!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Gjentilkobler på den nye I2CP destinasjonen" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP lytter omstartet for \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nye filer vil bli lesbar for alle" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nye filer vil ikke bli lesbar for alle" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Autostart er skrudd på" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Autostart er avslått" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Skru på åpne trackers - krever torrent omstart for å ta effekt." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Skru av åpne trackers - krever torrent omstart for å ta effekt." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT skrudd på" -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT skrudd av" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "DHT endring krever tunnel avslutting og gjennåpning" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} tema lastet, returner til hovedsiden for i2psnart for å se." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Konfigurasjon uendret." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Åpen tracker listen endret - torrent omstart kreves før det tar effekt." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Privat tracker list endret - vil kun påvirke ny opprettet torrent filer." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Umulig å lagre konfigurasjon til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Kobler til I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Feil ved tilkobling til I2P - Sjekk dine I2CP instillinger!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Feil: kan ikke legge til torrenten {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Kan ikke åpne \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent med samme info hash kjører allerede: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "FEIL - Ingen I2P trackers i privat torrent \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Advarsel - Ingen I2P trackers i \"{0}\", vil bare annonsere til I2P åpne trackers og DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Advarsel - Ingen I2P tracker i \"{0}\", og åpne trackers er skrudd av, vil annonsere kun på DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -247,34 +247,34 @@ msgid "" "torrent." msgstr "Advarsel - Ingen I2P trackers i \"{0}\", og DHT og åpne trackers er avskrudd, du burde skru på åpen tracker eller DHT før du starter torrenten." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent i \"{0}\" er ugyldig" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "FEIL - Tomt for minne, kan ikke lage torrent fra {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent lagt til og startet: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent lagt til: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Henter {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -282,132 +282,132 @@ msgid "" "DHT." msgstr "Åpne trackers er skrudd av og vi har ingen DHT peers. Mottak av {0} blir muligens ikke fullført før du starter en annen torrent, starter åpne trackers, eller DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Legger til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Nedlastning kjører alt: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Feilet med å kopiere torrent fil til {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "For mange filer i \"{0}\" ({1}), sletter det!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrent filen \"{0}\" kan ikke avsluttes i \".torrent\", sletter den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Ingen biter i \"{0}\", sletter den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "For mange biter i \"{0}\", grensen er {1}, sletter den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Bitene er for store i \"{0}\" ({1}B), sletter den." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Grensen er {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" har ingen data, sletter den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrents større enn {0}B er ikke supportet ennå, sletter \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Feil: kan ikke fjerne torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent stoppet: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent fjernet: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Legger til torrents i {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Opp hastighet grense er {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Nedlastning fullført: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Meta informasjon mottatt for {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Starter opp torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Feil i torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Umulig å koble til I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Åpner I2P tunnelen" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Åpner I2P tunnelen og starter alle torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Stopper alle torrents og lukker I2P tunnelen." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Lukker I2P tunnel etter beskjed til trackers." -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Ingen valid tracker for {0} - skru på åpne trackers eller DHT?" @@ -455,14 +455,14 @@ msgstr "Torrent ved {0} var ikke valid" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Konfigurasjon" @@ -495,844 +495,848 @@ msgid "clear messages" msgstr "fjern meldinger" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Gjem peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Vis peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Beregnet tid som gjenstår" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Lastet ned" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Størrelse" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Lastet opp" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "RX Fart" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Ned hastighet" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "TX Fart" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Opp hastighet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Stopp alle torrents og I2P tunellen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Stopp alle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Start alle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Start alle torrents og I2P tunellen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Ingen torrent lastet." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totaler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrents " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 tilkoblet peer" msgstr[1] "{0} tilkoblet peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 DHT peer" msgstr[1] "{0} DHT peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Ugyldig URL: Den må starte med \"http://\", \"{0}\", eller \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Torrent fil slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Nedlastning slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Data fil slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Data fil kunne ikke bli slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Mappen kunne ikke bli slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Mappe slettet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent laget for \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Mange I2P trackers krever at du registerer nye torrents før seeding - Vennligst gjør det før du starter \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Feil ved laging av torrent for \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Kan ikke lage torrent fra den ikke-eksisterende data: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Feil ved opprettelse av torrent - du må velge en fil eller mappe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Slett markerte" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Lagre tracker konfigurasjon" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Fjernet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Legg til tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Skriv inn valid tracker navn og URLer" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Gjenopprett standarder" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Gjenopprettet standard trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Sjekker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Tildeling" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Tracker Feil" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 peer" msgstr[1] "{0} peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Starter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Deler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Ferdig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Fastlåst" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Ingen Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Stoppet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Torrent detaljer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Vis filer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Åpne fil" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Stopp torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Stopp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Start torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Start" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Fjern torrent fra den aktive listen, og slette .torrent filen" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Fjern" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Slett .torrent filen og all tilhørende data fil(er)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Er du sikker på at du vil slette torrent \\\"{0}\\\" og all nedlastet data?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Slett" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Ukjent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Deler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Uinteressang (Peeren har ingen biter vi trenger)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Skjult (Peeren gir oss ikke lov til å be om biter)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Uinteresang (Vi har ingen biter peeren trenger)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Hoster (Vi tillater ikke peeren til å be om biter)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detaljer hos {0} tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Informasjon" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Legg til torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Fra URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Skriv inn torrent fil nedlastings URL (kun I2P), magnet link, maggot link, eller info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Legg til torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Du kan også kopiere .torrent filer til: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Fjerning av .torrent vil få den til å stoppe." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Opprett Torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Data for deling" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Opprett torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Data mappe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Filer tilgjengelig for alle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Hvis merket, andre lokale brukere kan få tilgang til nedlastninger" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Hvis avmerket, vil torrents som blir lagt til automatisk startet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Theme" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Oppdater tid" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Aldri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Oppstarts utsettelse" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minutter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Total opplaster grense" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Opp båndbredde grense" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Halve tilgjengelige hastigheten er anbefalt." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Vis eller endre router båndbredde" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Bruk åpne trackers også" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Hvis avmerked, annonser torrenter til åpne trackers i tillegg til tracker listen i torrent filen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Skru på DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Hvis markert, bruk DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Inngående instillinger" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Utgående instillinger" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP vert" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP port" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP alternativer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Lagre konfigurasjon" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Navn" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "Webside URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Åpne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Annonserings URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Legg til" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Invalid magnet URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 hopp" msgstr[1] "{0} hopp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 tunnel" msgstr[1] "{0} tunneler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrent fil" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnet link" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Privat torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Fullføring" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Gjennstår" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Filer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Biter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Bit størrelse" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Mappe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioritet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Opp en level i mappe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent ikke funnet?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Fil ikke funnet i torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "ferdig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "gjennstår" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Høy" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Dropp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Lagre prioriteter" diff --git a/apps/i2psnark/locale/messages_nl.po b/apps/i2psnark/locale/messages_nl.po index 5f7750c17..84b867411 100644 --- a/apps/i2psnark/locale/messages_nl.po +++ b/apps/i2psnark/locale/messages_nl.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-02-18 19:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" "MIME-Version: 1.0\n" @@ -27,222 +27,222 @@ msgid "No more torrents running." msgstr "Er draaien geen torrents meer." #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P tunnel gesloten." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magneet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Totale uploaders limiet gewijzigd in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minimum totale uploaders limiet is {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Up bandbreedte limiet gewijzigd in {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minimum up bandbreedte limiet is {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Opstartvertraging gewijzigd in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Ververstijd gewijzigd naar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Verversen uitgezet" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Paginagrootte gewijzigd naar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Data-directory moet een absoluut pad zijn" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Data-directory bestaat niet" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Geen directory" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Onleesbaar" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Data-directory gewijzigd naar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I2CP en tunnel wijzigingen hebben pas effect na het stoppen van alle torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP-opties gewijzigd naar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Oude I2CP destination wordt afgesloten" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP instellingen gewijzigd in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Kan geen connectie maken met de nieuwe instellingen, we keren terug naar oude I2CP instellingen" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Kan niet opnieuw verbinden met de oude instellingen!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Opnieuw verbonden met de nieuwe I2CP destination" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP listener herstart voor \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nieuwe bestanden zullen publiek bereikbaar zijn" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nieuwe bestanden zullen niet publiek bereikbaar zijn" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Autostart ingeschakeld" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Autostart uitgeschakeld" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Open Trackers ingeschakeld - torrent herstart nodig." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Open Trackers uitgeschakeld - torrent herstart nodig." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT aangezet." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT uitgezet." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "DHT-wijziging vereist afsluiten en opnieuw openen van tunnel" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} thema geladen, ga naar de hoofd i2psnark pagina om deze te bekijken." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Configuratie ongewijzigd." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Open Tracker lijst gewijzigd - torrent herstart nodig." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Privé trackerlijst gewijzigd - beïnvloedt enkel nieuw aangemaakte torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Kan de configuratie niet opslaan in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Verbinden met I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Fout bij verbinden met I2P - controlleer je I2CP instellingen!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Fout: Kan de torrent {0} niet toevoegen" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Kan \"{0}\" niet openen" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent met deze info hash is al actief: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "FOUT - Geen I2P-trackers in privé-torrent \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", zal alleen aankondigen aan open trackers en DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", en open trackers zijn uitgezet, zal alleen aankondigen aan DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -250,34 +250,34 @@ msgid "" "torrent." msgstr "Waarschuwing - Geen I2P-trackers in \"{0}\", en DHT en open trackers zijn uitgezet, je moet open trackers of DHT aanzetten alvorens de torrent te starten." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent in \"{0}\" is ongeldig" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ERROR - Geen geheugen meer, kan geen torrent maken van {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent toegevoegd en gestart: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent toegevoegd: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Downloaden {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -285,128 +285,128 @@ msgid "" "DHT." msgstr "Open trackers zijn uitgezet en we hebben geen DHT peers. Ophalen van {0} zal misschien niet lukken tot je een andere torrent start, open trackers aanzet, of DHT aanzet." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Toevoegen van {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Download is al bezig: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Kan het torrent bestand niet kopieren naar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Te veel bestanden in \"{0}\" ({1}), wordt verwijderd!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrent bestand \"{0}\" kan niet eindigen in \".torrent\", wordt verwijderd!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Geen stukken in \"{0}\", wordt verwijderd!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Te veel stukken in \"{0}\", limiet is {1}, wordt verwijderd!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Stukken zijn te groot in \"{0}\" ({1}B), wordt verwijderd." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Limiet is {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" heeft geen data en wordt verwijderd!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrents groter dan {0}B worden nog niet ondersteund, verwijder \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Fout: Kan de torrent {0} niet verwijderen" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent gestopt: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent verwijderd: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Toevoegen van torrents in {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Bandbreedtelimiet omhoog is {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Download gereed: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo ontvangen voor {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Starten met torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Fout bij torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Kan niet verbinden met I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Bezig met openen van I2P-tunnel" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Openen van de I2P tunnel en starten van alle torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Stoppen van alle torrents en sluiten van I2P tunnel." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Bezig met sluiten van I2P-tunnel na verwittigen van trackers." @@ -458,14 +458,14 @@ msgstr "Torrent op {0} was niet geldig" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Configuratie" @@ -498,844 +498,848 @@ msgid "clear messages" msgstr "berichten wissen" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Sorteren op {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Verberg Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Toon Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Bestandstype" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Schatting resterende tijd" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Gedownload" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Grootte" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Upload-ratio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Geupload" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "RX-ratio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Down Snelheid" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "TX-ratio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Up Snelheid" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Stop alle torrents en de I2P tunnel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Stop Alle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Start alle gestopte torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Start Alle" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Start alle torrents en de I2P tunnel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Geen torrents geladen." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totalen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 verbonden peer" msgstr[1] "{0} verbonden peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 DHT peer" msgstr[1] "{0} DHT peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Eerste" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Eerste pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Vorige" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Vorige pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Volgende" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Volgende pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Laatste" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Laatste pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Data-directory kan niet aangemaakt worden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Kan torrent {0} niet toevoegen binnen andere torrent: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Ongeldige URL: moet beginnen met \"http://\", \"{0}\", of \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Torrent bestand verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Download verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Data bestand verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Kan data bestand niet verwijderen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Directory kon niet worden verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Map verwijderd: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Kan geen torrent toevoegen die eindig op \".torrent\": {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Torrent met deze naam is al bezig: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Kan geen torrent toevoegen die een I2P-directory bevat: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Kan torrent {0} die een andere torrent bevat niet toevoegen: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Fout - Kan geen alternatieve trackers toevoegen zonder een primaire tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Fout - Kan privé en publieke trackers in een torrent niet mengen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent gemaakt voor \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Veel I2P trackers vereisen dat je de nieuwe torrent registreert voor het seeden - doe dit voordat je \"{0}\" start" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Fout bij het maken van een torrent voor \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Kan geen torrent maken voor niet-bestaande data: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Fout bij het maken van de torrent - je moet een bestand of directory invullen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Geselecteerde verwijderen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Trackerconfiguratie opslaan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Verwijderd" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Tracker toevoegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Geef een geldige trackernaam en URLs in" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Standaardtrackers herstellen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Standaardtrackers hersteld" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Bezig met controleren" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Bezig met toewijzen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Tracker Fout" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 peer" msgstr[1] "{0} peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Bezig met starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seeding" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Voltooid" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Vastgelopen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Geen Peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Gestopt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Torrent details" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Bekijk bestanden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Open bestand" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Stop de torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Stop" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Start de torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Start" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Verwijder de torrent van de actieve lijst, het .torrent bestand wordt verwijderd" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Ben je zeker dat je het bestand \\''{0}\\'' wil verwijderen (gedownloade data zullen niet verwijderd worden)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Weghalen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Verwijder het .torrent bestand en de gerelateerde data bestand(en)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Weet je zeker dat je de torrent \\''{0}\\'' en alle gedownloade data wilt verwijderen?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Verwijderen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Onbekend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Niet interessant (De peer heeft geen stukken die we nodig hebben)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Verstikt (De peer laat ons niet toe om stukken op te vragen)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Niet geïnteresseerd (We heben geen stukken die de peer nodig heeft)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Verstikt (We laten de peer niet toe om stukken op te vragen)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Details op de {0} tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Torrent Toevoegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Van URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Voer de download-URL (alleen I2P), magneetlink, maggotlink of infohash van het torrentbestand in" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Torrent toevoegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Datamap" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Voer de directory om de gegevens in op te slaan in (standaard {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Je kan ook .torrent bestanden kopieren naar: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Verwijderen van een .torrent zorgt dat deze stopt." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Creëer Torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Data om te seeden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Bestand of directory om te seeden (volledig pad of binnen de directory {0} )" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primair" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternatieven" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Creëer torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "geen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Data directory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Bestanden leesbaar door iedereen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Indien aangevinkt hebben andere gebruikers toegang tot de gedownloade bestanden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Torrents automatisch starten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Indien aangevinkt, start toegevoegde torrents automatisch" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Thema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Ververstijd" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nooit" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Startup vertraging" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minuten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Paginagrootte" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Totale uploader limiet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "peers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Up bandbreedte limiet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Helft van beschikbare bandbreedte aanbevolen." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Bekijk of wijzig router bandbreedte" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Gebruik ook open trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Indien aangevinkt, kondig torrents ook aan bij de tracker uit het torrent bestand" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "DHT aanzetten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Gebruik DHT indien aangevinkt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Inkomende Instellingen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Uitgaande Instellingen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP host" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP poort" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP opties" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Configuratie opslaan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Naam" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "Website-URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Standaard" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Open" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Kondig URL aan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Toevoegen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Ongeldige magnet URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 hop" msgstr[1] "{0} hops" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 tunnel" msgstr[1] "{0} tunnels" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrentbestand" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Datalocatie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Infohash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Primaire tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Trackerlijst" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Opmerking" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Aangemaakt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Aangemaakt door" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnet link" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Privé-torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Voltooiing" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Resterend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Bestanden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Stukken" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Stukgrootte" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Directory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioriteit" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Naar bovenliggende directory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent niet gevonden?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Bestand niet gevonden in torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "voltooid" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "resterend" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Hoog" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normaal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Overslaan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Stel alle in als hoog" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Stel alle in als normaal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Alle overslaan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Prioriteiten opslaan" diff --git a/apps/i2psnark/locale/messages_pl.po b/apps/i2psnark/locale/messages_pl.po index c4ef204ee..6072b60ec 100644 --- a/apps/i2psnark/locale/messages_pl.po +++ b/apps/i2psnark/locale/messages_pl.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 18:28+0000\n" -"PO-Revision-Date: 2015-02-17 20:52+0000\n" -"Last-Translator: polacco \n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" +"Last-Translator: kytv \n" "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,227 +25,227 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "Nie ma więcej uruchomionych torrentów." -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Zamknięto tunel I2P." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Ograniczenie liczby uploaderów zmieniono do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minimalny całkowity limit uploadera: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Ograniczenie pasma wyjściowego zmieniono na: {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minimalne pasmo wyjściowe to: {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Opóźnienie uruchamiania zmieniono na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Czas odświerzania zmieniony na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Odświeżanie wyłączone" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Rozmiar strony zmieniony do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Katalog danych musi być pełną ścieżką" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Katalog danych nie istnieje" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "To nie jest katalog" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Nieczytelne" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Katalog danych zmieniony do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Zmiany dotyczące I2CP i tuneli będą wprowadzone po zatrzymaniu wszystkich torrentów." -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Opcje I2CP zmienione na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Rozłączanie starych celów I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Ustawienia I2CP zmienione do: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Nie można połączyć się z nowymi ustawieniami, powrót do starych ustawień I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Nie można się połączyć ze starymi ustawieniami!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Ponowne podłączanie do nowych celów I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "Nasłuch I2CP zrestartowany dla \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nowe pliki będą publicznie dostępne" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nowe pliki nie będą publicznie dostępne" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Włączono automatyczne uruchamianie" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Wyłączono automatyczne uruchamianie" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Włączono otwarte trackery - wymagane ponowne uruchomienie torrenta." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Wyłączono otwarte trackery - wymagane ponowne uruchomienie torrenta." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT włączone." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT wyłączone." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Zmiana DHT wymaga zamknięcia tunelu i jego ponownego otwarcia" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Załadowano temat {0}. Przejdź do strony głównej i2psnark, by zobaczyć." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Ustawienia niezmienione." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Lista otwartych trackerów została zmieniona – wymagane ponowne uruchomienie torrenta." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Lista prywatnych trackerów została zmieniona – dotyczy tylko nowo utworzonych torrentów." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Nie można zapisać konfiguracji do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Łączenie z I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Nie można się połączyć z I2P, sprawdź swoje ustawienia I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Błąd: Nie można dodać torrenta {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Nie można otworzyć \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent o tym hashu jest już uruchomiony: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "BŁĄD – brak trackerów w prywatnym torrencie \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Uwaga – Nie ma trackerów I2P w \"{0}\", zostanie to zameldowane tylko do otwartych trackerów i DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Uwaga – Brak trackerów I2P w \"{0}\", a otwarte trackery są wyłączone. Torrent będzie działał wyłącznie w oparciu o DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -253,34 +253,34 @@ msgid "" "torrent." msgstr "Uwaga – Brak trackerów I2P w \"{0}\". Otwarte trackery i DHT również są wyłączone. Należy włączyć otwarte trackery lub DHT przed rozpoczęciem torrenta." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent w \"{0}\" jest niepoprawny" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "BŁĄD – Brak pamięci, nie można utworzyć pliku torrent z {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent dodany i uruchomiony: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent dodany: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Pobieranie: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -288,132 +288,132 @@ msgid "" "DHT." msgstr "Otwarte trackery są wyłączone i nie mamy żadnych peerów DHT. Pobranie z {0} może się nie udać, dopóki nie uruchomisz innego torrenta, włączysz otwarte trackery lub włączysz DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Dodawanie {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Pobieranie już zostało uruchomione: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Nie udało się skopiować pliku torrent do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Za dużo plików w \"{0}\" ({1}), usuwanie go!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrent \"{0}\" nie może się kończyć w \".torrent\", usuwanie go!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "W torrencie \"{0}\" nie ma piece'ów, usuwanie go!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Za dużo piece''ów w \"{0}\" (limit to {1}), usuwanie go!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Za duże piece''y w torrencie \"{0}\" ({1}B), usuwanie go." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Granica to {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" nie zawiera danych, usuwanie!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrenty większe niż {0}B nie są jeszcze wspierane, usunięcie \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Błąd: nie można usunąć torrenta {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent zatrzymany: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent usunięty: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Dodawanie torrentów w {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Limit transferu połączeń wychodzcych to {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Pobieranie ukończone: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo otrzymane dla {0} " -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Uruchamianie torrenta: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Błąd w torrencie {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Nie można podłączyć się do I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Otwieranie tunelu I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Otwieranie tunelu I2P i uruchamianie wszystkich torrentów." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Zatrzymywanie wszystkich torrentów i zamykanie tunelu I2P." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Zamknięcie tunelu I2P po powiadomieniu trackerów." -#: ../java/src/org/klomp/snark/TrackerClient.java:244 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Brak prawidłowych trackerów dla {0} – włączyć otwarte trackery lub DHT?" @@ -461,14 +461,14 @@ msgstr "Torrent pobrany z {0} jest niepoprawny" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Ustawienia" @@ -501,135 +501,135 @@ msgid "clear messages" msgstr "wyczyść komunikaty" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Stan" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Sortuj wg {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Ukryj peery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Pokaż peery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Rodzaj pliku" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Pozostało" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Szacowany pozostały czas" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Pobrano" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Rozmiar" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Współczynnik wysyłania (ratio)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Wysłano" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "↓" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Prędkość pobierania" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "↑" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Prędkość wysyłania" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Zatrzymaj wszystkie torrenty i tunel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Zatrzymaj wszystkie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Uruchom wszystkie zatrzymane torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Uruchom wszystkie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Uruchom wszystkie torrenty i tunel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Nie załadowano torrentów." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Łącznie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" @@ -637,7 +637,7 @@ msgstr[0] "{0} torrent" msgstr[1] "{0} torrenty" msgstr[2] "{0} torrentów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" @@ -645,7 +645,7 @@ msgstr[0] "{0} podłączony peer" msgstr[1] "{0} podłączone peery" msgstr[2] "{0} podłączonych peerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" @@ -653,203 +653,207 @@ msgstr[0] "{0} peer DHT" msgstr[1] "{0} peery DHT" msgstr[2] "{0} peerów DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Pierwsza" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Pierwsza strona" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Poprzednia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Poprzednia strona" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Następna" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Następna strona" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Ostatnia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Ostatnia strona" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Katalog nie może zostać utworzony" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Nie można dodać torrenta {0} wewnątrz innego torrenta {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Nieprawidłowy URL: musi zaczynać się od \"http://\", \"{0}\" lub \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Odnośnik Magnet usunięty: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Plik torrenta usunięto: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Pobrane usunięte: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Pliki z danymi usunięte: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Nie można usunąć pliku z danymi: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Katalog nie może być usunięty: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Usunięto katalog: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Nie można dodać torrent kończącego się \".torrent\": {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Torrent z tą nazwą już jest uruchomiony: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Nie można dodać torrenta zawierającego katalog I2P: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Nie można dodać torrenta {0} zawierającego inny torrent {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Błąd – Nie można dodać alternatywnych trackerów bez głównego trackera" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Błąd – Nie można mieszać prywatnych i publicznych trackerów w torrencie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Utworzono torrent dla \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Wiele trackerów w I2P wymaga zarejestrowania torrenta przed seedowaniem – proszę, zrób tak przed uruchomieniem \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Błąd podczas tworzenia torrenta dla: \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Nie można utworzyć torrenta dla nieistniejących danych: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Błąd przy tworzeniu torrenta – musisz podać plik lub katalog" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Usuń zaznaczone" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Zapisz ustawienia trackerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Usunięto" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Dodaj tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Podaj prawidłową nazwę trackera i URL" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Przywróć domyślne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Przywrócono domyślne trackery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Sprawdzanie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Alokowanie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Błąd trackera" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" @@ -857,366 +861,366 @@ msgstr[0] "{0} peer" msgstr[1] "{0} peery" msgstr[2] "{0} peerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Uruchamianie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seedowanie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Zakończono" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Utknięto" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Brak peerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Zatrzymany" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Szczegóły torrenta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Zobacz pliki" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Otwórz plik" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Zatrzymaj torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Zatrzymaj" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Uruchom torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Uruchom" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Usuń torrent z aktywnej listy, usuwając plik .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Czy jesteś pewnien, że chcesz usunąć plik \\''{0}\\'' (pobrane dane nie będą usunięte) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Usuń" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Usuń plik .torrent i związane z nim pliki z danymi" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Czy na pewno chcesz usunąć plik \\''{0}.torrent\\'' oraz pobrane dane?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Usuń" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Nieznany" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Uninteresting (peer nie ma piece'ów, które potrzebujemy)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Choked (peer nie pozwala nam na prośbę o piece)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Uninterested (nie mamy piece'ów, których peer potrzebuje)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Choking (nie pozwalamy peerowi na prośbę o piece)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Szczegóły na trackerze {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Dodaj torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Z adresu URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Wpisz adres URL pliku torrent (tylko I2P), Magnet link, link maggot lub info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Dodaj torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Katalog na pobrane dane" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Podaj katalog do zapisu danych (domyślnie: {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Możesz także skopiować pliki .torrent do: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Usunięcie pliku .torrent spowoduje jego zatrzymanie." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Utwórz torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Dane do seedowania" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Plik lub katalog do seedowania (pełna ścieżka lub katalog wewnątrz \"{0}\")" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Główne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternatywne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Utwórz torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "brak" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Katalog z danymi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Pliki dostępne dla wszystkich" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Jeśli zaznaczone, inni użytkownicy mogą mieć dostęp do pobranych plików" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Uruchamiaj automatycznie torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Jeśli zaznaczone – automatycznie uruchamiaj dodane torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Motyw" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Czas odświerzania" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nigdy" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Opóźnienie uruchomienia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minuty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Rozmiar strony" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Całkowity limit uploaderów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "peery" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Ograniczenie pasma wyjściowego" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Zalecana połowa dostępnego pasma." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Zobacz lub zmień pasmo węzła" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Używaj również otwartych trackerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Jeśli zaznaczone, zgłaszaj torrenty do otwartych trackerów, jak również do trackerów podanych w pliku torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Włącz DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Jeśli zaznaczone, używa DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Tunele wejściowe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Tunele wyjściowe" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Adres I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Port I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Parametry I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Zapisz ustawienia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nazwa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL strony www" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Standardowy" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Otwarty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Prywatny" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL rozgłaszania" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Dodaj" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Nieprawidłowy link magnet {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" @@ -1224,7 +1228,7 @@ msgstr[0] "{0} skok" msgstr[1] "{0} skoki" msgstr[2] "{0} skoków" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" @@ -1232,119 +1236,119 @@ msgstr[0] "{0} tunel" msgstr[1] "{0} tunele" msgstr[2] "{0} tuneli" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Plik torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Położenie danych" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Główny Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Lista Trackerów" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Komentarz" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Utworzony" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Utworzony przez" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Link magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Prywatny torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Zakończono" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Pozostało" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Pliki" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Części" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Rozmiar części" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Katalog" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Priorytet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Do katalogu nadrzędnego" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent nie znaleziony?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Plik nie znaleziony w torrencie?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "zakończono" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "pozostało" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Wysoki" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normalny" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Pomiń" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Ustaw wszystkie na wysoki" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Ustaw wszystkie na normalny" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Pomiń wszystkie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Zapisz priorytety" diff --git a/apps/i2psnark/locale/messages_pt.po b/apps/i2psnark/locale/messages_pt.po index b116a00d7..8d356e627 100644 --- a/apps/i2psnark/locale/messages_pt.po +++ b/apps/i2psnark/locale/messages_pt.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n" "MIME-Version: 1.0\n" @@ -28,227 +28,227 @@ msgstr "" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Túnel I2P fechado" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Limite total de uploaders alterado para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Limite mínimo de uploaders alterado para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Largura de banda para a envio alterada para {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Largura de banda mínima para envio é {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Demora na inicialização alterada para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Tempo de actualização alterado para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Actualização desactivada" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Tamanho de pagina alterado para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Diretório de dados deve ter um caminho absoluto" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Diretório de dados não existe" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Não é um diretório" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Ilegível" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Diretório de dados alterado para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Mudanças do I2CP e do túnel farão efeito após interromper todos os torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "opções de I2cp alteradas para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Desconectando destinação anterior do I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Preferências do I2CP alteradas para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Conectar-se não foi posível com as novas preferências I2CP, utilizarei as anteriores." -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Impossível se conectar usando as preferências anteriores!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Conectado com a nova Destinação I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "Conexão I2CP re-estabelecida para \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Novos ficheiros serão lidos pelo publico" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Novos ficheiros não serão lidos pelo publico" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Ativado o iniciar automáticamente" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Desativado o iniciar automáticamente" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Uso de rastreadores abertos ativado - Para ter efeito é necesário reiniciar os torrentes." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Uso dos rastreadores abertos desativado - Para ter efeito é necesário reiniciar os torrentes." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "Habilitar DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "Desabilitar DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Mudança no DHT requer fechamento e reabertura do túnel" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Tema {0} foi carregado. Volte no menú principal para vê-lo." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Configuração não mudada." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Listado de rastreadores abertos mudado - Para ter efeito é necesário reiniciar os torrentes." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Lista de rastreadores privados alterada - somente afetará os novos torrentes criados." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Não se pode guardar a configuração em {0}." -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Conectando com I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Erro ao se conectar com I2P - Verifique a sua configuração I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Erro: Não se pode adicionar o torrente {0}." #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Não pode se abrir \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "torrente com este info hash já em marcha: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "ERRO - Não há tracker I2P no torrent privado \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", o anúncio será feito apenas por rastreadores I2P abertos e DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", e rastreadores I2P abertos estão desabilitados. O anúncio será feito apenas por DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -256,34 +256,34 @@ msgid "" "torrent." msgstr "Aviso - Nenhum rastreador I2P em \"{0}\", e DHT e rastreadores abertos estão desabilitados. Rastreadores abertos ou DHT devem ser habilitados antes de começar o torrente." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "O arquivo .torrent em \"{0}\" não é válido." -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ERRO - Não ha espaço suficente, não se pode crear um torrente desde {0}." -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "torrente adicionado e iniciado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "torrente adicionado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Buscando {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -291,132 +291,132 @@ msgid "" "DHT." msgstr "Rastreadores abertos estão desabilitados e não há participantes DHT. Descarregamento de {0} pode não prosseguir enquanto outra torrente não for iniciada, rastreadores abertos forem habilitados ou DHT habilitado." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Adicionando {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "arquivo já descarregando: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Não se pode copiar o torrente para {0}." -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Ha arquivos demais no \"{0}\", se apagará ({1}). " -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "O arquivo de dados do torrente \"{0}\" não pode terminar em \".torrent' e será apagado." -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Não ha peças no \"{0}\", se apagará." -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Ha peças demais no \"{0}\" e o limite é {1}. Se apagarão." -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Peças no \"{0}\" são grandes demais ({1}B). Se apagarão." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "O limite são \"{0}\"Bytes" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "O torrente \"{0}\" não contem dados e será apagado." -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "torrentes maiores que \"{0}\" Bytes ainda não funcionam, se apagará \"{1}\"." -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Erro: Não se pode quitar o torrente \"{0}\"." -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "torrente detido: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "torrente quitado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Os torrentes serão adicionados em {0} ..." -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Limite de transmissão de dados é {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Finalizada a descarga de \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo recibido para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Iniciando o torrente {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Erro no torrente {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Impossível de se conectar com I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Abrindo o túnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Abrendo o túnel I2P e iniciando os torrentes ..." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Detindo todos os torrentes e fechando o túnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Fechando túnel I2P após notificar os rastreadores." -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Nenhum rastreador válido para {0} - habilitar rastreadores abertos ou DHT?" @@ -464,14 +464,14 @@ msgstr "torrente em {0} não foi válido" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Preferências" @@ -504,844 +504,848 @@ msgid "clear messages" msgstr "limpar mensagens" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Estado" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "ocultar parceiros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "mostrar parceiros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Tempo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Tempo que falta para completar" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "Baixado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Descarregado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Tamanho" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "Subido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Subido" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Taxa de recepção" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Taxa de descarga" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Taxa de transmissão" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Taxa de subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Deter todos os torrentes e o túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Deter tudos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Iniciar todos os torrents interrompidos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Arrancar todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Iniciar todos os torrentes e o túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Não carregado nenhum torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Total" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrente" msgstr[1] "{0} torrentes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 parceiro conectado" msgstr[1] "{0} parceiros conectados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 parceiros DHT" msgstr[1] "{0} parceiros DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Prim." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Primeira página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Ant." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Página anterior" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Próx." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Próxima página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Últ." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Última página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Endereço não válido - tem que começar com \"http://\", \"{0}\", ou \"{1}\"." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Apagada o magnet: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Apagado o arquivo torrente: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Download excluído: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Apagado o arquivo de dados: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Não se pode apagar o arquivo de dados: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Pasta não pôde ser excluída: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Pasta excluída: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Erro - Impossível incluir rastreadores alternativos sem o rastreador primário" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Erro - Impossível misturar rastreadores públicos e privados num torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "torrente criado para \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Muitos rastreadores no I2P exigem que você registre novos torrentes antes de poder semeá-los. Por favor, faça isto antes de iniciar \"{0}\"!" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Erro ao criar o torrente \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Não se pode criar um torrente para dados que não existam: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Erro ao criar o torrente - Tens que especificar um arquivo ou uma pasta." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Excluir selecionado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Salvar configurações do rastreador" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Excluído" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Adicionar tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Insira um nome válido para o tracker e URLs" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Voltar aos padrões" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Voltar aos rastreadores padrão" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Verificando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Reservando espaço" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Erro do rastreador" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 parceiro" msgstr[1] "{0} parceiros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Iniciando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "semeando" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "bem" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "estancado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "sem parceiros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "detenido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Detalhes do torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "mostrar arquivos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "abrir arquivo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Deter o torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Deter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Iniciar o torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Iniciar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Retire o torrente da lista ativa, apagando o arquivo .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Tem a certeza que deseja apagar o ficheiro \\\"{0}\\\" (dados transferidos não serão apagados) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Quitar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Apagar o arquivo torrente e o(s) arquivo(s) de dados pertenecentes" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Está seguro de que quer apagar o arquivo torrente \\''{0}\\'' e todos os dados descarregados deste torrente?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Apagar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "desconhecido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Semeador" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "não interessante (O parceiro não tem peças que precisamos.)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "sufocado (De momento o parceiro não está nos permitindo pedir mais peças.c)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "desinteressado (Não temos as peças que o parceiro quer.)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "sufocando (De momento não estamos permitindo que os parceiros peçam mais peças)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detalhes no rastreador {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Adicionar um torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "URL fonte:" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Digite a URL para download do arquivo torrent (só I2P), ou magnet link, maggo link, ou ainda o seu hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Adicionar torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Também pode copiar arquivos torrentes a {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "A remoção de um arquivo .torrent fará com que ele pare." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Criar um torrente" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Dados para semear" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Rastreadores" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primário" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Criar torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "nenhum" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Pasta de dados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Ficheiro legível por todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Se marcado, outros usuários poderão acessar os ficheiros descarregados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "se marcado, os torrentes adicionados se iniciarão automaticamente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Tema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Tempo de actualização" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nunca" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Demora do arranque" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minutos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Tamanho da página" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Limite global de subidores" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "parceiros" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Limite de largura de banda para a subida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Se recomenda a metade da largura de banda disponível." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "mostrar e mudar as preferências da largura de banda do roteador" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "usar também rastreadores abertos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Se marcado, anunciar os torrentes aos rastreadores abertos, assim como aos rastreadores listados no arquivo torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Habilitar DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Se marcado, usar DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Preferências de entrada" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Preferências de saida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Anfitrião I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Porto I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Opções I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Guardar configuração" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nome" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL do Website" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "abrir" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL para anúncio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Adicionar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "URL magnet {0} não válida" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 salto" msgstr[1] "{0} saltos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 túnel" msgstr[1] "{0} túneles" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Arquivo torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Rastreador Primário" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Lista de Rastreadores" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Commentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Criado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Criado por" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "URL magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Torrente privado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Finalização" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Restantes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Arquivos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Peças" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Tamanho das peças" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Pasta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioridade" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Subir uma herarquia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Não achei o arquivo torrente?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Arquivo não achado no torrente?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "restantes" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "alta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Ignorar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Guardar prioridades" diff --git a/apps/i2psnark/locale/messages_pt_bR.po b/apps/i2psnark/locale/messages_pt_bR.po index 7f9f09ce3..4b20ea31f 100644 --- a/apps/i2psnark/locale/messages_pt_bR.po +++ b/apps/i2psnark/locale/messages_pt_bR.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-04-05 13:44+0000\n" -"Last-Translator: blueboy\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" +"Last-Translator: kytv \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,222 +25,222 @@ msgid "No more torrents running." msgstr "" #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Túnel I2P fechado" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Limite de uploaders totais alterada para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Mínimo de uploaders totais alterada para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Limite de Up BW alterada para {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "O limite de mínimo de banda larga é {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Atraso de inicialização alterada para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Alterações em túneis e I2C entrarão em vigor depois de parar todos torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Desconectando destinação do velho I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Configurações de I2CP alteradas para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Não é possível conectar com as novas configurações. Revertendo para as prévias configurações de I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Não é possível conectar com as novas configurações!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Reconectado à nova destinação de I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "Auditor I2CP recomeçadas a \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Autocomeço permitido" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Autocomeço não permitido" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Trackers abertos permitidos - reinício de torrents é preciso para entrar em vigor" -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Trackers abertos não permitidos - reinício de torrents é preciso para entrar em vigor" -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "Tema {0} carregado, retornar para a página principal de i2psnark para visualizar." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Configuração sem alteração" -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Lista de trackers abertos alterada - reinício de torrents é preciso para entrar em vigor" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Não é possivel salvar configurações para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Conectando a I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Erro ao conectar a I2P - verifique as configurações de I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Erro: não é possível adicionar o torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Não é possível abrir \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "O torrent com este info has já está sendo executado: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -248,34 +248,34 @@ msgid "" "torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "O torrent em \"{0}\" é inválido" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent adicionado e começado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent adicionado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Buscando {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -283,128 +283,128 @@ msgid "" "DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Adicionando {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Falha ao copiar arquivo de torrent de {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Arquivos em excesso em \"{0}\" ({1}), deletando!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Arquivo de torrent \"{0}\" não pode terminar em \".torrent\", deletando!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Sem peças em \"{0}\", deletando!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Peças em excesso em \"{0}\". O limite é {1}, deletando!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Peças são muito grande em \"{0}\" ({1}B), deletando." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "O limite é {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrents maiores do que {0}B não são suportados ainda, deletando \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Erro: não foi possível remover o torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent parado: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent removido: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Adicionando torrents em {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Download terminado: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo recebido para {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Iniciando torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Incapaz de conectar ao I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Abrindo o túnel I2P e começando todos os torrents." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Parando todos os torrents e fechando o túnel I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" @@ -456,14 +456,14 @@ msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnar" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Configuração" @@ -496,844 +496,848 @@ msgid "clear messages" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Ocultar Pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Mostrar Pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Tempo restante estimado" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Baixado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Uploaded" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Taxa de down" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Taxad de up" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Parar todos os torrents e o túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Parar todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Começar todos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Começar todos os torrents e o túnel I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Nenhum torrent carregado." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totais" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrents" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 peer conectado" msgstr[1] "{0} pares conectados" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "URL inválido: deve começar com \"http://\", \"{0}\", ou \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet deletado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Arquivo de torrent deletado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Arquivo de data deletado: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Não foi possível apagar o arquivo de data: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent criado para \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Muitos I2P trackers requerem o registro de torrents antes de seeding - por favor, faça isso antes de começar \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Erro ao criar torrent para \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Não foi possível criar um torrent para a informação inexistente: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Erro ao criar torrent - é preciso um arquiso ou diretório" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Erro de tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 peer" msgstr[1] "{0} pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seeding" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Completo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Estagnado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Sem pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Parad" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Detalhes do torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Ver arquivos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Abrir arquivos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Parar o torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Começar o torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Começar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Remover o torrent da lista de ativos, deletando o arquivo .torrent" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Remover" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Deletar o arquivo ;torrent e associar data file(s)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Tem certeza que quer remover o torrent \\''{0}\\'' e todas as informaçoes baixadas?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Deletar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "desconhecido" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Desinteressante (O par não tem partes que precisemos)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Engasgado (O par não está nos permitindo solicitar partes)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Desinteressado (Não temos quaisquer partes que o par precise)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Engasgando (O par está impossibilitado de solicitar partes)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detalhes em tracker {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Adicionar Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Do URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Acidionar torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Pode também copiar arquivos .torrents de: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "A remoção de um .torrent parará a mesma" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Criar Torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Arquivo para seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Criar torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Diretório de arquivo" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Automaticamente começar torrents adicionados se verificado" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Tema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Atraso de inicialização" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minutos" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Limite total do uploader" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "pares" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Up limite de banda larga" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Abrir" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "" msgstr[1] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "" diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po index d6078a74a..19652c105 100644 --- a/apps/i2psnark/locale/messages_ru.po +++ b/apps/i2psnark/locale/messages_ru.po @@ -11,245 +11,245 @@ # Eugene, 2013 # foo , 2009 # mama__1 , 2013 -# Roman A. , 2013 +# Foster Snowhill, 2013 # sr4d , 2014 -# Roman A. , 2013 +# Foster Snowhill, 2013 # yume, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-27 16:05+0000\n" -"Last-Translator: yume\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" +"Last-Translator: kytv \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "Нет запущенных торрентов." -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Соединение с I2P закрыто." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Новое значение лимита количества слотов отдачи: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Минимально допустимое значение для количества слотов: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Новое значение лимита скорости отдачи: {0} КБ/с" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Минимально допустимое значение для лимита скорости отдачи: {0} КБ/с" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Задержка запуска изменена на {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Время обновления изменено на {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Обновление отключено" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Размер страницы изменён на {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Директория данных должна быть абсолютным путём" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Директория данных не существует" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Не директория" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Нечитаемо" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Директория данных изменена на {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Изменения настроек I2CP и туннелей вступят в силу после остановки всех торрентов." -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Параметры I2CP изменены на {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Разрываем старое I2CP соединение" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Новые параметры I2CP: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Не удалось соединиться с использованием новых настроек I2CP, возвращаемся к старым настройкам" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Не удалось пересоединиться с использованием старых настроек I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Пересоединились по новому адресу I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP-приёмник перезапущен для \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Новые файлы будут доступны на чтение публично" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Новые файлы не будут доступны на чтение публично" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Автостарт включен" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Автостарт выключен" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Включено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Отключено использование открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT включено." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT выключено." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Изменение DHT требует повторного открытия туннеля" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} тема загружена, вернитесь на основную страницу i2psnark для просмотра." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Настройки не изменились." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Изменен список открытых трекеров. Требуется перезапуск торрента, чтобы изменения вступили в силу." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Список частных трекеров изменился - влияет только на заново созданные торренты." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Не удалось сохранить настройки в {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Устанавливается соединение с I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Ошибка соединения с I2P, проверьте настройки I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Ошибка: Не удалось добавить торрент {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Не удалось открыть \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Торрент с таким info hash уже запущен: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "ОШИБКА - нет I2P-трекеров в частном торренте \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Предупреждение - Нет I2P трекеров в \"{0}\", анонсирование будет выполняться только на открытых трекерах и в DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Предупреждение - Нет I2P трекеров в \"{0}\" и использование открытых трекеров запрещено, анонсирование будет выполняться только в DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -257,34 +257,34 @@ msgid "" "torrent." msgstr "Предупреждение - Нет I2P трекеров в \"{0}\" и использование открытых трекеров и DHT запрещено. Следует разрешить их использование перед запуском торрента." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Торрент в \"{0}\" некорректен" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "ОШИБКА - нехватка памяти, невозможно создать торрент из {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Торрент добавлен и запущен: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Торрент добавлен: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Получение торрента: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -292,132 +292,132 @@ msgid "" "DHT." msgstr "Использование открытых трекеров запрещено и нет DHT-пиров. Передача {0} не может быть завершена. Запустите другой торрент или разрешите использование открытых трекеров и/или DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Добавление {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Закачка уже запущена: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Не удалось скопировать торрент в: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Слишком много файлов в торренте \"{0}\" ({1}), удаляем его!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Торрент \"{0}\" содержит единственный файл заканчивающийся на \".torrent\", удаляем его!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "В торренте \"{0}\" не оказалось ни одной части, удаляем его!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Слишком много частей в \"{0}\" (предел — {1}), удаляем торрент!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Слишком крупные части в \"{0}\" ({1}Б), удаляем торрент." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Наш предел {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Торрент \"{0}\" не содержит данных, удаляем его!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Торренты крупнее чем {0}Б пока не поддерживается, удаляем \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Ошибка: Невозможно удалить торрент {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Торрент остановлен: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Торрент удален: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Добавление торрентов через {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Ограничение отдачи {0} КБ/с" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Закачка завершена: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Метаданные получены для {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Запускаем торрент: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Ошибка в торренте {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Не удалось установить соединение с I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Открытие I2P туннеля" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Соединяемся с I2P и запускаем все торренты." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Останавливаем все торренты и закрываем соединение с I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Закрытие туннеля I2P после уведомления трекеров" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Нет трекеров для {0} — включены ли открытые трекеры или DHT?" @@ -465,14 +465,14 @@ msgstr "Торрент полученный из {0} некорректен" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Настройки" @@ -505,850 +505,860 @@ msgid "clear messages" msgstr "очистить сообщения" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Статус" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Сортировать по {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "скрыть список пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "показать список пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Тип файла" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Осталось" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Примерное оставшееся время" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "Принято" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Получено" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Размер" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "Отдано" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Коэффициент отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Отдано" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "Скорость получения" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Скорость загрузки" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "Скорость отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Скорость отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Остановить все торренты и закрыть соединение с I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Остановить все" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Запустить все остановленные торренты" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Запустить все" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Запустить все торренты и открыть соединение с I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Нет загруженных торрентов." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Всего" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "{0} торрент" msgstr[1] "{0} торрента" msgstr[2] "{0} торрентов" +msgstr[3] "{0} торрентов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "{0} подсоединенный пир" msgstr[1] "{0} подсоединенных пиров" msgstr[2] "{0} подсоединенных пиров" +msgstr[3] "{0} подсоединенных пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "{0} DHT пир" msgstr[1] "{0} DHT пира" msgstr[2] "{0} DHT пиров" +msgstr[3] "{0} DHT пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Первый" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Первая страница" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Предыдущее" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Предыдущая страница" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Следующее" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Следующая страница" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Последний" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Последняя страница" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Не удалось создать директорию для файлов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Не могу добавить торрент {0} в состав другого торрента: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Некорректный URL: должен начинаться с \"http://\", \"{0}\", или \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet удален: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Удален торрент: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Закачка удалена: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Файл удален: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Не удалось удалить файл: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Каталог не может быть удалён: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Каталог удалён: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Не могу добавить окончание торрента в файл \".torrent\": {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Торрент с таким именем уже запущен: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Не могу добавить торрент с I2P директорией: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Не могу добавить торрент {0}, включающий в себя другой торрент: {1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Ошибка - нельза добавить альтернативные трекеры без основного" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Ошибка - невозможно объединить приватный и публичные трекеры в торренте" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Создан торрент для \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, 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:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Ошибка при создании торрента для: \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Невозможно создать торрент для несуществующего файла или директории: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Торрент не создан — вы должны указать файл или директорию" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Удалить выбранное" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Сохранить настройки трекеров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Удален" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Добавить трекер" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Введите действительное название и URL трекера" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Восстановить значения по-умолчанию" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Восстановить трекеры по-умолчанию" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Проверка" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Выделение места" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Ошибка Трекера" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "{0} пир" msgstr[1] "{0} пира" msgstr[2] "{0} пиров" +msgstr[3] "{0} пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Запускается" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Раздается" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Завершен" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "Загружается" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Простаивает" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Нет пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Остановлен" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Подробная информация" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Открыть директорию" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Открыть файл" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Остановить торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Остановить" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Запустить торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Запустить" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Удалить торрент из списка и с диска" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Вы уверены, что хотите удалить файл \\''{0}\\'' (скачанные данные не будут удалены) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Удалить" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Удалить торрент и стереть загруженные файлы" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Вы действительно хотите удалить торрент \\''{0}\\'' и все загруженные файлы?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Стереть" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Неизвестный" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Сид" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Uninteresting (У пира нет нужных нам частей торрента)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Choked (Этот пир не позволяет нам запрашивать части торрента)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Uninterested (У нас нужных этому пиру частей торрента)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Choking (Мы не позволяем этому пиру запрашивать у нас части торрента)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Детали на трекере {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Информация" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Добавить Торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Из URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Введите URL для скачивания torrent-файла (только I2P), magnet-/maggot-ссылку или хэш" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Добавить торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Директория для файлов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Путь для сохранения файлов (по умолчанию {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Либо вы можете просто скопировать .torrent-файлы в директорию {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Удаление .torrent-файла приведёт к остановке торрента." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Создать Торрент" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Файлы для раздачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Файл или директория для раздачи (полный путь или относительно директории {0} )" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Трекеры" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Основной" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Альтернативный" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Создать торрент" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "нет" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Директория для файлов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Файлы доступны для чтения всеми" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Если отмечено, другие пользователи могут иметь доступ к скачанным файлам" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Автоматически стартовать торренты" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Автоматически запускать торренты после добавления" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Тема" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Время обновления интерфейса" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Никогда" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Задержка запуска" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "минут" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Размер страницы" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "торренты" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Ограничение количества слотов отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "пиров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Ограничение скорости отдачи" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Рекомендуется использовать половину от доступной пропускной способности." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Посмотреть/настроить ограничения скорости в маршрутизаторе I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Дополнительно использовать открытые трекеры" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Включить DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Если выбрано, используется DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Входящие туннели" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Исходящие туннели" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Адрес I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Порт I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Параметры I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Сохранить настройки" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Имя" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL сайта" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Стандартный" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Открыть" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Частный" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL анонсирования" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Добавить" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Неправильный magnet URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "{0} хоп" msgstr[1] "{0} хопа" msgstr[2] "{0} хопов" +msgstr[3] "{0} хопов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "{0} туннель" msgstr[1] "{0} туннеля" msgstr[2] "{0} туннелей" +msgstr[3] "{0} туннелей" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Торрент-файл" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Расположение данных" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Инфо хэш" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Первичный трекер" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Список трекеров" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Комментарий" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Создан" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Создан кем" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnet-ссылка" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Частный Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Загружено" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Осталось" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Файлов" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Части" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Размер части" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Директория" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Приоритет" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Перейти в директорию уровнем выше" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent not found?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "File not found in torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "скачано" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "осталось" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Высокий" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Нормальный" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Пропустить" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Всем высокий приоритет" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Всем нормальный приоритет" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Пропустить все" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Сохранить приоритеты" diff --git a/apps/i2psnark/locale/messages_sk.po b/apps/i2psnark/locale/messages_sk.po index 9a7d03bbe..c4780b725 100644 --- a/apps/i2psnark/locale/messages_sk.po +++ b/apps/i2psnark/locale/messages_sk.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n" "MIME-Version: 1.0\n" @@ -19,227 +19,227 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P tunel je zatvorený." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Celkový limit uploaderov bol zmenený na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minimálny celkový limit uploaderov je {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Limit nárastu ŠP bol zmenený na {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minimálny limit nárastu šírky pásma je {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Zdržanie pri spustení bolo zmenené na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Čas refreshu bol zmenený na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Refresh zakázaný" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Veľkosť stránky bola zmenená na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Dátový priečinok musí byť absolútna cesta" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Dátový priečinok neexistuje" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Nie je priečinok" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Nečitateľné" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Dátový priečinok bol zmenený na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "Zmeny I2CP a tunelov sa prejavia po zastavení všetkých torrentov" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP nastavenia boli zmenené na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Odpája sa starý I2CP cieľ" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP nastavenia boli zmenené na {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Nie je možné sa pripojiť pomocou nových nastavení, vracia sa naspäť k starým I2CP nastaveniam" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Nie je možné sa znova pripojiť pomocou starých nastavení!" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Znova sa pripája k novému I2CP cieľu" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP listener bol reštartovaný pre \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nové súbory budú verejne čitateľné" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nové súbory nebudú verejne čitateľné" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Povolené automatické spustenie" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Zakázané automatické spustenie" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Povolené otvorené stopovače - pre prejavenie efektu sa vyžaduje reštart torrentu." -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Zakázané otvorené stopovače - pre prejavenie efektu sa vyžaduje reštart torrentu." -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "Povolené DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "Zakázané DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Zmena DHT vyžaduje vypnutie a znovuotvorenie tunela" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} téma bola načítaná, vráťte sa na hlavnú stránku i2psnark pre zobrazenie." -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Konfigurácia nebola zmenená." -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Zoznam otvorených stopovačov sa zmenil - pre prejavenie efektu sa vyžaduje reštart torrentu." -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Súkromný zoznam stopovačov bol zmenený - to sa bude týkať iba novo vytvorených torrentov." -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Nebolo možné uložiť konfiguráciu do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Pripája sa k I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Chyba pri pripájaní sa k I2P - skontrolujte si vaše I2CP nastavenia!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Chyba: Nebolo možné pridať torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Nie je možné otvoriť \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent s týmto info hashom je už spustený: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "CHYBA - Žiadne I2P stopovače v súkromnom torrente \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, oznámené to bude iba DHT a otvoreným stopovačom I2P." -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, pričom otvorené stopovače sú zakázané, oznámené to bude iba DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -247,34 +247,34 @@ msgid "" "torrent." msgstr "Varovanie - V \"{0}\" nie sú žiadne I2P stopovače, pričom otvorené stopovače aj DHT sú zakázané, mali by ste otvorené stopovače alebo DHT pred spustením torrentu povoliť." -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent v \"{0}\" je neplatný" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "CHYBA - Nedostatok pamäte, nie je možné vytvoriť torrent z {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent bol pridaný a spustený: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent bol pridaný: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Získava sa {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -282,132 +282,132 @@ msgid "" "DHT." msgstr "Otvorené stopovače sú zakázané a my nemáme žiadnych DHT peerov. Získanie {0} nemusí uspieť, pokiaľ nespustíte ďalší torrent, prípadne nepovolíte otvorené stopovače alebo DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Pridáva sa {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Sťahovanie je už spustené: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Nepodarilo sa skopírovať súbor torrentu do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Príliš veľa súborov v \"{0}\" ({1}), odstraňuje sa!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Súbor torrentu \"{0}\" nemôže končiť na \".torrent\", odstraňuje sa!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "V \"{0}\" nie sú žiadne kúsky, odstraňuje sa!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "V \"{0}\" je príliš veľa kúskov, limit je {1}, odstraňuje sa!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Kúsky v \"{0}\" ({1}B) sú príliš veľké, odstraňuje sa." -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Limit je {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" neobsahuje žiadne dáta, odstraňuje sa!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrenty väčšie než {0}B zatiaľ nie sú podporované, odstraňuje sa \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Chyba: Nebolo možné odstrániť torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent bol zastavený: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent bol odstránený: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Pridávajú sa torrenty do {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Limit nárastu šírky pásma je {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Sťahovanie bolo dokončené: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainformácie pre {0} boli doručené" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Spúšťa sa torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Chyba na torrente {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Nie je možné sa pripojiť k I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Otvára sa I2P tunel" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Otvára sa I2P tunel a spúšťajú sa všetky torrenty." -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Zastavujú sa všetky torrenty a zatvára sa I2P tunel." -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Po upozornení stopovačov sa zatvára I2P tunel." -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Nie sú žiadne platné stopovače pre {0} - povoliť otvorené stopovače alebo DHT?" @@ -455,14 +455,14 @@ msgstr "Torrent na {0} nebol platný." #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Konfigurácia" @@ -495,135 +495,135 @@ msgid "clear messages" msgstr "zmazať správy" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Stav" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Skryť peerov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Zobraziť peerov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "ETA" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Odhadovaný zostávajúci čas" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Stiahnuté" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Veľkosť" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Uploadnuté" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "RX sadzba" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Dolná sadzba" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "TX sadzba" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Horná sadzba" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Zastaviť všetky torrenty a I2P tunel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Zastaviť všetko" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Spustiť všetky zastavené torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Spustiť všetko" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Spustiť všetky torrenty a I2P tunel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Neboli načítané žiadne torrenty." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Súhrny" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" @@ -631,7 +631,7 @@ msgstr[0] "1 torrent" msgstr[1] "{0} torrenty" msgstr[2] "{0} torrentov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" @@ -639,7 +639,7 @@ msgstr[0] "1 pripojený peer" msgstr[1] "{0} pripojení peerovia" msgstr[2] "{0} pripojených peerov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" @@ -647,203 +647,207 @@ msgstr[0] "1 DHT peer" msgstr[1] "{0} DHT peerovia" msgstr[2] "{0} DHT peerov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Prvé" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Prvá stránka" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Predchádzajúce" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Predchádzajúca stránka" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Nasledujúce" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Nasledujúca stránka" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Posledné" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Posledná stránka" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Neplatná URL: Musí začínať na \"http://\", \"{0}\" alebo \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet bol odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Súbor torrentu bol odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Sťahovanie odstránené: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Dátový súbor bol odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Dátový súbor nemohol byť odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Priečinok nemohol byť odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Priečinok bol odstránený: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Chyba - Nie je možné zahrnúť alternatívne stopovače bez toho primárneho" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Chyba - Nie je možné zmiešať v torrente súkromné aj verejné stopovače" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Pre \"{0}\" bol vytvorený torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Mnoho I2P stopovačov od vás vyžaduje registrovať pred seedovaním nové torrenty - prosím urobte tak pred spustením \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Chyba pri vytváraní torrentu pre \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Nie je možné vytvoriť torrent pre neexistujúce dáta: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Chyba pri vytváraní torrentu - musíte zadať súbor alebo priečinok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Zvolená možnosť odstrániť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Uložiť konfiguráciu stopovača" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Odstránené" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Pridať stopovač" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Zadajte platný názov a URL stopovača" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Obnoviť predvolené nastavenia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Obnoviť predvolené stopovače" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Kontroluje sa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Alokuje sa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Chyba stopovača" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" @@ -851,366 +855,366 @@ msgstr[0] "1 peer" msgstr[1] "{0} peerovia" msgstr[2] "{0} peerov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Spúšťa sa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Seeduje sa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Dokončené" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Zablokované" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Žiadni peerovia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Zastavené" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Detaily torrentu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Zobraziť súbory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Otvoriť súbor" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Zastaviť torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Zastaviť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Spustiť torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Spustiť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Odstrániť torrent zo zoznamu aktívnych zmazaním .torrent súboru." #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Ste si istý, že chcete odstrániť súbor \\\"{0}\\\"\n(stiahnuté dáta nebudú odstránené) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Odstrániť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Odstrániť .torrent súbor a aj príslušný dátový súbor(y)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Ste si istý, že chcete odstrániť torrent \\\"{0}\\\" a s ním aj všetky stiahnuté dáta?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Zmazať" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Neznáme" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Nezaujímavý (Peer nemá žiadne kúsky, ktoré potrebujeme)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Zapchaný (Peer nám neumožňuje žiadať o kúsky)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Nezaujímajúci sa (Nemáme žiadne kúsky, ktoré peer potrebuje)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Zapchaný (Neumožňujeme peerovi žiadať o kúsky)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detaily sú v {0} stopovači" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Informácie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Pridať torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Z URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Zadajte URL (iba I2P) pre stiahnutie torrentu, magnetový alebo maggotový link, prípadne info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Pridať torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Môžete tiež skopírovať .torrent súbory do: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Odstránenie .torrent spôsobí jeho zastavenie." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Vytvoriť torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Dáta na seedovanie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Stopovače" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primárne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternatívne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Vytvoriť torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "žiadne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Dátový priečinok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Súbory čitateľné všetkými" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Ak je zaškrtnuté, ostatní užívatelia budú môcť pristupovať k stiahnutým súborom" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Ak je zaškrtnuté, automaticky sa spustia pridané torrenty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Téma" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Čas refreshu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Nikdy" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Zdržanie pri spustení" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minúty" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Veľkosť stránky" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrentov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Celkový limit uploaderov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "peerovia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Limit nárastu šírky pásma" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Odporúča sa polovica dostupnej šírky pásma." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Zobraziť alebo zmeniť šírku pásma routra" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Použiť aj otvorené stopovače" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Ak je zaškrtnuté, otvorené stopovače tak isto ako aj stopovače vypísané v súbore torrentu sa oboznámia so všetkými torrentmi" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Povoliť DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Ak je zaškrtnuté, použije sa DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Nastavenia prichádzajúcich dát" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Nastavenia odchádzajúcich dát" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP host" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP port" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP nastavenia" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Uložiť konfiguráciu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Názov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL webovej stránky" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Otvoriť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Súkromné" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Oznámiť URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Pridať" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Neplatná magnetová URL {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" @@ -1218,7 +1222,7 @@ msgstr[0] "1 hop" msgstr[1] "{0} hopy" msgstr[2] "{0} hopov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" @@ -1226,119 +1230,119 @@ msgstr[0] "1 tunel" msgstr[1] "{0} tunely" msgstr[2] "{0} tunelov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Súbor torrentu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Primárny stopovač" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Zoznam stopovačov" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Komentár" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Vytvorené" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Vytvorené užívateľom" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnetový link" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Súkromný torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Dokončenie" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Zostávajúce" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Súbory" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Kúsky" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Veľkosť kúsku" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Priečinok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Priorita" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Hore do priečinka vyššej úrovne" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent nenájdený?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Súbor nenájdený v torrente?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "dokončiť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "zostávajúcich" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Vysoká" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normálna" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Preskočiť" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Uložiť priority" diff --git a/apps/i2psnark/locale/messages_sv.po b/apps/i2psnark/locale/messages_sv.po index be594d134..7f653edea 100644 --- a/apps/i2psnark/locale/messages_sv.po +++ b/apps/i2psnark/locale/messages_sv.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-04-09 17:46+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-19 09:58+0000\n" "Last-Translator: cacapo \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" @@ -33,222 +33,222 @@ msgid "No more torrents running." msgstr "Inga mer torrents kör." #: ../java/src/org/klomp/snark/IdleChecker.java:76 -#: ../java/src/org/klomp/snark/SnarkManager.java:2376 -#: ../java/src/org/klomp/snark/SnarkManager.java:2387 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P-tunneln är stängd." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:2080 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:771 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Gräns för totalt antal uppladdare är bytt till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:773 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Minsta tillåtna gräns för uppladdare är {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:785 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Uppladdningsbandbredd bytt till {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:787 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Minsta uppladdningsbandbredd bytt till {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:799 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Fördröjning vid uppstart bytt till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:810 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Uppdateringstiden ändrad till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:812 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Uppdatering inaktiverad" -#: ../java/src/org/klomp/snark/SnarkManager.java:828 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Torrentar per sida ändrat till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:837 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Datamappen måste vara en absolut sökväg" -#: ../java/src/org/klomp/snark/SnarkManager.java:839 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Datamappen finns ej" -#: ../java/src/org/klomp/snark/SnarkManager.java:841 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Inte en mapp" -#: ../java/src/org/klomp/snark/SnarkManager.java:843 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "Oläsbar" -#: ../java/src/org/klomp/snark/SnarkManager.java:848 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Datamappen ändrad till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:903 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I2CP- och tunnelförändringar kommer träda i kraft efter alla torrentar stoppats" -#: ../java/src/org/klomp/snark/SnarkManager.java:907 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Alternativ för I2CP ändrade till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:913 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Kopplar ifrån gammal I2CP destination" -#: ../java/src/org/klomp/snark/SnarkManager.java:915 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Inställningar för I2CP ändrade till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:920 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Misslyckades med anslutningsförsök med nya inställningar, återställer de gamla I2CP inställningarna" -#: ../java/src/org/klomp/snark/SnarkManager.java:924 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Misslyckades med anslutningsförsök med gamla inställningar!" -#: ../java/src/org/klomp/snark/SnarkManager.java:926 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Återanslöt mot den nya I2CP destinationen" -#: ../java/src/org/klomp/snark/SnarkManager.java:933 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP-lyssnare omstartad för \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:947 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Nya filer kommer vara publikt läsbara" -#: ../java/src/org/klomp/snark/SnarkManager.java:949 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Nya filer kommer inte vara publikt läsbara" -#: ../java/src/org/klomp/snark/SnarkManager.java:956 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Aktiverade automatisk start" -#: ../java/src/org/klomp/snark/SnarkManager.java:958 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Inaktiverade automatisk start" -#: ../java/src/org/klomp/snark/SnarkManager.java:964 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Aktiverade publika trackers - torrenten måste startas om för att inställningen ska träda i kraft" -#: ../java/src/org/klomp/snark/SnarkManager.java:966 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Inaktiverade publika trackers - torrenten måste startas om för att inställningen ska träda i kraft" -#: ../java/src/org/klomp/snark/SnarkManager.java:973 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "Aktivera DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:975 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "Inaktiverade DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:977 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Förändring i DHT kräver att tunneln stängs och öppnas igen " -#: ../java/src/org/klomp/snark/SnarkManager.java:984 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} tema laddat, återgå till huvudvyn för i2psnark." -#: ../java/src/org/klomp/snark/SnarkManager.java:994 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Inställningar oförändrade." -#: ../java/src/org/klomp/snark/SnarkManager.java:1026 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Listan över publika trackers förändrad - torrenten måste startas om för att inställningen ska träda i kraft" -#: ../java/src/org/klomp/snark/SnarkManager.java:1036 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Privat trackerlista ändrad - påverkar bara nyligen skapade torrents" -#: ../java/src/org/klomp/snark/SnarkManager.java:1082 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Misslyckades med att spara inställningar till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1163 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Ansluter till I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1166 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Problem vid anslutning till I2P - kontrollera dina inställningar för I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1175 -#: ../java/src/org/klomp/snark/SnarkManager.java:2117 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Problem: Kunde inte lägga till torrent {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1198 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Kan inte öppna \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1217 -#: ../java/src/org/klomp/snark/SnarkManager.java:1342 -#: ../java/src/org/klomp/snark/SnarkManager.java:1430 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent med denna infohash körs redan: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1223 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "FEL - Inga I2P trackers i den privata torrenten \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1225 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Varning - Ingen I2P tracker i \"{0}\", kommer enbart att annonsera till publika I2P trackers och DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1228 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Varning - Ingen I2P tracker i \"{0}\" och publika trackers är inaktiverade, kommer enbart att annonsera till DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1230 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -256,34 +256,34 @@ msgid "" "torrent." msgstr "Varning - Ingen I2P tracker i \"{0}\" och både DHT och publika trackers är inaktiverade, du bör aktivera publika trackers eller DHT innan du startar torrenten. " -#: ../java/src/org/klomp/snark/SnarkManager.java:1256 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent i \"{0}\" är ogiltig" -#: ../java/src/org/klomp/snark/SnarkManager.java:1263 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "FEL - Minnet har tagit slut, kan inte skapa torrent från {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1275 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent tillagd och startad: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1277 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent tillagd: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1353 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Hämtar {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1359 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -291,128 +291,128 @@ msgid "" "DHT." msgstr "Publika trackers är inaktiverade och vi har inga DHT klienter. Hämtningen av {0} kan kanske inte genomföras innan du startar en annan torrent eller aktiverar publika trackers eller DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1363 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Lägger till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1396 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Hämtar redan: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1440 -#: ../java/src/org/klomp/snark/SnarkManager.java:1466 -#: ../java/src/org/klomp/snark/SnarkManager.java:2036 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "Misslyckades att kopiera torrentfil till {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1815 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "För många filer i \"{0}\" ({1}), tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1817 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrenten \"{0}\" får inte sluta med \".torrent\", tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1819 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Inga delar i \"{0}\", tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1821 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "För många delar i \"{0}\", gränsen är {1}, tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1823 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "För stora delar i \"{0}\" ({1}B), tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Gränsen är {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1826 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrenten \"{0}\" har ingen data, tar bort den!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1834 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrentar större än {0}B stöds inte än, tar bort \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1851 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Fel: Kunde ej ta bort torrenten {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1874 -#: ../java/src/org/klomp/snark/SnarkManager.java:1893 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent stannad: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1913 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent borttagen: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1921 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Lägger till torrentar i {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1953 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Upp bandbredds gräns är {0} KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1979 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Hämtning klar: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2032 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo mottagen för {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2033 -#: ../java/src/org/klomp/snark/SnarkManager.java:2264 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Startar torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2048 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Fel på torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:2111 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Misslyckades med att ansluta till I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:2263 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Öppnar I2P tunneln" -#: ../java/src/org/klomp/snark/SnarkManager.java:2287 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Öppnar I2P-tunneln och startar torrentar." -#: ../java/src/org/klomp/snark/SnarkManager.java:2350 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Stoppar alla torrentar och stänger I2P-tunneln." -#: ../java/src/org/klomp/snark/SnarkManager.java:2369 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Stänger I2P tunnel efter att ha meddelat trackers." @@ -464,14 +464,14 @@ msgstr "Torrent vid {0} var inte giltig" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1751 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2650 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2137 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Inställningar" @@ -504,844 +504,848 @@ msgid "clear messages" msgstr "rensa meddelandena" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Status" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "Sortera efter{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Dölj klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Visa klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2636 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "Filtyp" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "Förväntas klar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Uppskattad återstående tid" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Hämtade" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2806 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Storlek" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "TX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2824 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "Upload ratio" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Uppladdat" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "RX Rate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Nerhastighet" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "TX Rate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "Upphastighet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Stoppa alla torrents och I2P-tunneln" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Stoppa alla" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Starta alla stannade torrentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Starta alla" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Starta alla torrents och I2P-tunneln" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Inga torrents laddade." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totalt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "1 torrent" msgstr[1] "{0} torrentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "1 ansluten klient" msgstr[1] "{0} anslutna klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "1 DHT klient" msgstr[1] "{0} DHT klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "Destination" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Första" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "Första sidan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Bakåt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Föregående sida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Nästa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Nästa sida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Sista" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Sista sidan" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "Data directory kan inte skapas" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1164 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "Kan inte lägga till torrent{0} inuti annan torrent:{1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "Ogiltig adress: Måste inledas med \"http://\", \"{0}\" eller \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet borttagen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Torrentfil borttagen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Hämtning borttagen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1058 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Datafil borttagen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1060 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1069 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Datafil kunde inte tas bort: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Katalogen kunde inta tas bort: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1092 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Katalogen bort tagen: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1143 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "Kan inte lägga till en torrent som slutar på \".torrent\":{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "Torrent med detta namn kör redan: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1154 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "Kan inte lägga till en torrent som inkluderar en I2P directory:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1169 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "Kan inte lägga till en torrent{0} som inkluderar en annan torrent{1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Fel - Kan inte inkludera alternativa trackers utan en primär tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1208 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Fel - Kan inte blanda privata och publika trackers i samma torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1230 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent skapad för \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Många I2P trackers kräver att du registrerar nya torrentar innan uppladdningen påbörjas - gör det innan \"{0}\" startas" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Misslyckades med att skapa torrent för \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1238 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Kan ej skapa torrent för data som ej finns: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Misslyckades med att skapa torrent - en fil eller mapp måste anges" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Ta bort valda" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1272 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Spara tracker konfiguration" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1289 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Borttagen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1321 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2395 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Lägg till tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1344 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1347 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Ange giltigt namn och adresser för trackern " #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1349 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2398 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Återställ standardvärden" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1352 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Återställ standard trackers " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Kontrollerar " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1464 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Allokerar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1478 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1487 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Trackerfel" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1480 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1526 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1531 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1537 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1542 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "1 klient" msgstr[1] "{0} klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Startar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Uppladdning" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1518 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2819 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Färdig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1523 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "Ok" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Avstannad" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Inga klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Stoppad" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1581 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Torrentdetaljer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Se filer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1618 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Öppna fil" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1670 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Stoppa torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1672 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Stoppa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Starta torrenten" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Starta" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1700 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Ta bort torrenten från den aktiva listan, tar bort .torrent filen" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1705 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Är du säker på att du vill radera filen \\''{0}\\' (hämtad data kommer ej raderas) ?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1709 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Ta bort" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Ta bort .torrent filen och tillhörande datafil(er)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1727 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Är du säker på att du vill ta bort torrenten \"{0}\" och all hämtad data?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1731 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Ta bort" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1767 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Okänd" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Källa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1802 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Ointressant (klienten har inga delar vi behöver)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1804 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Strypt (klienten låter oss inte be om delar)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1824 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Ointresserad (vi har inga delar klienten behöver)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1826 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "Stryper (vi låter inte klienten be om delar)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1942 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detaljer för {0} tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1959 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2032 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Lägg till torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Adress" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2038 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Ange torrentfilens adress (enbart I2P), magnet-länk, maggot-länk eller infohash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Lägg till torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "Data dir" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "Ange katalogen att spara datan i (förval {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2054 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "Du kan även kopiera .torrent filer till: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2056 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Borttagning av .torrent fil kommer stanna den." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2069 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Skapa torrent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Data att ladda upp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2076 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "Fil eller katalog att seeda (fullständig sökväg eller inom katalog {0})" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2079 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2325 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primär" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2083 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2086 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Skapa torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2104 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "inga" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2141 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Datamapp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2146 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Filer läsbara för alla" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2150 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Välj detta för att ge andra användare tillgång till hämtade filer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2154 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "Starta torrents automatiskt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Välj detta för att automatiskt starta tillagda torrentfiler" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Tema" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2176 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Uppdateringsintervall" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2189 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Aldrig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "Fördröjning av uppstart" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2197 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minuter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Per sida" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2203 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "torrentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2227 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Gräns för totalt antal uppladdare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2230 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "klienter" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2234 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Gräns för bandbredd uppåt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Hälften av tillgänglig bandbredd rekommenderas." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Se eller ändra routerns bandbredd" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2243 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Använd också publika trackers" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2247 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Välj detta för att annonsera torrentar till publika trackers såväl som de listade i torrentfilen" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Aktivera DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Välj detta för att använda DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2271 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Inställningar för inkommande" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2277 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Inställningar för utgående" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2285 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP-värd" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2290 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP-port" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2305 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Alternativ för I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2310 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Spara inställningar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Namn" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "Webbplatsadress" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "Standard" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Publik" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2340 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "Annonseringsadress" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2384 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Lägg till" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2427 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "Ogiltig magnet-adress {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2435 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "1 hopp" msgstr[1] "{0} hopp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "1 tunnel" msgstr[1] "{0} tunnlar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2679 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrentfil" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "Plats för data" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2696 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "Info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2715 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Primär tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2724 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Trackerlista" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2749 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Kommentar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2759 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Skapad" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2770 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Skapad av" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnet länk" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2795 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Privat torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2815 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Färdigställning" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2844 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Kvar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Filer" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2861 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Delar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2867 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Delstorlek" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2921 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Mapp" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioritet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Upp till högre mappnivå" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent hittades ej?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3032 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Fil hittades ej i torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3045 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "färdig" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "kvar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3092 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Hög" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3097 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3102 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Hoppa över" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "Sätt alla höga" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "Sätt alla normala" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3116 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "Hoppa över alla" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3117 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Spara prioriteter" diff --git a/apps/i2psnark/locale/messages_vi.po b/apps/i2psnark/locale/messages_vi.po index 261b49889..cad895268 100644 --- a/apps/i2psnark/locale/messages_vi.po +++ b/apps/i2psnark/locale/messages_vi.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-19 21:48+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 01:32+0000\n" "Last-Translator: kytv \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n" "MIME-Version: 1.0\n" @@ -19,227 +19,227 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Đường hầm I2P đóng lại." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Giới hạn băng thông lên đổi thành {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Tối thiểu băng thông lên là {0}KBps" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Nối kết vào I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -247,34 +247,34 @@ msgid "" "torrent." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -282,132 +282,132 @@ msgid "" "DHT." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "" @@ -455,14 +455,14 @@ msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "Cấu hình" @@ -495,838 +495,842 @@ msgid "clear messages" msgstr "" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Tình trạng" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "Đã tải xuống" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "Kích thước" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Đã tải lên" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Tổng cộng" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, 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:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Hoàn tất" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Khựng" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Ngưng" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Xem tập tin" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Mở tập tin" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Ngưng" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Bắt đầu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Bỏ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Xóa" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Không rõ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Thông tin" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "phút" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "Giới hạn băng thông lên" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Lưu cấu hình" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Mở" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Tập tin" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Mảnh" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Kích thước mảnh" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Danh mục" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Ưu tiên" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "hoàn tất" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Cao" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Thường" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Lờ" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "" diff --git a/apps/i2psnark/locale/messages_zh.po b/apps/i2psnark/locale/messages_zh.po index 2a812a8d2..5017281a9 100644 --- a/apps/i2psnark/locale/messages_zh.po +++ b/apps/i2psnark/locale/messages_zh.po @@ -8,13 +8,13 @@ # foo , 2009 # walking , 2013 # wwj402 , 2013 -# YF , 2014 +# YF , 2014-2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-19 21:48+0000\n" -"PO-Revision-Date: 2014-11-20 07:17+0000\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-17 03:01+0000\n" "Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -23,227 +23,227 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 msgid "No more torrents running." msgstr "没有更多种子正在运行。" -#: ../java/src/org/klomp/snark/IdleChecker.java:70 -#: ../java/src/org/klomp/snark/SnarkManager.java:2283 -#: ../java/src/org/klomp/snark/SnarkManager.java:2294 +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "I2P隧道已关闭" #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1987 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:749 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "总上传种子数限制已更新为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:751 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "最低上传种子数限制为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:763 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" -msgstr "上传带宽限制改为 {0} KBps" +msgstr "上传带宽限制改为 {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:765 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" -msgstr "最小上传带宽限制为 {0} KBps" +msgstr "最小上传带宽限制为 {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:777 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "下载前的延迟已更新为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:788 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "刷新时间更新为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:790 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "刷新已禁用" -#: ../java/src/org/klomp/snark/SnarkManager.java:806 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "页面容量更新为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:815 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "数据存放目录必须是绝对路径" -#: ../java/src/org/klomp/snark/SnarkManager.java:817 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "数据存放目录不存在" -#: ../java/src/org/klomp/snark/SnarkManager.java:819 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "不是文件夹" -#: ../java/src/org/klomp/snark/SnarkManager.java:821 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "不可读" -#: ../java/src/org/klomp/snark/SnarkManager.java:826 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "数据存放目录更新至{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:881 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I2CP与隧道设置的变化在所有种子停止后才能生效" -#: ../java/src/org/klomp/snark/SnarkManager.java:885 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "I2CP 选项改为 {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:891 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "正在断开旧的I2CP目标" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "I2CP设置改为{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:898 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "无法通过新设置连接，恢复I2CP的旧设置" -#: ../java/src/org/klomp/snark/SnarkManager.java:902 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "旧设置也无法连接！" -#: ../java/src/org/klomp/snark/SnarkManager.java:904 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "重新连接新I2CP目标" -#: ../java/src/org/klomp/snark/SnarkManager.java:911 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "\"{0}\"的I2CP监听端口已启动" -#: ../java/src/org/klomp/snark/SnarkManager.java:925 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "新文件将对公共可读" -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "新文件不会对公共可读" -#: ../java/src/org/klomp/snark/SnarkManager.java:934 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "启用自动启动" -#: ../java/src/org/klomp/snark/SnarkManager.java:936 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "禁用自动启动" -#: ../java/src/org/klomp/snark/SnarkManager.java:942 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "启用OpenTracker-重新启动种子后生效" -#: ../java/src/org/klomp/snark/SnarkManager.java:944 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "禁用OpenTracker - 重新启动种子后生效" -#: ../java/src/org/klomp/snark/SnarkManager.java:951 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT 已启用" -#: ../java/src/org/klomp/snark/SnarkManager.java:953 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT 已禁用" -#: ../java/src/org/klomp/snark/SnarkManager.java:955 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "DHT 修改生效需要关闭或重启。" -#: ../java/src/org/klomp/snark/SnarkManager.java:962 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} 主题已加载，浏览效果请到 i2psnark 主页。" -#: ../java/src/org/klomp/snark/SnarkManager.java:972 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "设置未改变" -#: ../java/src/org/klomp/snark/SnarkManager.java:1004 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "OpenTracker列表已改变 - 重新启动种子后生效" -#: ../java/src/org/klomp/snark/SnarkManager.java:1014 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "PT 列表已更改 － 仅对新创建的种子有效" -#: ../java/src/org/klomp/snark/SnarkManager.java:1060 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "无法保存设置到{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1141 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "正在连接到I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1144 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "连接I2P时发生错误 - 请检查I2CP设置!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1153 -#: ../java/src/org/klomp/snark/SnarkManager.java:2024 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "错误：无法添加种子{0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "无法打开 \"{0}\"" #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:1195 -#: ../java/src/org/klomp/snark/SnarkManager.java:1320 -#: ../java/src/org/klomp/snark/SnarkManager.java:1407 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "具有相同Hash链接的种子已在下载中:{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1201 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "错误 - 私有种子\"{0}\"中缺少 I2P Tracker" -#: ../java/src/org/klomp/snark/SnarkManager.java:1203 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "警告 - \"{0}\"中缺少 I2P Tracker，程序将仅通过 I2P 中的开放式 Tracker 和 DHT 下载。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1206 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "警告 - \"{0}\"中缺少 I2P Tracker，已禁用 I2P Open Tracker，程序将仅通过 DHT 下载。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1208 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -251,34 +251,34 @@ msgid "" "torrent." msgstr "警告 - \"{0}\"中缺少 I2P Tracker，已禁用 I2P Open Tracker 和 DHT，下载先您需要先启用 OpenTracker 或 DHT 。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1234 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "无效种子 \"{0}\" " -#: ../java/src/org/klomp/snark/SnarkManager.java:1241 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "错误: 内存不足，无法为 {0} 创建种子。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1253 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "已添加并启动种子:\"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1255 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "已添加种子:\"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1331 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "正在获取{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1337 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -286,132 +286,132 @@ msgid "" "DHT." msgstr "OpenTracker被禁用，程序目前没有DHT节点。{0}的下载不会成功，直到您启动另一个种子的下载、重新启用OpenTracker或DHT。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1341 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "正在添加{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1373 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "已经在下载中:{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1417 -#: ../java/src/org/klomp/snark/SnarkManager.java:1443 -#: ../java/src/org/klomp/snark/SnarkManager.java:1943 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr "无法复制种子文件到{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1729 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "\"{0}\" ({1}) 含有太多文件，删除之!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1731 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "种子文件 \"{0}\" 不以 \".torrent\"结尾，正在删除！" -#: ../java/src/org/klomp/snark/SnarkManager.java:1733 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "\"{0}\" 中没有数据片，删除之!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1735 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "\"{0}\" 中文件分片太多，限额为{1}，删除之！" -#: ../java/src/org/klomp/snark/SnarkManager.java:1737 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "\"{0}\" ({1}B) 中文件分片过大，删除之。" -#: ../java/src/org/klomp/snark/SnarkManager.java:1738 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "限额为 {0}B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1740 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "种子\"{0}\"中无数据，正在删除!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1748 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, 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:1764 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "错误:无法删除种子{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1785 -#: ../java/src/org/klomp/snark/SnarkManager.java:1803 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "种子已停止:\"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1824 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "种子已删除:\"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1832 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "{0} 分钟内完成添加" -#: ../java/src/org/klomp/snark/SnarkManager.java:1863 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" -msgstr "最小上传带宽限制为 {0} KBps" +msgstr "上传带宽限制为 {0} KB/s" -#: ../java/src/org/klomp/snark/SnarkManager.java:1886 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "下载已完成: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1939 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "已获得 {0} 的 Metainfo" -#: ../java/src/org/klomp/snark/SnarkManager.java:1940 -#: ../java/src/org/klomp/snark/SnarkManager.java:2171 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "正在启动种子{0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1955 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "种子 {0} 发生错误" -#: ../java/src/org/klomp/snark/SnarkManager.java:2018 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "无法连接至I2P!" -#: ../java/src/org/klomp/snark/SnarkManager.java:2170 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 #: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "正在建立 I2P 隧道" -#: ../java/src/org/klomp/snark/SnarkManager.java:2194 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "正在打开I2P隧道并启动所有种子" -#: ../java/src/org/klomp/snark/SnarkManager.java:2257 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "正在停用所有种子并关闭I2P隧道。" -#: ../java/src/org/klomp/snark/SnarkManager.java:2276 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "正在关闭 I2P 隧道，已通知 Tracker。" -#: ../java/src/org/klomp/snark/TrackerClient.java:240 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "{0} 中 Tracker 无效 - 要启用 opentrackers 或 DHT 吗？" @@ -459,14 +459,14 @@ msgstr "{0}的种子中有错误" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1750 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2136 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 msgid "Configuration" msgstr "设置" @@ -499,838 +499,842 @@ msgid "clear messages" msgstr "清除消息" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2966 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "状态" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2956 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 #, java-format msgid "Sort by {0}" msgstr "排序按 {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:461 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "隐藏用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:467 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "显示用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:490 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2634 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:492 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "File type" msgstr "文件类型" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:508 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 msgid "ETA" msgstr "预计剩余时间" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:510 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "预计剩余时间" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "已接收" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 msgid "Downloaded" msgstr "已下载" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2804 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2954 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 msgid "Size" msgstr "大小" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:565 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 msgid "TX" msgstr "已发送" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2822 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 msgid "Upload ratio" msgstr "上传率" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:567 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "已上传" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 msgid "RX Rate" msgstr "接收速度" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:582 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "下载速度" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:595 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "发送速度" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:597 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 msgid "Up Rate" msgstr "上传速度" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:614 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "停止全部种子及I2P隧道" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "停止全部" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:628 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "启动所有已停止的种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:630 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:644 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "启动全部" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:642 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "启动全部种子及I2P隧道" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "未载入任何种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:673 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "总计" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:675 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" msgstr[0] "{0}个种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:680 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" msgstr[0] "{0}个已连接用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:687 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" msgstr[0] "{0}个DHT节点" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "目标" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "首页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:811 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "第一页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "前页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "上一页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "下页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:854 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "下一页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "末页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:862 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "最后一页" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:948 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 msgid "Data directory cannot be created" msgstr "无法创建数据目录" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:958 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1163 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 #, java-format msgid "Cannot add torrent {0} inside another torrent: {1}" msgstr "无法添加内含另一个种子的种子 {0}：{1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:973 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "无效链接 - 链接必须以“http://”，“{0}”或“{1}”开头" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1014 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet 已删除:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1022 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "种子文件已删除:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1041 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "下载已删除: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "数据文件已删除:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1057 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1068 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "无法删除数据文件:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1084 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "无法删除目录:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "目录已经删除: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1142 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 #, java-format msgid "Cannot add a torrent ending in \".torrent\": {0}" msgstr "无法添加一个以 \".torrent\" 结尾的种子： {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1147 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 #, java-format msgid "Torrent with this name is already running: {0}" msgstr "此名称的种子已在运行：{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1153 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 #, java-format msgid "Cannot add a torrent including an I2P directory: {0}" msgstr "无法添加包含一个 I2P 目录的种子：{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1168 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 #, java-format msgid "Cannot add torrent {0} including another torrent: {1}" msgstr "无法添加包含另一个种子的种子 {0}：{1}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1194 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "错误 - 缺少主Tracker则无法添加替换Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "错误 - PT和公共Tracker无法在同一种子中混用。" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1229 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "种子创建成功\"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1231 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, 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:1233 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "创建种子时发生错误 \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "无法为不存在的数据文件创建种子:{0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "创建种子时发生错误 - 必须指定文件或文件夹" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2392 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "删除选中项目" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "保存 Tracker 设置" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "已删除" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1320 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2391 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2393 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "添加 Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1343 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1346 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "请输入有效的 Tracker 名称与链接" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1348 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "恢复默认值" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1351 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "恢复默认 Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "正在检查" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1462 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1463 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "正在分配空间" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1477 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Tracker错误" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1479 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1509 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1525 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1536 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" msgstr[0] "{0}个用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1489 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "正在启动" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1498 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "正做种" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1516 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2817 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3033 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "完成" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1521 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1528 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" -msgstr "确定" +msgstr "正常" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1532 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1533 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "等待" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1544 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1547 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1548 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "没有用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1550 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "已停用" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1580 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "种子详情" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1615 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "浏览文件" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1617 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "打开文件" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1669 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "停止种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1671 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "停止" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "启动种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "启动" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "取消下载任务并删除对应种子文件。" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1704 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "你确定你要删除文件 \\“{0} \\” (下载的数据不会被删除)？" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1708 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "移除" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "删除种子及所下载的文件" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1726 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "您确定要删除种子“{0}”(下载的数据文件会一并被删除)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1730 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "删除" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1766 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "未知" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1778 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "无需要部分" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1803 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "拒绝请求" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "无需要部分" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1825 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "拒绝请求" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1941 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Tracker {0} 上的详细信息" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1958 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "信息" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "添加种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "从URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2037 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "输入种子文件的下载链接(仅支持I2P内网链接)，magnet, maggot 链接或信息散列值" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2042 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "添加种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 msgid "Data dir" msgstr "数据目录" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2049 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 #, java-format msgid "Enter the directory to save the data in (default {0})" msgstr "请输入保存数据的目录（默认 {0}）" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2053 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "您也可以将.torrent文件复制到: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 -msgid "Removing a .torrent will cause it to stop." -msgstr "删除种子文件将导致该下载任务中止。" - #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 +msgid "Removing a .torrent will cause it to stop." +msgstr "移除一个种子文件 (.torrent) 将导致它中止。" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "创建种子" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "做种数据" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2075 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 #, java-format msgid "File or directory to seed (full path or within the directory {0} )" msgstr "要做种的文件或目录（完整路径或包含在 {0} 目录中）" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2078 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2323 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2080 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "主 Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2082 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "备选 Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2085 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "创建种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2103 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "无" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2140 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "数据文件夹" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2144 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "文件对所有人可读" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2148 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "选中后，其他用户可以访问您下载的文件。" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2152 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 msgid "Auto start torrents" msgstr "自动开始种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2156 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "选中后Snark将自动启动已添加的所有种子。" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2160 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "主题" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "刷新时间" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2187 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "从不" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2193 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "启动延迟" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2195 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "分" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2199 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "页面容量" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2225 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "限制总上传种子数为" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2228 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "用户" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2232 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "上传带宽限制" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2235 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "推荐设置为可用带宽的一半。" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2237 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "浏览或修改路由器带宽" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2241 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "同时使用OpenTracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2245 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 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:2249 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "启用 DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2253 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "如果选中，则使用 DHT。" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "入站设置" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2275 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "出站设置" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "I2CP主机" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2288 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "I2CP端口" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2303 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "I2CP选项" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2308 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "保存设置" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2328 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2939 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "名称" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2330 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "网站 URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2332 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 msgid "Standard" msgstr "标准" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2334 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3066 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "打开" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2336 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "私有" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "发布 URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "添加" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "磁性链接 {0} 无效" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2433 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" msgstr[0] "{0}跳" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" msgstr[0] "{0}隧道" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2677 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Torrent文件" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2685 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 msgid "Data location" msgstr "数据位置" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 msgid "Info hash" msgstr "信息哈希" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2713 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "主 Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Tracker 列表" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2747 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "评论" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2757 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "已创建" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2768 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "创建者" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2780 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Magnet磁性链接" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "私有种子" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "完成" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2842 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "剩余" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2852 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "文件" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2859 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "分块数量" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2865 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "分块大小" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2919 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "文件夹" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2978 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "优先级" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2990 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "上一层文件夹" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3024 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "种子未找到" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3030 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "种子中没有发现文件？" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3043 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "完成" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "剩余" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3090 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "高" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3095 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "普通" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3100 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "跳过" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3110 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 msgid "Set all high" msgstr "设置所有为高" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3112 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 msgid "Set all normal" msgstr "设置所有为正常" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 msgid "Skip all" msgstr "忽略所有" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3115 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "保存优先级" diff --git a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po index bc9fd6335..4b55ae30f 100644 --- a/apps/i2ptunnel/locale-proxy/messages_pt_BR.po +++ b/apps/i2ptunnel/locale-proxy/messages_pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-20 21:06+0000\n" +"PO-Revision-Date: 2015-06-10 16:40+0000\n" "Last-Translator: blueboy\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ msgstr "Informação: novo nome de host com auxiliar de endereço" msgid "" "The address helper link you followed is for a new host name that is not in " "your address book." -msgstr "" +msgstr "O linque do auxiliar de endereço que você acompanhou é para um novo nome de host que não está no seu livro de endereços." #: ../java/build/Proxy.java:13 msgid "You may save this host name to your local address book." @@ -106,7 +106,7 @@ msgstr "Você pode salvar esse nome de host no seu livro local de endereços." #: ../java/build/Proxy.java:14 msgid "" "If you save it to your address book, you will not see this message again." -msgstr "" +msgstr "Se você salvá-lo no seu livro de endereços, não verá novamente essa mensagem." #: ../java/build/Proxy.java:15 msgid "" @@ -118,7 +118,7 @@ msgstr "" msgid "" "If you do not wish to visit this host, click the \"back\" button on your " "browser." -msgstr "" +msgstr "Se você não deseja visitar esse host, clique no botão \"voltar\" no seu navegador." #: ../java/build/Proxy.java:17 ../java/build/Proxy.java:23 msgid "Warning: Destination Key Conflict" @@ -211,7 +211,7 @@ msgstr "" msgid "" "The proxy could be temporarily unavailable, too busy, or it has blocked your" " access." -msgstr "" +msgstr "O proxy pode estar temporariamente indisponível, sobrecarregado ou bloqueando o seu acesso." #: ../java/build/Proxy.java:65 ../java/build/Proxy.java:147 #: ../java/build/Proxy.java:181 ../java/build/Proxy.java:193 @@ -227,7 +227,7 @@ msgstr "" msgid "" "If you continue to have trouble you may want to edit your outproxy list " "{0}here{1}." -msgstr "" +msgstr "Se continuar a ter problemas e quiser editar a sua lista de proxies de saída, {0}clique aqui{1}." #: ../java/build/Proxy.java:75 msgid "" @@ -255,7 +255,7 @@ msgstr "O seu navegador está mal-configurado." msgid "" "Do not use the proxy to access the router console, localhost, or local LAN " "destinations." -msgstr "" +msgstr "Não use o proxy para acessar o painel do roteador, localhost ou destinos da LAN local." #: ../java/build/Proxy.java:86 ../java/build/Proxy.java:92 msgid "Warning: No Outproxy Configured" @@ -279,7 +279,7 @@ msgstr "O website estava inalcançável." msgid "" "The website is offline, there is network congestion, or your router is not " "yet well-integrated with peers." -msgstr "" +msgstr "O website está fora do ar, há congestionamento na rede ou o seu roteador não está ainda bem integrado com os pares." #: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112 msgid "Warning: Invalid Destination" @@ -315,7 +315,7 @@ msgstr "" #: ../java/build/Proxy.java:127 msgid "Other protocols such as FTP are not allowed." -msgstr "" +msgstr "Outros protocolos como FTP não são permitidos." #: ../java/build/Proxy.java:135 msgid "The connection to the website was reset while the page was loading." @@ -325,7 +325,7 @@ msgstr "" msgid "" "The website could be temporarily unavailable, too busy, or it has blocked " "your access." -msgstr "" +msgstr "O site pode estar temporariamente indisponível, sobrecarregado ou bloqueando o seu acesso." #: ../java/build/Proxy.java:139 ../java/build/Proxy.java:145 msgid "Outproxy Unreachable" @@ -339,7 +339,7 @@ msgstr "" #: ../java/build/Proxy.java:150 msgid "Website Unknown" -msgstr "" +msgstr "Site Desconhecido" #: ../java/build/Proxy.java:156 msgid "Website Not Found in Addressbook" @@ -402,7 +402,7 @@ msgstr "O proxy de saída está provavelmente fora do ar, mas pode ser também c #: ../java/build/Proxy.java:191 msgid "The HTTP Outproxy was not found." -msgstr "" +msgstr "O Proxy de Saída HTTP não foi encontrado." #: ../java/build/Proxy.java:192 msgid "" diff --git a/apps/i2ptunnel/locale-proxy/messages_sv.po b/apps/i2ptunnel/locale-proxy/messages_sv.po index 9117584b6..d5680b9af 100644 --- a/apps/i2ptunnel/locale-proxy/messages_sv.po +++ b/apps/i2ptunnel/locale-proxy/messages_sv.po @@ -5,6 +5,7 @@ # # Translators: # Calle Rundgren , 2013 +# cacapo , 2015 # hottuna , 2013 # hottuna , 2012 # WinterFairy , 2014 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"PO-Revision-Date: 2015-06-06 18:32+0000\n" +"Last-Translator: cacapo \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "Information: Nytt Värdnamn" #: ../java/build/Proxy.java:129 ../java/build/Proxy.java:140 #: ../java/build/Proxy.java:151 ../java/build/Proxy.java:164 #: ../java/build/Proxy.java:173 ../java/build/Proxy.java:185 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:207 msgid "Router Console" msgstr "Routerkonsol" @@ -60,7 +61,7 @@ msgstr "Routerkonsol" #: ../java/build/Proxy.java:131 ../java/build/Proxy.java:142 #: ../java/build/Proxy.java:153 ../java/build/Proxy.java:166 #: ../java/build/Proxy.java:175 ../java/build/Proxy.java:187 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Configuration" msgstr "Konfiguration" @@ -73,7 +74,7 @@ msgstr "Konfiguration" #: ../java/build/Proxy.java:132 ../java/build/Proxy.java:143 #: ../java/build/Proxy.java:154 ../java/build/Proxy.java:167 #: ../java/build/Proxy.java:176 ../java/build/Proxy.java:188 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Help" msgstr "Hjälp" @@ -86,7 +87,7 @@ msgstr "Hjälp" #: ../java/build/Proxy.java:133 ../java/build/Proxy.java:144 #: ../java/build/Proxy.java:155 ../java/build/Proxy.java:168 #: ../java/build/Proxy.java:177 ../java/build/Proxy.java:189 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Addressbook" msgstr "Adressbok" @@ -135,7 +136,7 @@ msgstr "Adresshjälpar-länken du följde specifierad en annan mål-nyckel än f msgid "" "Someone could be trying to impersonate another website, or people have given" " two websites identical names." -msgstr "" +msgstr "Någon kanske försöker imitera en annan webbsida, eller så har människor givit två olika webbsidor samma namn." #: ../java/build/Proxy.java:26 msgid "" @@ -175,16 +176,16 @@ msgstr "Du försökte ansluta till en icke-I2P webbsida eller plats." #: ../java/build/Proxy.java:68 ../java/build/Proxy.java:74 #: ../java/build/Proxy.java:95 ../java/build/Proxy.java:101 msgid "Website Unreachable" -msgstr "" +msgstr "Webbsidan onåbar" #: ../java/build/Proxy.java:52 msgid "The website was not reachable, because its lease set was not found." -msgstr "" +msgstr "Denna webbsida var inte nåbar, eftersom dess leaseset inte kunde hittas." #: ../java/build/Proxy.java:53 msgid "" "The website is probably down, but there could also be network congestion." -msgstr "" +msgstr "Webbsidan är förmodligen nere, men det kan också vara överbelastning på nätverket." #: ../java/build/Proxy.java:54 ../java/build/Proxy.java:104 #: ../java/build/Proxy.java:116 ../java/build/Proxy.java:137 @@ -202,17 +203,17 @@ msgstr "Kunde inte hitta följande mål:" #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62 #: ../java/build/Proxy.java:128 ../java/build/Proxy.java:134 msgid "Connection Reset" -msgstr "" +msgstr "Starta om anslutning" #: ../java/build/Proxy.java:63 msgid "The connection to the proxy was reset." -msgstr "" +msgstr "Anslutningen till proxyn startades om." #: ../java/build/Proxy.java:64 msgid "" "The proxy could be temporarily unavailable, too busy, or it has blocked your" " access." -msgstr "" +msgstr "Proxyn kanske är tillfälligt off-line, under hög belastning, eller har blockerat dig." #: ../java/build/Proxy.java:65 ../java/build/Proxy.java:147 #: ../java/build/Proxy.java:181 ../java/build/Proxy.java:193 @@ -234,11 +235,11 @@ msgstr "Om du fortsätter att ha problem, så kanske du vill ändra din utproxy- msgid "" "The website was not reachable, because it uses encryption options that are " "not supported by your I2P or Java version." -msgstr "" +msgstr "Webbsidan kunde inte nås eftersom den använder krypteringsalternativ som inte stöds av din I2P eller Java-version." #: ../java/build/Proxy.java:76 ../java/build/Proxy.java:149 msgid "Could not connect to the following destination:" -msgstr "" +msgstr "Kunde inte ansluta till följande destination:" #: ../java/build/Proxy.java:77 msgid "Error: Request Denied" @@ -274,13 +275,13 @@ msgstr "Var god ställ in en utproxy i I2PTunnel." #: ../java/build/Proxy.java:102 msgid "The website was not reachable." -msgstr "" +msgstr "Webbsidan var inte nåbar." #: ../java/build/Proxy.java:103 msgid "" "The website is offline, there is network congestion, or your router is not " "yet well-integrated with peers." -msgstr "" +msgstr "Webbsidan är offline, nätverket är under stor belastning eller så är din router inte välintegrerad med peers." #: ../java/build/Proxy.java:106 ../java/build/Proxy.java:112 msgid "Warning: Invalid Destination" @@ -290,7 +291,7 @@ msgstr "Varning: Ogiltigt Mål" msgid "" "The website destination specified was not valid, or was otherwise " "unreachable." -msgstr "" +msgstr "Webbsidans angivna destination var inte giltig, eller på annat sätt onåbar. " #: ../java/build/Proxy.java:114 msgid "" @@ -312,43 +313,43 @@ msgstr "Förfrågan använder ett dåligt protokoll." #: ../java/build/Proxy.java:126 msgid "The I2P HTTP Proxy supports HTTP and HTTPS requests only." -msgstr "" +msgstr "I2P-proxyn stöder endast HTTP och HTTPS-requests." #: ../java/build/Proxy.java:127 msgid "Other protocols such as FTP are not allowed." -msgstr "" +msgstr "Andra protokoll som FTP är inte tillåtna." #: ../java/build/Proxy.java:135 msgid "The connection to the website was reset while the page was loading." -msgstr "" +msgstr "Anslutningen till webbsidan startade om medan sidan laddades." #: ../java/build/Proxy.java:136 msgid "" "The website could be temporarily unavailable, too busy, or it has blocked " "your access." -msgstr "" +msgstr "Webbsidan kan vara tillfälligt onåbar, belastad, eller ha blockerat dig." #: ../java/build/Proxy.java:139 ../java/build/Proxy.java:145 msgid "Outproxy Unreachable" -msgstr "" +msgstr "Utproxy Onåbar" #: ../java/build/Proxy.java:146 msgid "" "The HTTP outproxy was not reachable, because it uses encryption options that" " are not supported by your I2P or Java version." -msgstr "" +msgstr "HTTP-proxyn kunde inte nås eftersom den använder krypteringsinställningar som inte stöd av din I2P eller Java-version." #: ../java/build/Proxy.java:150 msgid "Website Unknown" -msgstr "" +msgstr "Okänd Webbsida" #: ../java/build/Proxy.java:156 msgid "Website Not Found in Addressbook" -msgstr "" +msgstr "Webbsidan inte funnen i Adressboken" #: ../java/build/Proxy.java:157 msgid "The website was not found in your router's addressbook." -msgstr "" +msgstr "Webbsidan kunde inte hittas i din routers adressbok." #: ../java/build/Proxy.java:158 msgid "Check the link or find a Base 32 or Base 64 address." @@ -389,17 +390,17 @@ msgstr "Om du klicka på en länk, kontrollera slutet av URI:n efter andra tecke #: ../java/build/Proxy.java:172 ../java/build/Proxy.java:178 #: ../java/build/Proxy.java:184 ../java/build/Proxy.java:190 msgid "Outproxy Not Found" -msgstr "" +msgstr "Outproxy Kunde Ej Hittas" #: ../java/build/Proxy.java:179 msgid "" "The HTTP outproxy was not reachable, because its lease set was not found." -msgstr "" +msgstr "HTTP-outproxyn kunde inte nås, eftersom dess leaseset inte hittades." #: ../java/build/Proxy.java:180 msgid "" "The outproxy is probably down, but there could also be network congestion." -msgstr "" +msgstr "Outproxyn är förmodligen nere, men det kan också vara överbelastning på nätverket." #: ../java/build/Proxy.java:191 msgid "The HTTP Outproxy was not found." @@ -439,15 +440,15 @@ msgid "" "tunnel." msgstr "För att slå av autentisering, ta bort inställningen {0}i2ptunnel.proxy.auth=basic{1}, stanna och starta sedan om HTTP Porxy tunneln." -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:610 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:634 msgid "This seems to be a bad destination:" msgstr "Detta verkar vara ett felaktigt mål" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:611 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:635 msgid "i2paddresshelper cannot help you with a destination like that!" msgstr "i2padresshjälp kan inte hjälpa dig med ett sådant mål!" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:684 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:709 #, java-format msgid "" "To visit the destination in your host database, click here." msgstr "För att besöka målet i din värd databas href=\"{0}\"> klicka . För att besöka de motstridiga hjälpaddresserna, klicka ." -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1095 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1119 msgid "Destination lease set not found" -msgstr "" +msgstr "Destinationens leaseset kunde inte hittas" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1245 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1271 msgid "Host" msgstr "Värd" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1249 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1275 msgid "Base 32" msgstr "Bas 32" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1253 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1279 msgid "Destination" msgstr "Mål" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1259 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1285 #, java-format msgid "Continue to {0} without saving" msgstr "Fortsätt till {0} utan att spara" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1265 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1291 #, java-format msgid "Save {0} to router address book and continue to website" -msgstr "" +msgstr "Spara {0} till routerns adressbok och fortsätt till webbsidan." #. only blockfile supports multiple books -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1268 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1294 #, java-format msgid "Save {0} to master address book and continue to website" -msgstr "" +msgstr "Spara {0} till huvudadressboken och fortsätt till webbsidan." -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1269 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1295 #, java-format msgid "Save {0} to private address book and continue to website" -msgstr "" +msgstr "Spara {0} till privata adressboken och fortsätt till webbsidan." -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:156 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:169 #, java-format msgid "Added via address helper from {0}" msgstr "Tillagd via adresshjälpare från {0}" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:158 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:171 msgid "Added via address helper" msgstr "Tillagd via adresshjälpen " -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:175 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:188 msgid "router" msgstr "router" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:177 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190 msgid "master" msgstr "master" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:179 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 msgid "private" msgstr "privat" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:186 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 #, java-format msgid "Redirecting to {0}" msgstr "Om dirigerar till {0}" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213 #, java-format msgid "Saved {0} to the {1} addressbook, redirecting now." msgstr "Spara {0} till {1}adressboken, omdirigerar nu " -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:199 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:214 #, java-format msgid "Failed to save {0} to the {1} addressbook, redirecting now." msgstr "Misslyckades med att spara {0} till {1}adressboken, omdirigerar nu " -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:216 msgid "Click here if you are not redirected automatically." msgstr "Klicka här om du inte omdirigeras automatiskt " diff --git a/apps/i2ptunnel/locale-proxy/messages_zh.po b/apps/i2ptunnel/locale-proxy/messages_zh.po index 46634f334..7448e0789 100644 --- a/apps/i2ptunnel/locale-proxy/messages_zh.po +++ b/apps/i2ptunnel/locale-proxy/messages_zh.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-29 16:46+0000\n" +"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"PO-Revision-Date: 2015-06-27 10:25+0000\n" "Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "信息：新站点地址" #: ../java/build/Proxy.java:129 ../java/build/Proxy.java:140 #: ../java/build/Proxy.java:151 ../java/build/Proxy.java:164 #: ../java/build/Proxy.java:173 ../java/build/Proxy.java:185 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:207 msgid "Router Console" msgstr "路由控制台" @@ -63,7 +63,7 @@ msgstr "I2P 路由控制台" #: ../java/build/Proxy.java:131 ../java/build/Proxy.java:142 #: ../java/build/Proxy.java:153 ../java/build/Proxy.java:166 #: ../java/build/Proxy.java:175 ../java/build/Proxy.java:187 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Configuration" msgstr "配置" @@ -76,7 +76,7 @@ msgstr "配置" #: ../java/build/Proxy.java:132 ../java/build/Proxy.java:143 #: ../java/build/Proxy.java:154 ../java/build/Proxy.java:167 #: ../java/build/Proxy.java:176 ../java/build/Proxy.java:188 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Help" msgstr "帮助" @@ -89,7 +89,7 @@ msgstr "帮助" #: ../java/build/Proxy.java:133 ../java/build/Proxy.java:144 #: ../java/build/Proxy.java:155 ../java/build/Proxy.java:168 #: ../java/build/Proxy.java:177 ../java/build/Proxy.java:189 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Addressbook" msgstr "地址簿" @@ -200,7 +200,7 @@ msgstr "您可能希望{0}重试{1}。" #: ../java/build/Proxy.java:138 ../java/build/Proxy.java:162 #: ../java/build/Proxy.java:183 ../java/build/Proxy.java:195 msgid "Could not find the following destination:" -msgstr "无法直到如下目标：" +msgstr "未能找到下列目的地：" #: ../java/build/Proxy.java:56 ../java/build/Proxy.java:62 #: ../java/build/Proxy.java:128 ../java/build/Proxy.java:134 @@ -442,15 +442,15 @@ msgid "" "tunnel." msgstr "要禁用身份认证，请删除配置 {0}i2ptunnel.proxy.auth=basic{1}, 然后停止并重启 HTTP Proxy 隧道。" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:610 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:634 msgid "This seems to be a bad destination:" msgstr "目标似乎无效：" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:611 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:635 msgid "i2paddresshelper cannot help you with a destination like that!" msgstr "i2paddresshelper 对您输入的目标无能为力！" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:684 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:709 #, java-format msgid "" "To visit the destination in your host database, click here." msgstr "要访问您地址簿中设置的目标，请点击这里。要访问地址助手返回的目标，请点这里。" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1095 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1119 msgid "Destination lease set not found" msgstr "找不到目标租赁" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1245 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1271 msgid "Host" msgstr "主机" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1249 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1275 msgid "Base 32" msgstr "Base 32" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1253 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1279 msgid "Destination" msgstr "目标" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1259 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1285 #, java-format msgid "Continue to {0} without saving" msgstr "继续{0}，而不保存" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1265 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1291 #, java-format msgid "Save {0} to router address book and continue to website" msgstr "保存 {0} 到路由器地址簿并继续访问网站" #. only blockfile supports multiple books -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1268 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1294 #, java-format msgid "Save {0} to master address book and continue to website" msgstr "保存 {0} 到主地址簿并继续访问网站" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1269 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1295 #, java-format msgid "Save {0} to private address book and continue to website" msgstr "保存 {0} 到私有地址簿并继续访问网站" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:156 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:169 #, java-format msgid "Added via address helper from {0}" msgstr "已通过地址助手 {0} 添加" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:158 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:171 msgid "Added via address helper" msgstr "已通过地址助手添加" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:175 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:188 msgid "router" msgstr "路由器" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:177 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190 msgid "master" msgstr "主" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:179 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 msgid "private" msgstr "私有" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:186 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 #, java-format msgid "Redirecting to {0}" msgstr "正在重定向至{0}" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213 #, java-format msgid "Saved {0} to the {1} addressbook, redirecting now." msgstr "目标{0}已保存至{1}地址簿中，正在重定向至此目标。" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:199 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:214 #, java-format msgid "Failed to save {0} to the {1} addressbook, redirecting now." msgstr "目标{0}在{1}地址簿中保存失败，正在重定向至此目标。" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:216 msgid "Click here if you are not redirected automatically." msgstr "如果未能自动转到，请点击这里。" diff --git a/apps/i2ptunnel/locale/messages_zh.po b/apps/i2ptunnel/locale/messages_zh.po index 125247dc3..21a471e2e 100644 --- a/apps/i2ptunnel/locale/messages_zh.po +++ b/apps/i2ptunnel/locale/messages_zh.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2015-06-07 15:37+0000\n" +"Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -166,7 +166,7 @@ msgstr "无效地址" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85 msgid "Hidden Services Manager" -msgstr "隐藏服务管理器" +msgstr "隐身服务管理器" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86 msgid "Edit Client Tunnel" @@ -393,18 +393,18 @@ msgstr "无备用隧道(无冗余,不增加资源占用)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:397 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:395 msgid "1 backup tunnel each direction (low redundancy, low resource usage)" -msgstr "备用隧道对x1 (低冗余,低资源占用)" +msgstr "每方向1个备用隧道 (低冗余,低资源占用)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:401 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:399 msgid "" "2 backup tunnels each direction (medium redundancy, medium resource usage)" -msgstr "备用隧道对x2 (中冗余,中资源占用)" +msgstr "每方向2个备用隧道 (中冗余,中资源占用)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:405 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:403 msgid "3 backup tunnels each direction (high redundancy, high resource usage)" -msgstr "备用隧道对x3 (高冗余,高资源占用)" +msgstr "每方向3个备用隧道 (高冗余,高资源占用)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:413 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:411 @@ -594,7 +594,7 @@ msgstr "保存" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86 msgid "Edit Hidden Service" -msgstr "编辑隐藏服务" +msgstr "编辑隐身服务" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114 msgid "Edit server settings" @@ -748,7 +748,7 @@ msgstr "全部重启" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126 msgid "I2P Hidden Services" -msgstr "I2P 隐藏服务" +msgstr "I2P 隐身服务" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151 @@ -806,7 +806,7 @@ msgstr "启动" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:265 msgid "New hidden service" -msgstr "新建隐藏服务" +msgstr "新建隐身服务" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:267 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:436 diff --git a/apps/ministreaming/locale/messages_ca.po b/apps/ministreaming/locale/messages_ca.po new file mode 100644 index 000000000..cdd4b85e2 --- /dev/null +++ b/apps/ministreaming/locale/messages_ca.po @@ -0,0 +1,95 @@ +# I2P +# Copyright (C) 2014 The I2P Project +# This file is distributed under the same license as the streaming package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +# Translators: +# icc , 2015 +# icc , 2015 +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-29 14:30+0000\n" +"PO-Revision-Date: 2015-05-13 23:13+0000\n" +"Last-Translator: icc \n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/I2P/language/ca/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69 +msgid "Message timeout" +msgstr "Missatge de temporització" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72 +msgid "Failed delivery to local destination" +msgstr "Ha fallat l'enviament a la destinació local" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75 +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:108 +msgid "Local router failure" +msgstr "Fallada en encaminador local" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:78 +msgid "Local network failure" +msgstr "Fallada en xarxa local" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:81 +msgid "Session closed" +msgstr "Sessió tancada" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:84 +msgid "Invalid message" +msgstr "Missatge invàlid" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:87 +msgid "Invalid message options" +msgstr "Opcions de missatge invàlides" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:90 +msgid "Buffer overflow" +msgstr "Desbordament de memòria intermèdia" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:93 +msgid "Message expired" +msgstr "Missatge caducat" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96 +msgid "Local lease set invalid" +msgstr "" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:99 +msgid "No local tunnels" +msgstr "Cap túnel local" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:102 +msgid "Unsupported encryption options" +msgstr "Opcions d'encriptació no admeses" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:105 +msgid "Invalid destination" +msgstr "Destinació invàlida" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:111 +msgid "Destination lease set expired" +msgstr "" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:114 +msgid "Destination lease set not found" +msgstr "" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:117 +msgid "Local destination shutdown" +msgstr "Destinació local apagada" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:120 +msgid "Connection was reset" +msgstr "Connexió reinicialitzada" + +#. Translate this one here, can't do it later +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:127 +msgid "Failure code" +msgstr "Fallada de codi" diff --git a/apps/ministreaming/locale/messages_sv.po b/apps/ministreaming/locale/messages_sv.po new file mode 100644 index 000000000..4d3e8bde6 --- /dev/null +++ b/apps/ministreaming/locale/messages_sv.po @@ -0,0 +1,94 @@ +# I2P +# Copyright (C) 2014 The I2P Project +# This file is distributed under the same license as the streaming package. +# To contribute translations, see http://www.i2p2.de/newdevelopers +# +# Translators: +# cacapo , 2015 +msgid "" +msgstr "" +"Project-Id-Version: I2P\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-29 14:30+0000\n" +"PO-Revision-Date: 2015-05-19 05:18+0000\n" +"Last-Translator: cacapo \n" +"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv_SE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69 +msgid "Message timeout" +msgstr "Meddelande-timeout" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72 +msgid "Failed delivery to local destination" +msgstr "Leverans till lokal destination misslyckades" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75 +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:108 +msgid "Local router failure" +msgstr "Lokalt routerfel" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:78 +msgid "Local network failure" +msgstr "Lokalt nätverksfel" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:81 +msgid "Session closed" +msgstr "Sessionen stängd" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:84 +msgid "Invalid message" +msgstr "Ogiltigt meddelande" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:87 +msgid "Invalid message options" +msgstr "Ogiltigt meddelandealternativ" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:90 +msgid "Buffer overflow" +msgstr "Buffer overflow" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:93 +msgid "Message expired" +msgstr "Meddelande utgånget" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96 +msgid "Local lease set invalid" +msgstr "Lokalt leaseset ogiltigt" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:99 +msgid "No local tunnels" +msgstr "Inga lokala tunnlar" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:102 +msgid "Unsupported encryption options" +msgstr "Krypteringsalternativ stöds ej" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:105 +msgid "Invalid destination" +msgstr "Ogiltig destination" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:111 +msgid "Destination lease set expired" +msgstr "Destinationens leaseset har gått ut." + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:114 +msgid "Destination lease set not found" +msgstr "Destinationens leaseset hittades inte" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:117 +msgid "Local destination shutdown" +msgstr "Lokal destination stängs ner" + +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:120 +msgid "Connection was reset" +msgstr "Anslutningen startades om" + +#. Translate this one here, can't do it later +#: ../java/src/net/i2p/client/streaming/I2PSocketException.java:127 +msgid "Failure code" +msgstr "Felkod" diff --git a/apps/routerconsole/locale-countries/messages_ca.po b/apps/routerconsole/locale-countries/messages_ca.po index bd61f6b29..d5bdb38cd 100644 --- a/apps/routerconsole/locale-countries/messages_ca.po +++ b/apps/routerconsole/locale-countries/messages_ca.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-02-21 00:08+0000\n" -"Last-Translator: el_libre como el chaval \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/I2P/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,6 +51,9 @@ msgstr "Antilles Holandeses " msgid "Angola" msgstr "Angola " +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antàrtida" @@ -102,6 +105,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benín " +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda " @@ -111,6 +117,9 @@ msgstr "Brunei " msgid "Bolivia" msgstr "Bolívia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasil " @@ -138,15 +147,12 @@ msgstr "Canadà " msgid "Cocos (Keeling) Islands" msgstr "Illes Cocos (Keeling) " -msgid "The Democratic Republic of the Congo" -msgstr "La República Democràtica del Congo " +msgid "Congo" +msgstr "Congo " msgid "Central African Republic" msgstr "República Centreafricana " -msgid "Congo" -msgstr "Congo " - msgid "Switzerland" msgstr "Suïssa " @@ -243,8 +249,8 @@ msgstr "Fiji " msgid "Falkland Islands (Malvinas)" msgstr "Illes Malvines (Falkland) " -msgid "Federated States of Micronesia" -msgstr "Els Estats Federats de Micronèsia " +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Illes Fèroe " @@ -345,8 +351,8 @@ msgstr "Territori Britànic de l'Oceà Índic " msgid "Iraq" msgstr "Iraq " -msgid "Islamic Republic of Iran" -msgstr "República Islàmica de l'Iran " +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islàndia " @@ -384,8 +390,8 @@ msgstr "Comores " msgid "Saint Kitts and Nevis" msgstr "Saint Kitts i Nevis " -msgid "The Democratic People's Republic of Korea" -msgstr "La República Popular Democràtica de Corea " +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "República de Corea " @@ -429,8 +435,8 @@ msgstr "Luxemburg " msgid "Latvia" msgstr "Letònia " -msgid "Libyan Arab Jamahiriya" -msgstr "Jamahiriya Àrab Líbia " +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marroc " @@ -438,8 +444,8 @@ msgstr "Marroc " msgid "Monaco" msgstr "Mònaco " -msgid "Republic of Moldova" -msgstr "República de Moldàvia " +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro " @@ -453,8 +459,8 @@ msgstr "Madagascar " msgid "Marshall Islands" msgstr "Illes Marshall " -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "L'Antiga República Iugoslava de Macedònia " +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali " @@ -465,8 +471,8 @@ msgstr "Myanmar " msgid "Mongolia" msgstr "Mongòlia " -msgid "Macao" -msgstr "Macau " +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Illes Mariannes del Nord " @@ -645,14 +651,20 @@ msgstr "Somàlia " msgid "Suriname" msgstr "Suriname " +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome i Principe" msgid "El Salvador" msgstr "El Salvador " -msgid "Syrian Arab Republic" -msgstr "República Àrab Síria " +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swazilàndia " @@ -702,8 +714,8 @@ msgstr "Tuvalu " msgid "Taiwan" msgstr "Taiwan " -msgid "United Republic of Tanzania" -msgstr "República Unida de Tanzània " +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ucraïna " @@ -723,8 +735,8 @@ msgstr "Uruguai " msgid "Uzbekistan" msgstr "Uzbekistan " -msgid "Holy See (Vatican City State)" -msgstr "Santa Seu (Ciutat del Vaticà) " +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent i les Grenadines " @@ -735,8 +747,8 @@ msgstr "Veneçuela " msgid "Virgin Islands" msgstr "Illes Verges " -msgid "Viet Nam" -msgstr "Vietnam " +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu " diff --git a/apps/routerconsole/locale-countries/messages_da.po b/apps/routerconsole/locale-countries/messages_da.po index df3829c3f..735f533cb 100644 --- a/apps/routerconsole/locale-countries/messages_da.po +++ b/apps/routerconsole/locale-countries/messages_da.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2015-05-02 06:35+0000\n" -"Last-Translator: cacapo \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Danish (http://www.transifex.com/projects/p/I2P/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,6 +53,9 @@ msgstr "Hollandske Antiller" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktis" @@ -104,6 +107,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -113,6 +119,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasilien" @@ -140,15 +149,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Cocosøerne (Keelingøerne)" -msgid "The Democratic Republic of the Congo" -msgstr "Den Demokratiske Republik Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Centralafrikanske Republik" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Schweiz" @@ -245,8 +251,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Falklandsøerne (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Mikronesiens Forenede Stater" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Færøerne" @@ -347,8 +353,8 @@ msgstr "British Indian Ocean Territory (Chagosøerne)" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Den islamiske republik Iran" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Island" @@ -386,8 +392,8 @@ msgstr "Comorerne" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts og Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Nordkorea" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Sydkorea" @@ -431,8 +437,8 @@ msgstr "Luxembourg" msgid "Latvia" msgstr "Letland" -msgid "Libyan Arab Jamahiriya" -msgstr "Libyen" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marokko" @@ -440,8 +446,8 @@ msgstr "Marokko" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Republikken Moldova" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -455,8 +461,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshalløerne" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Den Tidligere Jugoslaviske Republik Makedonien" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -467,8 +473,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongoliet" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Nordmarianerne" @@ -647,14 +653,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome og Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Syriske Arabiske Republik" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swaziland" @@ -704,8 +716,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "den Forenede Republik Tanzania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraine" @@ -725,8 +737,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Usbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Pavestolen (Vatikanstaten)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent og Grenadinerne" @@ -737,8 +749,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Jomfruøerne" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_de.po b/apps/routerconsole/locale-countries/messages_de.po index c7a48a67a..69141c8af 100644 --- a/apps/routerconsole/locale-countries/messages_de.po +++ b/apps/routerconsole/locale-countries/messages_de.po @@ -9,7 +9,7 @@ # blabla , 2014 # D.A. Loader <>, 2012 # ducki2p , 2011 -# Ettore Atalan , 2014 +# Ettore Atalan , 2014-2015 # foo , 2009 # mixxy, 2011 # nextloop , 2013 @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-09-19 15:50+0000\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-21 22:27+0000\n" "Last-Translator: Ettore Atalan \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" @@ -62,6 +62,9 @@ msgstr "Niederländische Antillen" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Asien/Pazifikraum" + msgid "Antarctica" msgstr "Antarktis" @@ -113,6 +116,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "Saint Barthélemy" + msgid "Bermuda" msgstr "Bermuda" @@ -122,6 +128,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolivien" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brasilien" @@ -149,15 +158,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kokos- oder Keelinginseln" -msgid "The Democratic Republic of the Congo" -msgstr "Demokratische Republik Kongo" +msgid "Congo" +msgstr "Republik Kongo" msgid "Central African Republic" msgstr "Zentralafrikanische Republik" -msgid "Congo" -msgstr "Republik Kongo" - msgid "Switzerland" msgstr "Schweiz" @@ -254,8 +260,8 @@ msgstr "Fidschi" msgid "Falkland Islands (Malvinas)" msgstr "Falklandinseln (Malwinen)" -msgid "Federated States of Micronesia" -msgstr "Föderierte Staaten von Mikronesien" +msgid "Micronesia" +msgstr "Mikronesien" msgid "Faroe Islands" msgstr "Färöer" @@ -356,7 +362,7 @@ msgstr "Britisches Territorium im Indischen Ozean" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" +msgid "Iran" msgstr "Iran" msgid "Iceland" @@ -395,7 +401,7 @@ msgstr "Komoren" msgid "Saint Kitts and Nevis" msgstr "St. Kitts und Nevis" -msgid "The Democratic People's Republic of Korea" +msgid "North Korea" msgstr "Nordkorea" msgid "Republic of Korea" @@ -440,7 +446,7 @@ msgstr "Luxenburg" msgid "Latvia" msgstr "Lettland" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "Libyen" msgid "Morocco" @@ -449,8 +455,8 @@ msgstr "Marokko" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Republik Moldau (Moldawien)" +msgid "Moldova" +msgstr "Moldawien" msgid "Montenegro" msgstr "Montenegro" @@ -464,8 +470,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshallinseln" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Die ehemalige jugoslawische Republik Mazedonien" +msgid "Macedonia" +msgstr "Mazedonien" msgid "Mali" msgstr "Mali" @@ -476,8 +482,8 @@ msgstr "Myanmar (Burma)" msgid "Mongolia" msgstr "Mongolei" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "Macau" msgid "Northern Mariana Islands" msgstr "Nördliche Marianen-Inseln" @@ -656,14 +662,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "Südsudan" + msgid "Sao Tome and Principe" msgstr "São Tomé und Príncipe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Syrische Arabische Republik" +msgid "Sint Maarten" +msgstr "Sint Maarten" + +msgid "Syria" +msgstr "Syrien" msgid "Swaziland" msgstr "Swasiland" @@ -713,8 +725,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Vereinigte Republik Tansania" +msgid "Tanzania" +msgstr "Tansania" msgid "Ukraine" msgstr "Ukraine" @@ -734,8 +746,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Usbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Vatikanstadt" +msgid "Vatican" +msgstr "Vatikan" msgid "Saint Vincent and the Grenadines" msgstr "St. Vincent und die Grenadinen" @@ -746,7 +758,7 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "US-Jungferninseln" -msgid "Viet Nam" +msgid "Vietnam" msgstr "Vietnam" msgid "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_el.po b/apps/routerconsole/locale-countries/messages_el.po index 9b0c2bc7a..ba53ec6b8 100644 --- a/apps/routerconsole/locale-countries/messages_el.po +++ b/apps/routerconsole/locale-countries/messages_el.po @@ -2,24 +2,24 @@ # 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 -# +# # Translators: -# Alex , 2012. -# , 2012. -# , 2012. +# Alex , 2012 +# Alex , 2012 +# lixtetrax , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2012-08-06 06:39+0000\n" -"Last-Translator: Alex \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n" -"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" msgstr "Ανώνυμος Proxy" @@ -54,6 +54,9 @@ msgstr "Ολλανδικές Αντίλλες" msgid "Angola" msgstr "Ανγκόλα" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Ανταρκτική" @@ -105,6 +108,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Βερμούδες" @@ -114,6 +120,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Βολιβία" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Βραζιλία" @@ -141,15 +150,12 @@ msgstr "Καναδάς" msgid "Cocos (Keeling) Islands" msgstr "Νησιά Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "Δημοκρατία του Κονγκό" +msgid "Congo" +msgstr "Κογκό" msgid "Central African Republic" msgstr "Δημοκρατία της Κεντρικής Αφρικής" -msgid "Congo" -msgstr "Κογκό" - msgid "Switzerland" msgstr "Ελβετία" @@ -246,8 +252,8 @@ msgstr "Νήσοι Φίτζι" msgid "Falkland Islands (Malvinas)" msgstr "Νησιά Μαλβίδων" -msgid "Federated States of Micronesia" -msgstr "Ομοσπονδία Μικρονησίας" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Faroe Islands" @@ -348,8 +354,8 @@ msgstr "Βρεταννικές Περιοχές Ινδικού Ωκεανού" msgid "Iraq" msgstr "Ιράκ" -msgid "Islamic Republic of Iran" -msgstr "Ισλαμική Δημοκρατία του Ιράν" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Ισλανδία" @@ -387,8 +393,8 @@ msgstr "Κομόρος" msgid "Saint Kitts and Nevis" msgstr "Αγιος Κιτς και Νεβί" -msgid "The Democratic People's Republic of Korea" -msgstr "Λαϊκή Δημοκρατία της Κορέας" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Δημοκρατία της Κορέας" @@ -432,8 +438,8 @@ msgstr "Λουξεμβούργο" msgid "Latvia" msgstr "Λιθουανία" -msgid "Libyan Arab Jamahiriya" -msgstr "Libyan Arab Jamahiriya" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Μαρόκο" @@ -441,8 +447,8 @@ msgstr "Μαρόκο" msgid "Monaco" msgstr "Μονακό" -msgid "Republic of Moldova" -msgstr "Δημοκρατία της Μολδαβίας" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Μαυροβούνιο" @@ -456,8 +462,8 @@ msgstr "Μαγαδασκάρη" msgid "Marshall Islands" msgstr "Νησιά Μάρσαλ" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Γιουγκοσλαβική Δημοκρατια της Μακεδονίας" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Μάλι" @@ -468,8 +474,8 @@ msgstr "Μιανμάρ" msgid "Mongolia" msgstr "Μογγολία" -msgid "Macao" -msgstr "Μακάο" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Northern Mariana Islands" @@ -648,14 +654,20 @@ msgstr "Σομαλία" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome και Principe" msgid "El Salvador" msgstr "Ελ Σαλβαδόρ" -msgid "Syrian Arab Republic" -msgstr "Συρία" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Σουαζιλάνδη" @@ -705,8 +717,8 @@ msgstr "Τούβαλου" msgid "Taiwan" msgstr "Ταϊβάν" -msgid "United Republic of Tanzania" -msgstr "Τανζανία" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ουκρανία" @@ -726,8 +738,8 @@ msgstr "Ουρουγουάη" msgid "Uzbekistan" msgstr "Ουζμπεκιστάν" -msgid "Holy See (Vatican City State)" -msgstr "Holy See (Vatican City State)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent and the Grenadines" @@ -738,8 +750,8 @@ msgstr "Βενεζουέλα" msgid "Virgin Islands" msgstr "Παρθένοι Νήσοι" -msgid "Viet Nam" -msgstr "Βιετνάμ" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" @@ -764,4 +776,3 @@ msgstr "Ζάμπια" msgid "Zimbabwe" msgstr "Ζιμπάμπουε" - diff --git a/apps/routerconsole/locale-countries/messages_es.po b/apps/routerconsole/locale-countries/messages_es.po index d6a6d7bce..5f9e24342 100644 --- a/apps/routerconsole/locale-countries/messages_es.po +++ b/apps/routerconsole/locale-countries/messages_es.po @@ -2,31 +2,29 @@ # 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 -# +# # Translators: # "blabla", 2011 -# blabla , 2011, 2012 -# Daniel Mustieles , 2012-2013 +# blabla , 2011-2012 # ducki2p , 2011 # foo , 2009 # mixxy, 2011 -# punkibastardo , 2011, 2012 -# punkibastardo , 2011 +# punkibastardo , 2011-2012 # strel, 2013 +# strel, 2015 # trolly, 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2013-09-21 14:16+0000\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 02:05+0000\n" "Last-Translator: strel\n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/" -"es/)\n" -"Language: es\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" @@ -62,6 +60,9 @@ msgstr "Antillas Holandesas" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Región Asia/Pacífico" + msgid "Antarctica" msgstr "La Antártida" @@ -113,6 +114,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "San Bartolomé" + msgid "Bermuda" msgstr "Bermudas" @@ -122,6 +126,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brasil" @@ -149,15 +156,12 @@ msgstr "Canadá" msgid "Cocos (Keeling) Islands" msgstr "Islas Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "República Democrática del Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "República Centroafricana" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Suiza" @@ -254,8 +258,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Islas Malvinas" -msgid "Federated States of Micronesia" -msgstr "Estados Federados de Micronesia" +msgid "Micronesia" +msgstr "Micronesia" msgid "Faroe Islands" msgstr "Islas Feroe" @@ -356,8 +360,8 @@ msgstr "Territorio británico del océano Índico" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "República Islámica de Irán" +msgid "Iran" +msgstr "Irán" msgid "Iceland" msgstr "Islandia" @@ -395,8 +399,8 @@ msgstr "Comoras" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts y Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "La República Popular Democrática de Corea" +msgid "North Korea" +msgstr "Corea del Norte" msgid "Republic of Korea" msgstr "República de Corea" @@ -440,7 +444,7 @@ msgstr "Luxemburgo" msgid "Latvia" msgstr "Letonia" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "Libia" msgid "Morocco" @@ -449,8 +453,8 @@ msgstr "Marruecos" msgid "Monaco" msgstr "Mónaco" -msgid "Republic of Moldova" -msgstr "República de Moldavia" +msgid "Moldova" +msgstr "Moldavia" msgid "Montenegro" msgstr "Montenegro" @@ -464,8 +468,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Las Islas Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "La Antigua República Yugoslava de Macedonia" +msgid "Macedonia" +msgstr "Macedonia" msgid "Mali" msgstr "Malí" @@ -476,7 +480,7 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" +msgid "Macau" msgstr "Macao" msgid "Northern Mariana Islands" @@ -656,13 +660,19 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "Sudán del Sur" + msgid "Sao Tome and Principe" msgstr "Santo Tomé y Príncipe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "Sint Maarten" + +msgid "Syria" msgstr "Siria" msgid "Swaziland" @@ -713,8 +723,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwán" -msgid "United Republic of Tanzania" -msgstr "Tanzanía" +msgid "Tanzania" +msgstr "Tanzania" msgid "Ukraine" msgstr "Ucrania" @@ -734,8 +744,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistán" -msgid "Holy See (Vatican City State)" -msgstr "Santa Sede (Ciudad del Vaticano)" +msgid "Vatican" +msgstr "Ciudad del Vaticano" msgid "Saint Vincent and the Grenadines" msgstr "San Vicente y las Granadinas" @@ -746,7 +756,7 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Islas Vírgenes" -msgid "Viet Nam" +msgid "Vietnam" msgstr "Vietnam" msgid "Vanuatu" @@ -772,4 +782,3 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_et.po b/apps/routerconsole/locale-countries/messages_et.po index af6937072..fe84f4a27 100644 --- a/apps/routerconsole/locale-countries/messages_et.po +++ b/apps/routerconsole/locale-countries/messages_et.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-11-25 12:39+0000\n" -"Last-Translator: Marie Nepeta \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/I2P/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,6 +53,9 @@ msgstr "Hollandi Antillid" msgid "Angola" msgstr "Angoola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktika" @@ -104,6 +107,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuuda" @@ -113,6 +119,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Boliivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasiilia" @@ -140,15 +149,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kookosesaared" -msgid "The Democratic Republic of the Congo" -msgstr "Kongo Demokraatlik Vabariik" +msgid "Congo" +msgstr "Kongo" msgid "Central African Republic" msgstr "Kesk-Aafrika Vabariik" -msgid "Congo" -msgstr "Kongo" - msgid "Switzerland" msgstr "Šveits" @@ -245,8 +251,8 @@ msgstr "Fidži" msgid "Falkland Islands (Malvinas)" msgstr "Falklandi saared (Malviinid)" -msgid "Federated States of Micronesia" -msgstr "Mikroneesia" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Fääri saared" @@ -347,8 +353,8 @@ msgstr "Briti India Ookeani Territoorium" msgid "Iraq" msgstr "Iraak" -msgid "Islamic Republic of Iran" -msgstr "Iraani Islamivabariik" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Island" @@ -386,8 +392,8 @@ msgstr "Comoros" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts ja Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Korea Demokraatlik Rahvavabariik" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Korea Vabariik" @@ -431,8 +437,8 @@ msgstr "Luksemburg" msgid "Latvia" msgstr "Läti" -msgid "Libyan Arab Jamahiriya" -msgstr "Liibüa" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Maroko" @@ -440,8 +446,8 @@ msgstr "Maroko" msgid "Monaco" msgstr "Monako" -msgid "Republic of Moldova" -msgstr "Moldova Vabariik" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -455,8 +461,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshall'i saared" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Endine Jugoslaavia Vabariik Makedoonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -467,8 +473,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongoolia" -msgid "Macao" -msgstr "Makao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Põhja-Mariaani saared" @@ -647,14 +653,20 @@ msgstr "Somaalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome ja Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Süüria Araabia Vabariik" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swaasimaa" @@ -704,8 +716,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Tansaania Ühendatud Vabariik" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraina" @@ -725,8 +737,8 @@ msgstr "Uruguai" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Püha Linn (Vatikani linnriik)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent ja Grenadiinid" @@ -737,8 +749,8 @@ msgstr "Venetsueela" msgid "Virgin Islands" msgstr "Neitsisaared" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_fi.po b/apps/routerconsole/locale-countries/messages_fi.po index d085b43fd..4886a0139 100644 --- a/apps/routerconsole/locale-countries/messages_fi.po +++ b/apps/routerconsole/locale-countries/messages_fi.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-08-02 20:11+0000\n" -"Last-Translator: oselotti\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,6 +54,9 @@ msgstr "Alankomaiden Antillit" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Etelämanner" @@ -105,6 +108,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -114,6 +120,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasilia" @@ -141,15 +150,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kookossaaret" -msgid "The Democratic Republic of the Congo" -msgstr "Kongon demokraattinen tasavalta" +msgid "Congo" +msgstr "Kongon tasavalta" msgid "Central African Republic" msgstr "Keski-Afrikan tasavalta" -msgid "Congo" -msgstr "Kongon tasavalta" - msgid "Switzerland" msgstr "Sveitsi" @@ -246,8 +252,8 @@ msgstr "Fidži" msgid "Falkland Islands (Malvinas)" msgstr "Falklandinsaaret" -msgid "Federated States of Micronesia" -msgstr "Mikronesian liittovaltio" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Färsaaret" @@ -348,8 +354,8 @@ msgstr "Brittiläinen Intian valtameren alue" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Iranin islamilainen tasavalta" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islanti" @@ -387,8 +393,8 @@ msgstr "Komorit" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts ja Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Korean demokraattinen kansantasavalta" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Etelä-Korea" @@ -432,8 +438,8 @@ msgstr "Luxemburg" msgid "Latvia" msgstr "Latvia" -msgid "Libyan Arab Jamahiriya" -msgstr "Libya" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marokko" @@ -441,8 +447,8 @@ msgstr "Marokko" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Moldova" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -456,8 +462,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshallinsaaret" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Makedonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -468,8 +474,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Pohjois-Mariaanit" @@ -648,14 +654,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "São Tomé ja Príncipe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Syyria" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swazimaa" @@ -705,8 +717,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Tansania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraina" @@ -726,8 +738,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Vatikaani" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent ja Grenadiinit" @@ -738,8 +750,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Neitsytsaaret" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_fr.po b/apps/routerconsole/locale-countries/messages_fr.po index cb65ab659..e46dcc18f 100644 --- a/apps/routerconsole/locale-countries/messages_fr.po +++ b/apps/routerconsole/locale-countries/messages_fr.po @@ -2,33 +2,28 @@ # 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 -# +# # Translators: # aylham , 2011 -# aylham , 2011 # Boxoa590, 2012-2013 # ducki2p , 2011 # fo0 , 2011 # foo , 2009 -# fo0 , 2011 -# jackjack , 2011 -# Boxoa590, 2013 -# Boxoa590, 2012 # jackjack , 2011 # Towatowa441, 2013 +# Towinet, 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-09-21 17:14+0000\n" -"Last-Translator: Towatowa441\n" -"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/" -"fr/)\n" -"Language: fr\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-22 09:13+0000\n" +"Last-Translator: Towinet\n" +"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Anonymous Proxy" @@ -64,6 +59,9 @@ msgstr "Antilles néerlandaises" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Région Asie/Pacifique" + msgid "Antarctica" msgstr "Antarctique" @@ -115,6 +113,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "Saint Barthélemy" + msgid "Bermuda" msgstr "Bermudes" @@ -124,6 +125,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolivie" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brésil" @@ -151,15 +155,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Îles Cocos" -msgid "The Democratic Republic of the Congo" -msgstr "République démocratique du Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "République centre africaine" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Suisse" @@ -256,7 +257,7 @@ msgstr "Fidji" msgid "Falkland Islands (Malvinas)" msgstr "Malouines" -msgid "Federated States of Micronesia" +msgid "Micronesia" msgstr "Micronésie" msgid "Faroe Islands" @@ -358,7 +359,7 @@ msgstr "Territoire britannique de l'océan Indien" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" +msgid "Iran" msgstr "Iran" msgid "Iceland" @@ -397,8 +398,8 @@ msgstr "Comores" msgid "Saint Kitts and Nevis" msgstr "Saint-Christophe-et-Niévès" -msgid "The Democratic People's Republic of Korea" -msgstr "République populaire démocratique de Corée" +msgid "North Korea" +msgstr "Corée du nord" msgid "Republic of Korea" msgstr "Corée" @@ -442,8 +443,8 @@ msgstr "Luxembourg" msgid "Latvia" msgstr "Lettonie" -msgid "Libyan Arab Jamahiriya" -msgstr "Libye" +msgid "Libya" +msgstr "Lybie" msgid "Morocco" msgstr "Maroc" @@ -451,7 +452,7 @@ msgstr "Maroc" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" +msgid "Moldova" msgstr "Moldavie" msgid "Montenegro" @@ -466,8 +467,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Macédoine" +msgid "Macedonia" +msgstr "Macédonie" msgid "Mali" msgstr "Mali" @@ -478,8 +479,8 @@ msgstr "Birmanie" msgid "Mongolia" msgstr "Mongolie" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "Macau" msgid "Northern Mariana Islands" msgstr "Mariannes" @@ -658,13 +659,19 @@ msgstr "Somalie" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "Soudan du Sud" + msgid "Sao Tome and Principe" msgstr "Sao Tome e Principe" msgid "El Salvador" msgstr "Salvador" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "Saint-Martin" + +msgid "Syria" msgstr "Syrie" msgid "Swaziland" @@ -715,7 +722,7 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" +msgid "Tanzania" msgstr "Tanzanie" msgid "Ukraine" @@ -736,7 +743,7 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Ouzbékistan" -msgid "Holy See (Vatican City State)" +msgid "Vatican" msgstr "Vatican" msgid "Saint Vincent and the Grenadines" @@ -748,8 +755,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Ïles Vierges" -msgid "Viet Nam" -msgstr "Viêt Nam" +msgid "Vietnam" +msgstr "Vietnam" msgid "Vanuatu" msgstr "Vanuatu" @@ -774,4 +781,3 @@ msgstr "Zambie" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_hu.po b/apps/routerconsole/locale-countries/messages_hu.po index 61be520b9..79ca6297b 100644 --- a/apps/routerconsole/locale-countries/messages_hu.po +++ b/apps/routerconsole/locale-countries/messages_hu.po @@ -2,22 +2,22 @@ # 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 -# +# # Translators: -# , 2013. +# omgitsadalek , 2013 +# benewfy , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-01-03 12:35+0000\n" -"Last-Translator: omgitsadalek \n" -"Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/" -"hu/)\n" -"Language: hu\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" @@ -53,6 +53,9 @@ msgstr "Holland Antillák" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktika" @@ -104,6 +107,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -113,6 +119,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolívia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brazília" @@ -140,15 +149,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kókusz (Keeling)-szigetek" -msgid "The Democratic Republic of the Congo" -msgstr "Kongói Demokratikus Köztársaság" +msgid "Congo" +msgstr "Kongó" msgid "Central African Republic" msgstr "Közép-afrikai Köztársaság" -msgid "Congo" -msgstr "Kongó" - msgid "Switzerland" msgstr "Svájc" @@ -183,7 +189,7 @@ msgid "Cape Verde" msgstr "Zöld-foki Köztársaság" msgid "Curaçao" -msgstr "" +msgstr "Curacao" msgid "Christmas Island" msgstr "Karácsony-sziget" @@ -245,8 +251,8 @@ msgstr "Fidzsi-szigetek" msgid "Falkland Islands (Malvinas)" msgstr "Falkland-szigetek" -msgid "Federated States of Micronesia" -msgstr "Mikronéziai Szövetségi Államok" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Faroe-szigetek" @@ -347,8 +353,8 @@ msgstr "Brit Indiai-óceáni Terület" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Irán" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Izland" @@ -386,8 +392,8 @@ msgstr "Comoros" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts és Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Észak-Korea" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Dél-Korea" @@ -431,8 +437,8 @@ msgstr "Luxemburg" msgid "Latvia" msgstr "Lettország" -msgid "Libyan Arab Jamahiriya" -msgstr "Líbia" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marokkó" @@ -440,8 +446,8 @@ msgstr "Marokkó" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Moldova" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegró" @@ -455,8 +461,8 @@ msgstr "Madagaszkár" msgid "Marshall Islands" msgstr "Marshall-szigetek" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Macedónia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -467,8 +473,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongólia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Északi-Mariana-szigetek" @@ -647,14 +653,20 @@ msgstr "Szomália" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome és Principe" msgid "El Salvador" msgstr "Salvador" -msgid "Syrian Arab Republic" -msgstr "Szíria" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Szváziföld" @@ -704,8 +716,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Tanzánia" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukrajna" @@ -725,8 +737,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Üzbegisztán" -msgid "Holy See (Vatican City State)" -msgstr "Vatikán" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent és Grenadine-szigetek" @@ -737,8 +749,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Virgin-szigetek" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" @@ -763,4 +775,3 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_it.po b/apps/routerconsole/locale-countries/messages_it.po index c3a2f61bb..c4f58c379 100644 --- a/apps/routerconsole/locale-countries/messages_it.po +++ b/apps/routerconsole/locale-countries/messages_it.po @@ -2,29 +2,28 @@ # 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 -# +# # Translators: -# BadCluster , 2012 +# Bad Cluster , 2012 # Leelium , 2012 # , 2012 -# fletcherlynd , 2013 +# Fletcher Lynd , 2013 # ironbishop , 2011 # mkkid , 2011 # danimoth , 2011 -# Tony Goodyear , 2012 +# spawned76 , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 22:58+0000\n" -"PO-Revision-Date: 2013-11-02 23:22+0000\n" -"Last-Translator: fletcherlynd \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/" -"it/)\n" -"Language: it\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" @@ -60,6 +59,9 @@ msgstr "Antille Olandesi" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antartide" @@ -111,6 +113,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Repubblica del Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -120,6 +125,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasile" @@ -147,15 +155,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Isole Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "Repubblica Democratica del Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Repubblica Centrafricana" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Svizzera" @@ -252,8 +257,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Isole Falkland (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Stati federati di Micronesia" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Isole Faroe" @@ -354,8 +359,8 @@ msgstr "Territori Britannici dell'oceano Indiano" msgid "Iraq" msgstr "Iraq" -msgid "Islamic Republic of Iran" -msgstr "Repubblica Islamica dell'Iran" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islanda" @@ -393,8 +398,8 @@ msgstr "Comore" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts e Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Repubblica Democratica di Korea" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Repubblica di Corea" @@ -438,8 +443,8 @@ msgstr "Lussemburgo" msgid "Latvia" msgstr "Lettonia" -msgid "Libyan Arab Jamahiriya" -msgstr "Jamahiriya araba libica" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marocco" @@ -447,8 +452,8 @@ msgstr "Marocco" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Repubblica di Moldova" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -462,8 +467,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Isole Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "L'ex Repubblica iugoslava di Macedonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -474,8 +479,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Isole Marianne Settentrionali" @@ -654,14 +659,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome e Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Repubblica araba siriana" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swaziland" @@ -711,8 +722,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Repubblica Unita della Tanzania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ucraina" @@ -732,8 +743,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Santa Sede (Stato della Città del Vaticano)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent e Grenadine" @@ -744,8 +755,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Isole Vergini" -msgid "Viet Nam" -msgstr "Viet Nam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_ja.po b/apps/routerconsole/locale-countries/messages_ja.po index 36f76e546..3fc007333 100644 --- a/apps/routerconsole/locale-countries/messages_ja.po +++ b/apps/routerconsole/locale-countries/messages_ja.po @@ -4,14 +4,14 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# plazmism , 2013-2014 +# タカハシ , 2013-2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-02-05 11:54+0000\n" -"Last-Translator: plazmism \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,6 +52,9 @@ msgstr "オランダ領アンティル諸島" msgid "Angola" msgstr "アンゴラ" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "南極" @@ -103,6 +106,9 @@ msgstr "ブルンジ" msgid "Benin" msgstr "ベナン" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "バミューダ" @@ -112,6 +118,9 @@ msgstr "ブルネイ・ダルサラーム" msgid "Bolivia" msgstr "ボリビア" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "ブラジル" @@ -139,15 +148,12 @@ msgstr "カナダ" msgid "Cocos (Keeling) Islands" msgstr "ココス（キーリング）諸島" -msgid "The Democratic Republic of the Congo" -msgstr "コンゴ民主共和国" +msgid "Congo" +msgstr "コンゴ" msgid "Central African Republic" msgstr "中央アフリカ共和国" -msgid "Congo" -msgstr "コンゴ" - msgid "Switzerland" msgstr "スイス" @@ -244,8 +250,8 @@ msgstr "フィジー" msgid "Falkland Islands (Malvinas)" msgstr "フォークランド諸島 (マルビナス)" -msgid "Federated States of Micronesia" -msgstr "ミクロネシア連邦" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "フェロー諸島" @@ -346,8 +352,8 @@ msgstr "イギリス領インド洋地域" msgid "Iraq" msgstr "イラク" -msgid "Islamic Republic of Iran" -msgstr "イラン・イスラム共和国" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "アイスランド" @@ -385,8 +391,8 @@ msgstr "コモロ" msgid "Saint Kitts and Nevis" msgstr "セントクリストファー・ネイビス" -msgid "The Democratic People's Republic of Korea" -msgstr "朝鮮民主主義人民共和国" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "大韓民国" @@ -430,8 +436,8 @@ msgstr "ルクセンブルク" msgid "Latvia" msgstr "ラトビア" -msgid "Libyan Arab Jamahiriya" -msgstr "リビア" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "モロッコ" @@ -439,8 +445,8 @@ msgstr "モロッコ" msgid "Monaco" msgstr "モナコ" -msgid "Republic of Moldova" -msgstr "モルダビア共和国" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "モンテネグロ" @@ -454,8 +460,8 @@ msgstr "マダガスカル" msgid "Marshall Islands" msgstr "マーシャル諸島" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "マケドニア・旧ユーゴスラビア共和国" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "マリ" @@ -466,8 +472,8 @@ msgstr "ミャンマー" msgid "Mongolia" msgstr "モンゴル" -msgid "Macao" -msgstr "マカオ" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "北マリアナ諸島連邦" @@ -646,14 +652,20 @@ msgstr "ソマリア" msgid "Suriname" msgstr "スリナム" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "サントメ・プリンシペ" msgid "El Salvador" msgstr "エルサルバドル" -msgid "Syrian Arab Republic" -msgstr "シリア・アラブ共和国" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "スワジランド" @@ -703,8 +715,8 @@ msgstr "ツバル" msgid "Taiwan" msgstr "台湾" -msgid "United Republic of Tanzania" -msgstr "タンザニア連合共和国" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "ウクライナ" @@ -724,8 +736,8 @@ msgstr "ウルグアイ" msgid "Uzbekistan" msgstr "ウズベキスタン" -msgid "Holy See (Vatican City State)" -msgstr "教皇庁 (ヴァチカン市国)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "セントビンセントおよびグレナディーン諸島" @@ -736,8 +748,8 @@ msgstr "ベネズエラ" msgid "Virgin Islands" msgstr "バージン諸島" -msgid "Viet Nam" -msgstr "ベトナム" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "バヌアツ" diff --git a/apps/routerconsole/locale-countries/messages_mg.po b/apps/routerconsole/locale-countries/messages_mg.po index ce383e3f7..bf5800abd 100644 --- a/apps/routerconsole/locale-countries/messages_mg.po +++ b/apps/routerconsole/locale-countries/messages_mg.po @@ -2,22 +2,21 @@ # 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 -# +# # Translators: # topdog101 , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-30 19:59+0000\n" -"PO-Revision-Date: 2014-02-20 15:52+0000\n" -"Last-Translator: topdog101 \n" -"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/" -"mg/)\n" -"Language: mg\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Malagasy (http://www.transifex.com/projects/p/I2P/language/mg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: mg\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Anonymous Proxy" @@ -53,6 +52,9 @@ msgstr "Antilles Holandiana" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Faitra Atsimo indrindra" @@ -104,6 +106,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermudes" @@ -113,6 +118,9 @@ msgstr "Brunei Daresalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Firenena Braziliana" @@ -140,15 +148,12 @@ msgstr "Firenena kanadiana" msgid "Cocos (Keeling) Islands" msgstr "Nosy Cocos(Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "Repoblika Demokratikan'i Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Repoblikan'i Afrika Afovoany" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Soisy" @@ -245,8 +250,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Nosy Falkland (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Firenena Federaly an'i Mikronesia" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Nosy Faroe" @@ -347,8 +352,8 @@ msgstr "Tany Anglisy ety amin'ny Ranomasina Indiana" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Repoblika Islamika an'i Iran" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Iceland" @@ -386,8 +391,8 @@ msgstr "Kaomoro" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts sy Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Repoblika Demokratika entim'bahoakan'i Korea" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Repoblikan'i Korea" @@ -431,8 +436,8 @@ msgstr "Luxembourg" msgid "Latvia" msgstr "Latvia" -msgid "Libyan Arab Jamahiriya" -msgstr "Jamahiriya Libiana" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Firenena Marokana" @@ -440,8 +445,8 @@ msgstr "Firenena Marokana" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Repoblikan'i Moldova " +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -455,8 +460,8 @@ msgstr "Madagasikara" msgid "Marshall Islands" msgstr "Nosy Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Repoblikan'i Masedonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -467,8 +472,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Nosy Mariana Avaratra" @@ -647,14 +652,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome sy Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Repoblika Arabo Syriana" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swaziland" @@ -704,8 +715,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Repoblika Mitambatr'i Tanzania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Firenena Okrainiana" @@ -725,8 +736,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Ozbekistana" -msgid "Holy See (Vatican City State)" -msgstr "Tany masina (Vatikana)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent sy ny Grenadines" @@ -737,8 +748,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Nosy Virgin" -msgid "Viet Nam" -msgstr "Firenena Vietnamiana" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_nb.po b/apps/routerconsole/locale-countries/messages_nb.po index 2e5f3f377..a7de1cebc 100644 --- a/apps/routerconsole/locale-countries/messages_nb.po +++ b/apps/routerconsole/locale-countries/messages_nb.po @@ -4,15 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Allan Nordhøy , 2014 +# Allan Nordhøy , 2014 # Mikal , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-06-24 22:44+0000\n" -"Last-Translator: Allan Nordhøy \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,6 +53,9 @@ msgstr "Netherlands Antilles" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarctica" @@ -104,6 +107,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -113,6 +119,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brazil" @@ -140,15 +149,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Kokos (Keeling) -øyene" -msgid "The Democratic Republic of the Congo" -msgstr "Den demokratiske republikken Kongo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Den sentralafrikanske republikk" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Switzerland" @@ -245,8 +251,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Falkland Islands (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Federated States of Micronesia" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Faroe Islands" @@ -347,8 +353,8 @@ msgstr "British Indian Ocean Territory" msgid "Iraq" msgstr "Iraq" -msgid "Islamic Republic of Iran" -msgstr "Iran" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Island" @@ -386,8 +392,8 @@ msgstr "Comoros" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts og Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Nord-Korea" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Korea" @@ -431,8 +437,8 @@ msgstr "Luxembourg" msgid "Latvia" msgstr "Latvia" -msgid "Libyan Arab Jamahiriya" -msgstr "Libyan Arab Jamahiriya" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Morocco" @@ -440,8 +446,8 @@ msgstr "Morocco" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Republic of Moldova" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -455,8 +461,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Marshall Islands" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "The Former Yugoslav Republic of Macedonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -467,8 +473,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Nord-Marianene" @@ -647,14 +653,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome og Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Swaziland" @@ -704,8 +716,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "United Republic of Tanzania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraina" @@ -725,8 +737,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Holy See (Vatican City State)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent and the Grenadines" @@ -737,8 +749,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Virgin Islands" -msgid "Viet Nam" -msgstr "Viet Nam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_nl.po b/apps/routerconsole/locale-countries/messages_nl.po index 5a15f2b40..123f5d63b 100644 --- a/apps/routerconsole/locale-countries/messages_nl.po +++ b/apps/routerconsole/locale-countries/messages_nl.po @@ -9,14 +9,15 @@ # foo , 2009 # Jrnr601 , 2012 # Desirius , 2014 +# Nathan Follens, 2015 # attesor , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-07-02 12:22+0000\n" -"Last-Translator: Desirius \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-25 16:54+0000\n" +"Last-Translator: Nathan Follens\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,6 +58,9 @@ msgstr "Nederlandse Antillen" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarctica" @@ -108,6 +112,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "Sint-Bartholomeus" + msgid "Bermuda" msgstr "Bermuda" @@ -117,6 +124,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brazilië" @@ -144,15 +154,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Cocoseilanden (Keelingeilanden)" -msgid "The Democratic Republic of the Congo" -msgstr "Congo, Democratische Republiek" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Centraal-Afrikaanse Republiek" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Zwitserland" @@ -249,8 +256,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Falklandeilanden" -msgid "Federated States of Micronesia" -msgstr "Federale Staten van Micronesia" +msgid "Micronesia" +msgstr "Micronesië" msgid "Faroe Islands" msgstr "Faeröer" @@ -351,8 +358,8 @@ msgstr "Brits Territorium in de Indische Oceaan" msgid "Iraq" msgstr "Iraq" -msgid "Islamic Republic of Iran" -msgstr "Islamitische Republiek Iran" +msgid "Iran" +msgstr "Iran" msgid "Iceland" msgstr "IJsland" @@ -390,8 +397,8 @@ msgstr "Comoren" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts en Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "De Democratische Volksrepubliek Korea" +msgid "North Korea" +msgstr "Noord-Korea" msgid "Republic of Korea" msgstr "Republiek Korea" @@ -435,7 +442,7 @@ msgstr "Luxemburg" msgid "Latvia" msgstr "Letland" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "Libië" msgid "Morocco" @@ -444,8 +451,8 @@ msgstr "Marokko" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Republiek Moldavië" +msgid "Moldova" +msgstr "Moldavië" msgid "Montenegro" msgstr "Montenegro" @@ -459,8 +466,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshalleilanden" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Voormalige Joegoslavische Republiek Macedonië" +msgid "Macedonia" +msgstr "Macedonië" msgid "Mali" msgstr "Mali" @@ -471,7 +478,7 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolië" -msgid "Macao" +msgid "Macau" msgstr "Macau" msgid "Northern Mariana Islands" @@ -651,13 +658,19 @@ msgstr "Somalië" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "Zuid-Soedan" + msgid "Sao Tome and Principe" msgstr "Sao Tomé en Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "Sint Maarten" + +msgid "Syria" msgstr "Syrië" msgid "Swaziland" @@ -708,8 +721,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Verenigde Republiek Tanzania" +msgid "Tanzania" +msgstr "Tanzanië" msgid "Ukraine" msgstr "Oekraïne" @@ -729,7 +742,7 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Oezbekistan" -msgid "Holy See (Vatican City State)" +msgid "Vatican" msgstr "Vaticaanstad" msgid "Saint Vincent and the Grenadines" @@ -741,8 +754,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Virgin-eilanden" -msgid "Viet Nam" -msgstr "Viet Nam" +msgid "Vietnam" +msgstr "Vietnam" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_pl.po b/apps/routerconsole/locale-countries/messages_pl.po index 0680cc86e..077b78902 100644 --- a/apps/routerconsole/locale-countries/messages_pl.po +++ b/apps/routerconsole/locale-countries/messages_pl.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-11-23 20:42+0000\n" -"Last-Translator: polacco \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,6 +57,9 @@ msgstr "Antyle Holenderskie" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktyda" @@ -108,6 +111,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermudy" @@ -117,6 +123,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Boliwia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brazylia" @@ -144,15 +153,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Wyspy Kokosowe" -msgid "The Democratic Republic of the Congo" -msgstr "Demokratyczna Republika Konga" +msgid "Congo" +msgstr "Kongo" msgid "Central African Republic" msgstr "Republika Środkowoafrykańska" -msgid "Congo" -msgstr "Kongo" - msgid "Switzerland" msgstr "Szwajcaria" @@ -249,8 +255,8 @@ msgstr "Fidżi" msgid "Falkland Islands (Malvinas)" msgstr "Falklandy (Malwiny)" -msgid "Federated States of Micronesia" -msgstr "Mikronezja" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Wyspy Owcze" @@ -351,8 +357,8 @@ msgstr "Brytyjskie Terytorium Oceanu Indyjskiego" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Iran" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islandia" @@ -390,8 +396,8 @@ msgstr "Komory" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts i Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Korea Północna" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Korea Południowa" @@ -435,8 +441,8 @@ msgstr "Luksemburg" msgid "Latvia" msgstr "Łotwa" -msgid "Libyan Arab Jamahiriya" -msgstr "Libia" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Maroko" @@ -444,8 +450,8 @@ msgstr "Maroko" msgid "Monaco" msgstr "Monako" -msgid "Republic of Moldova" -msgstr "Mołdawia" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Czarnogóra" @@ -459,8 +465,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Wyspy Marshalla" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Macedonia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -471,8 +477,8 @@ msgstr "Mjanma" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Makao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Mariany Północne" @@ -651,14 +657,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Wyspy Świętego Tomasza i Książęca" msgid "El Salvador" msgstr "Salwador" -msgid "Syrian Arab Republic" -msgstr "Syria" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Suazi" @@ -708,8 +720,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Republika Chińska" -msgid "United Republic of Tanzania" -msgstr "Tanzania" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraina" @@ -729,8 +741,8 @@ msgstr "Urugwaj" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Watykan" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent i Grenadyny" @@ -741,8 +753,8 @@ msgstr "Wenezuela" msgid "Virgin Islands" msgstr "Wyspy Dziewicze" -msgid "Viet Nam" -msgstr "Wietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_pt.po b/apps/routerconsole/locale-countries/messages_pt.po index 2a89b0f60..d744d7ccf 100644 --- a/apps/routerconsole/locale-countries/messages_pt.po +++ b/apps/routerconsole/locale-countries/messages_pt.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2015-03-02 15:19+0000\n" -"Last-Translator: alfalb.as\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,6 +57,9 @@ msgstr "Antilhas Holandesas" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antártica" @@ -108,6 +111,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermudas" @@ -117,6 +123,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolívia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brasil" @@ -144,15 +153,12 @@ msgstr "Canadá" msgid "Cocos (Keeling) Islands" msgstr "Ilhas Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "A Republica Democrata do Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Republica Central Africana" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Suíça" @@ -249,8 +255,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Ilhas Falkland (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Estados Federados da Micronésia" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Ilhas Faroe" @@ -351,8 +357,8 @@ msgstr "Território Oceânico Indiano Britânico" msgid "Iraq" msgstr "Iraque" -msgid "Islamic Republic of Iran" -msgstr "Republica Islâmica do Irão" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islândia" @@ -390,8 +396,8 @@ msgstr "Comores" msgid "Saint Kitts and Nevis" msgstr "São Cristóvão e Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Coreia do Norte" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "República da Koreia" @@ -435,8 +441,8 @@ msgstr "Luxemburgo" msgid "Latvia" msgstr "Látvia" -msgid "Libyan Arab Jamahiriya" -msgstr "Líbia" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Marrocos" @@ -444,8 +450,8 @@ msgstr "Marrocos" msgid "Monaco" msgstr "Mónaco" -msgid "Republic of Moldova" -msgstr "República da Moldávia" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -459,8 +465,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Ilhas Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr " Antiga República Jugoslava da Macedónia" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -471,8 +477,8 @@ msgstr "Mianmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macau" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Ilhas Marianas do Norte" @@ -651,14 +657,20 @@ msgstr "Somália" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "São Tomé e Princípe" msgid "El Salvador" msgstr "São Salvador" -msgid "Syrian Arab Republic" -msgstr "Siria" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Suazilândia" @@ -708,8 +720,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "República Unida da Tanzânia" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ucrânia" @@ -729,8 +741,8 @@ msgstr "Uruguaí" msgid "Uzbekistan" msgstr "Uzbequistão" -msgid "Holy See (Vatican City State)" -msgstr "Santa Sé (Vaticano)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "São Vicente e Granadinas" @@ -741,8 +753,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Ilhas Virgens" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_pt_BR.po b/apps/routerconsole/locale-countries/messages_pt_BR.po index 53eb1741f..63253b149 100644 --- a/apps/routerconsole/locale-countries/messages_pt_BR.po +++ b/apps/routerconsole/locale-countries/messages_pt_BR.po @@ -5,13 +5,14 @@ # # Translators: # blueboy, 2013 +# blueboy, 2015 # blueboy, 2013-2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-02-13 13:04+0000\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-26 13:36+0000\n" "Last-Translator: blueboy\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -39,7 +40,7 @@ msgid "Antigua and Barbuda" msgstr "Antígua e Barbuda" msgid "Anguilla" -msgstr "Anguilla" +msgstr "Anguila" msgid "Albania" msgstr "Albânia" @@ -53,6 +54,9 @@ msgstr "Antilhas Holandesas" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Ásia/Região do Pacífico" + msgid "Antarctica" msgstr "Antártica" @@ -104,6 +108,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benim" +msgid "Saint Barthélemy" +msgstr "São Bartolomeu" + msgid "Bermuda" msgstr "Bermudas" @@ -113,6 +120,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolívia" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brasil" @@ -140,15 +150,12 @@ msgstr "Canadá" msgid "Cocos (Keeling) Islands" msgstr "Ilhas Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "República Democrática do Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "República Centro-Africana" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Suíça" @@ -245,8 +252,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Malvinas (Ilhas Falkland)" -msgid "Federated States of Micronesia" -msgstr "Estados Federados da Micronésia" +msgid "Micronesia" +msgstr "Micronésia" msgid "Faroe Islands" msgstr "Ilhas Faroé" @@ -347,7 +354,7 @@ msgstr "Território Britânico do Oceano Índico" msgid "Iraq" msgstr "Iraque" -msgid "Islamic Republic of Iran" +msgid "Iran" msgstr "Irã" msgid "Iceland" @@ -386,7 +393,7 @@ msgstr "Comores" msgid "Saint Kitts and Nevis" msgstr "São Cristóvão e Nevis" -msgid "The Democratic People's Republic of Korea" +msgid "North Korea" msgstr "Coreia do Norte" msgid "Republic of Korea" @@ -431,7 +438,7 @@ msgstr "Luxemburgo" msgid "Latvia" msgstr "Letônia" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "Líbia" msgid "Morocco" @@ -440,7 +447,7 @@ msgstr "Marrocos" msgid "Monaco" msgstr "Mônaco" -msgid "Republic of Moldova" +msgid "Moldova" msgstr "Moldávia" msgid "Montenegro" @@ -455,7 +462,7 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Ilhas Marshall" -msgid "The Former Yugoslav Republic of Macedonia" +msgid "Macedonia" msgstr "Macedônia" msgid "Mali" @@ -467,7 +474,7 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongólia" -msgid "Macao" +msgid "Macau" msgstr "Macau" msgid "Northern Mariana Islands" @@ -647,13 +654,19 @@ msgstr "Somália" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "Sudão do Sul" + msgid "Sao Tome and Principe" msgstr "São Tomé e Príncipe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "São Martinho" + +msgid "Syria" msgstr "Síria" msgid "Swaziland" @@ -704,7 +717,7 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" +msgid "Tanzania" msgstr "Tanzânia" msgid "Ukraine" @@ -725,8 +738,8 @@ msgstr "Uruguai" msgid "Uzbekistan" msgstr "Uzbequistão" -msgid "Holy See (Vatican City State)" -msgstr "Santa Sé (Cidade do Vaticano)" +msgid "Vatican" +msgstr "Vaticano" msgid "Saint Vincent and the Grenadines" msgstr "São Vicente e Granadinas" @@ -737,7 +750,7 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Ilhas Virgens" -msgid "Viet Nam" +msgid "Vietnam" msgstr "Vietnã" msgid "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_ro.po b/apps/routerconsole/locale-countries/messages_ro.po index 8856de04b..0bb161568 100644 --- a/apps/routerconsole/locale-countries/messages_ro.po +++ b/apps/routerconsole/locale-countries/messages_ro.po @@ -2,24 +2,23 @@ # 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 -# +# # Translators: -# CimpianAlin , 2013 +# CimpianAlin , 2013 +# titus , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:02+0000\n" -"PO-Revision-Date: 2013-11-06 09:54+0000\n" -"Last-Translator: polearnik \n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/" -"ro/)\n" -"Language: ro\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-19 20:01+0000\n" +"Last-Translator: titus \n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" -"2:1));\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" msgid "Anonymous Proxy" msgstr "Proxy anonim" @@ -54,6 +53,9 @@ msgstr "Antilele Olandeze" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Regiunea Asia/Pacific" + msgid "Antarctica" msgstr "Antarctica" @@ -105,6 +107,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "Saint Barthélemy" + msgid "Bermuda" msgstr "Bermuda" @@ -114,6 +119,9 @@ msgstr "Brunei Darussalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brazilia" @@ -141,15 +149,12 @@ msgstr "Canada" msgid "Cocos (Keeling) Islands" msgstr "Insulele Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "Republica Democrată Congo" +msgid "Congo" +msgstr "Congo" msgid "Central African Republic" msgstr "Republica Central Africană" -msgid "Congo" -msgstr "Congo" - msgid "Switzerland" msgstr "Elveția" @@ -246,8 +251,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Insulele Falkland (Malvine)" -msgid "Federated States of Micronesia" -msgstr "Statele Federate ale Microneziei" +msgid "Micronesia" +msgstr "Micronesia" msgid "Faroe Islands" msgstr "Insulele Feroe" @@ -348,8 +353,8 @@ msgstr "British Indian Ocean Territory" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Republica Islamică Iran" +msgid "Iran" +msgstr "Iran" msgid "Iceland" msgstr "Islanda" @@ -387,8 +392,8 @@ msgstr "Comore" msgid "Saint Kitts and Nevis" msgstr "Sfântul Kitts și Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Republica Populară Democrată Coreea" +msgid "North Korea" +msgstr "Korea de Nord" msgid "Republic of Korea" msgstr "Republica Coreea" @@ -432,8 +437,8 @@ msgstr "Luxemburg" msgid "Latvia" msgstr "Letonia" -msgid "Libyan Arab Jamahiriya" -msgstr "Jamahiriya Arabă Libiană" +msgid "Libya" +msgstr "Libia" msgid "Morocco" msgstr "Maroc" @@ -441,8 +446,8 @@ msgstr "Maroc" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" -msgstr "Republica Moldova" +msgid "Moldova" +msgstr "Moldova" msgid "Montenegro" msgstr "Muntenegru" @@ -456,8 +461,8 @@ msgstr "Madagascar" msgid "Marshall Islands" msgstr "Insulele Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Fosta Republică Iugoslavă a Macedoniei" +msgid "Macedonia" +msgstr "Macedonia" msgid "Mali" msgstr "Mali" @@ -468,8 +473,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "Macau" msgid "Northern Mariana Islands" msgstr "Insulele Mariane de Nord" @@ -648,14 +653,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Suriname" +msgid "South Sudan" +msgstr "Sudanul de Sud" + msgid "Sao Tome and Principe" msgstr "Sao Tome și Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Republica Arabă Siriană" +msgid "Sint Maarten" +msgstr "Sint Maarten" + +msgid "Syria" +msgstr "Siria" msgid "Swaziland" msgstr "Swaziland" @@ -705,8 +716,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Republica Unită Tanzania" +msgid "Tanzania" +msgstr "Tanzania" msgid "Ukraine" msgstr "Ucraina" @@ -726,8 +737,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Sfântul Scaun (Cetatea Vaticanului)" +msgid "Vatican" +msgstr "Vatican" msgid "Saint Vincent and the Grenadines" msgstr "Sfântul Vincent și Grenadine" @@ -738,7 +749,7 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Insulele Virgine" -msgid "Viet Nam" +msgid "Vietnam" msgstr "Vietnam" msgid "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_ru.po b/apps/routerconsole/locale-countries/messages_ru.po index af0e8a11f..59861c683 100644 --- a/apps/routerconsole/locale-countries/messages_ru.po +++ b/apps/routerconsole/locale-countries/messages_ru.po @@ -2,33 +2,29 @@ # 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 -# +# # Translators: # Alexey Solomin , 2013 -# Андрей Лукьяненко , 2013 -# keedley , 2013 # ducki2p , 2011 -# varnav, 2013 # foo , 2009 -# gmind, 2013 -# gmind, 2012 -# Roman Azarenko , 2013 -# Roman Azarenko , 2013 +# gmind, 2012-2013 +# dimi , 2013 +# Foster Snowhill, 2013 +# varnav, 2013 +# Andrey Lukyanenko , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-09-23 20:40+0000\n" -"Last-Translator: keedley \n" -"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/" -"language/ru_RU/)\n" -"Language: ru_RU\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: ru_RU\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" msgid "Anonymous Proxy" msgstr "Анонимный прокси" @@ -63,6 +59,9 @@ msgstr "Нидерландские Антильские острова" msgid "Angola" msgstr "Ангола" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Антарктида" @@ -114,6 +113,9 @@ msgstr "Бурунди" msgid "Benin" msgstr "Бенин" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Бермудские Острова" @@ -123,6 +125,9 @@ msgstr "Бруней-Даруссалам" msgid "Bolivia" msgstr "Боливия" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Бразилия" @@ -150,15 +155,12 @@ msgstr "Канада" msgid "Cocos (Keeling) Islands" msgstr "Кокосовые (Килинг) острова" -msgid "The Democratic Republic of the Congo" -msgstr "Демократическая Республика Конго" +msgid "Congo" +msgstr "Конго" msgid "Central African Republic" msgstr "Центральноафриканская Республика" -msgid "Congo" -msgstr "Конго" - msgid "Switzerland" msgstr "Швейцария" @@ -255,8 +257,8 @@ msgstr "Фиджи" msgid "Falkland Islands (Malvinas)" msgstr "Фолклендские (Мальвинские) острова" -msgid "Federated States of Micronesia" -msgstr "Федеративные Штаты Микронезии" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Фарерские острова" @@ -357,8 +359,8 @@ msgstr "Британская территория в Индийском океа msgid "Iraq" msgstr "Ирак" -msgid "Islamic Republic of Iran" -msgstr "Исламская Республика Иран" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Исландия" @@ -396,8 +398,8 @@ msgstr "Коморские острова" msgid "Saint Kitts and Nevis" msgstr "Сент-Китс и Невис" -msgid "The Democratic People's Republic of Korea" -msgstr "Корейская Народная Демократиеская Республика" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Республика Корея" @@ -441,8 +443,8 @@ msgstr "Люксембург" msgid "Latvia" msgstr "Латвия" -msgid "Libyan Arab Jamahiriya" -msgstr "Ливийская Арабская Джамахирия" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Марокко" @@ -450,8 +452,8 @@ msgstr "Марокко" msgid "Monaco" msgstr "Монако" -msgid "Republic of Moldova" -msgstr "Республика Молдова" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Черногория" @@ -465,8 +467,8 @@ msgstr "Мадагаскар" msgid "Marshall Islands" msgstr "Маршалловы Острова" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Бывшая югославская Республика Македония" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Мали" @@ -477,8 +479,8 @@ msgstr "Мьянма" msgid "Mongolia" msgstr "Монголия" -msgid "Macao" -msgstr "Макао" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Северные Марианские острова" @@ -657,14 +659,20 @@ msgstr "Сомали" msgid "Suriname" msgstr "Суринам" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Сан-Томе и Принсипи" msgid "El Salvador" msgstr "Сальвадор" -msgid "Syrian Arab Republic" -msgstr "Сирийская Арабская Республика" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Свазиленд" @@ -714,8 +722,8 @@ msgstr "Тувалу" msgid "Taiwan" msgstr "Тайвань" -msgid "United Republic of Tanzania" -msgstr "Объединенная Республика Танзания" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Украина" @@ -735,8 +743,8 @@ msgstr "Уругвай" msgid "Uzbekistan" msgstr "Узбекистан" -msgid "Holy See (Vatican City State)" -msgstr "Святой Престол (Ватикан)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Сент-Винсент и Гренадины" @@ -747,8 +755,8 @@ msgstr "Венесуэла" msgid "Virgin Islands" msgstr "Виргинские острова" -msgid "Viet Nam" -msgstr "Вьетнам" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Вануату" @@ -773,4 +781,3 @@ msgstr "Замбия" msgid "Zimbabwe" msgstr "Зимбабве" - diff --git a/apps/routerconsole/locale-countries/messages_sk.po b/apps/routerconsole/locale-countries/messages_sk.po index 5d205dd20..131876c96 100644 --- a/apps/routerconsole/locale-countries/messages_sk.po +++ b/apps/routerconsole/locale-countries/messages_sk.po @@ -4,14 +4,14 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Svistwarrior273 , 2014 +# Roman 'Kaktuxista' Benji , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-04-12 08:54+0000\n" -"Last-Translator: Svistwarrior273 \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,6 +52,9 @@ msgstr "Holandské Antily" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktída" @@ -103,6 +106,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermudy" @@ -112,6 +118,9 @@ msgstr "Brunej" msgid "Bolivia" msgstr "Bolívia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brazília" @@ -139,15 +148,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kokosové ostrovy" -msgid "The Democratic Republic of the Congo" -msgstr "Konžská demokratická republika" +msgid "Congo" +msgstr "Kongo" msgid "Central African Republic" msgstr "Stredoafrická republika" -msgid "Congo" -msgstr "Kongo" - msgid "Switzerland" msgstr "Švajčiarsko" @@ -244,8 +250,8 @@ msgstr "Fidži" msgid "Falkland Islands (Malvinas)" msgstr "Falklandy (Malvíny)" -msgid "Federated States of Micronesia" -msgstr "Mikronézske federatívne štáty" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Faerské ostrovy" @@ -346,8 +352,8 @@ msgstr "Britské indickooceánske územie" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Iránska islamská republika" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Island" @@ -385,8 +391,8 @@ msgstr "Komory" msgid "Saint Kitts and Nevis" msgstr "Svätý Krištof a Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Kórejská ľudovodemokratická republika" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Kórejská republika" @@ -430,8 +436,8 @@ msgstr "Luxembursko" msgid "Latvia" msgstr "Lotyšsko" -msgid "Libyan Arab Jamahiriya" -msgstr "Líbya" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Maroko" @@ -439,8 +445,8 @@ msgstr "Maroko" msgid "Monaco" msgstr "Monako" -msgid "Republic of Moldova" -msgstr "Moldavská republika" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Montenegro" @@ -454,8 +460,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshallove ostrovy" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Bývalá juhoslovanská republika Macedónsko" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -466,8 +472,8 @@ msgstr "Mjanmarsko" msgid "Mongolia" msgstr "Mongolsko" -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Severné Mariány" @@ -646,14 +652,20 @@ msgstr "Somálsko" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Svätý Tomáš a Princov ostrov" msgid "El Salvador" msgstr "Salvádor" -msgid "Syrian Arab Republic" -msgstr "Sýrska arabská republika" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Svazijsko" @@ -703,8 +715,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Tanzánijská zjednotená republika" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukrajina" @@ -724,8 +736,8 @@ msgstr "Uruguaj" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Vatikánsky mestský štát" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Svätý Vincent a Grenadíny" @@ -736,8 +748,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Panenské ostrovy" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_sq.po b/apps/routerconsole/locale-countries/messages_sq.po index 76b137186..9ebfab4ac 100644 --- a/apps/routerconsole/locale-countries/messages_sq.po +++ b/apps/routerconsole/locale-countries/messages_sq.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-08-11 06:06+0000\n" -"Last-Translator: Shpetim \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/I2P/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,6 +52,9 @@ msgstr "Antilet Holandeze" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktida" @@ -103,6 +106,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benini" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -112,6 +118,9 @@ msgstr "Brunei Darusalam" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brazili" @@ -139,15 +148,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Ishujt Cocos (Keeling)" -msgid "The Democratic Republic of the Congo" -msgstr "Republika Demokratike e Kongos" +msgid "Congo" +msgstr "Kongo" msgid "Central African Republic" msgstr "Republika e Afrikës Qëndrore. " -msgid "Congo" -msgstr "Kongo" - msgid "Switzerland" msgstr "Zvicrra" @@ -244,8 +250,8 @@ msgstr "Fixhi" msgid "Falkland Islands (Malvinas)" msgstr "Ishujt Falkand (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Shtetet Federate të Mikronezisë " +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Ishujt Faroe" @@ -346,8 +352,8 @@ msgstr "Territor oqeanik Indiano-Britanik" msgid "Iraq" msgstr "Iraku" -msgid "Islamic Republic of Iran" -msgstr "Republika Islamike e Iranit" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Islanda" @@ -385,8 +391,8 @@ msgstr "Komorosi" msgid "Saint Kitts and Nevis" msgstr "Shenjt Kitts dhe Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Republika Demokratike Popullore e Koresë" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Republika e Koresë" @@ -430,8 +436,8 @@ msgstr "Luksemburgu" msgid "Latvia" msgstr "Latvia" -msgid "Libyan Arab Jamahiriya" -msgstr "Jamahiriya Libiane Arabe" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Maroko" @@ -439,8 +445,8 @@ msgstr "Maroko" msgid "Monaco" msgstr "Monako" -msgid "Republic of Moldova" -msgstr "Republika e Moldovës" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Mali i Zi" @@ -454,8 +460,8 @@ msgstr "Madagaskari" msgid "Marshall Islands" msgstr "Ishujt Marshall" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Ish-Republika Jugosllave e Maqedonisë" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -466,8 +472,8 @@ msgstr "Myanmari" msgid "Mongolia" msgstr "Mongolia" -msgid "Macao" -msgstr "Makao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Ishujt Veriorë të Marianëve" @@ -646,14 +652,20 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinami" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome dhe Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Republika Arabe e Sirisë" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Svaziland" @@ -703,8 +715,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taivani" -msgid "United Republic of Tanzania" -msgstr "Republika e Bashkuar e Tanzanisë" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukraina" @@ -724,8 +736,8 @@ msgstr "Uruguaji" msgid "Uzbekistan" msgstr "Uzbekistani" -msgid "Holy See (Vatican City State)" -msgstr "Holy See (Qytetshteti i Vatikanit) " +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Sankt Vincenti dhe Grenadinet" @@ -736,8 +748,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Ishujt Virgin" -msgid "Viet Nam" -msgstr "Vietnami" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_sv.po b/apps/routerconsole/locale-countries/messages_sv.po index 14248b54e..faf22af55 100644 --- a/apps/routerconsole/locale-countries/messages_sv.po +++ b/apps/routerconsole/locale-countries/messages_sv.po @@ -2,27 +2,24 @@ # 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 -# +# # Translators: # 123hund123 , 2011 -# hottuna , 2011 -# hottuna , 2013 -# hottuna , 2011-2012 -# Martin Svensson , 2011-2012 +# cacapo , 2015 +# hottuna , 2011,2013 # mon , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-09-22 02:56+0000\n" -"Last-Translator: hottuna \n" -"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/" -"language/sv_SE/)\n" -"Language: sv_SE\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-19 09:52+0000\n" +"Last-Translator: cacapo \n" +"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv_SE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Anonymous Proxy" @@ -58,6 +55,9 @@ msgstr "Nederländska Antillerna" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "Asien-Stillahavsregionen" + msgid "Antarctica" msgstr "Antarktis" @@ -109,6 +109,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "Saint-Barthélemy" + msgid "Bermuda" msgstr "Bermuda" @@ -118,6 +121,9 @@ msgstr "Brunei" msgid "Bolivia" msgstr "Bolivia" +msgid "Bonaire" +msgstr "Bonaire" + msgid "Brazil" msgstr "Brasilien" @@ -145,15 +151,12 @@ msgstr "Kanada" msgid "Cocos (Keeling) Islands" msgstr "Kokosöarna" -msgid "The Democratic Republic of the Congo" -msgstr "Demokratiska republiken Kongo" +msgid "Congo" +msgstr "Kongo" msgid "Central African Republic" msgstr "Centralafrikanska republiken" -msgid "Congo" -msgstr "Kongo" - msgid "Switzerland" msgstr "Schweiz" @@ -250,8 +253,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Falklandsöarna (Malvinas)" -msgid "Federated States of Micronesia" -msgstr "Mikronesiska federationen" +msgid "Micronesia" +msgstr "Mikronesien" msgid "Faroe Islands" msgstr "Färöarna" @@ -352,8 +355,8 @@ msgstr "Brittiska Indiska Oceanöarna" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "Islamiska republiken Iran" +msgid "Iran" +msgstr "Iran" msgid "Iceland" msgstr "Island" @@ -391,8 +394,8 @@ msgstr "Komorerna" msgid "Saint Kitts and Nevis" msgstr "Saint Kitts och Nevis" -msgid "The Democratic People's Republic of Korea" -msgstr "Demokratiska folkrepubliken Korea (Nordkorea)" +msgid "North Korea" +msgstr "Nordkorea" msgid "Republic of Korea" msgstr "Sydkorea" @@ -436,7 +439,7 @@ msgstr "Luxemburg" msgid "Latvia" msgstr "Lettland" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "Libyen" msgid "Morocco" @@ -445,7 +448,7 @@ msgstr "Marocko" msgid "Monaco" msgstr "Monaco" -msgid "Republic of Moldova" +msgid "Moldova" msgstr "Moldavien" msgid "Montenegro" @@ -460,8 +463,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marshallöarna" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Föredetta jugoslaviska republiken Makedonien" +msgid "Macedonia" +msgstr "Makedonien" msgid "Mali" msgstr "Mali" @@ -472,7 +475,7 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Mongoliet" -msgid "Macao" +msgid "Macau" msgstr "Macao" msgid "Northern Mariana Islands" @@ -652,13 +655,19 @@ msgstr "Somalia" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "Sydsudan" + msgid "Sao Tome and Principe" msgstr "Sao Tomé och Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "Sint Maarten" + +msgid "Syria" msgstr "Syrien" msgid "Swaziland" @@ -709,8 +718,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Taiwan" -msgid "United Republic of Tanzania" -msgstr "Förenade republiken Tanzania" +msgid "Tanzania" +msgstr "Tanzania" msgid "Ukraine" msgstr "Ukraina" @@ -730,8 +739,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Uzbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Heliga stolen (Vatikanstaten)" +msgid "Vatican" +msgstr "Vatikanen" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent och Grenadinerna" @@ -742,7 +751,7 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Jungfruöarna" -msgid "Viet Nam" +msgid "Vietnam" msgstr "Vietnam" msgid "Vanuatu" @@ -768,4 +777,3 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_tr.po b/apps/routerconsole/locale-countries/messages_tr.po index c5f926f1b..698c18650 100644 --- a/apps/routerconsole/locale-countries/messages_tr.po +++ b/apps/routerconsole/locale-countries/messages_tr.po @@ -2,31 +2,30 @@ # 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 -# +# # Translators: -# Erkin , 2013 +# Erkin Batu Altunbaş , 2013 # Kaya Zeren , 2013 -# TR_anslator , 2013 +# Trans Lator , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-08-09 07:53+0000\n" -"Last-Translator: Kaya Zeren \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/" -"language/tr_TR/)\n" -"Language: tr_TR\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Anonymous Proxy" -msgstr "" +msgstr "Anonim Vekil Sunucu" msgid "Satellite Provider" -msgstr "" +msgstr "Uydu Hizmeti Sağlayıcısı" msgid "Andorra" msgstr "Andorra" @@ -50,11 +49,14 @@ msgid "Armenia" msgstr "Ermenistan" msgid "Netherlands Antilles" -msgstr "Felemenk Antilleri" +msgstr "Hollanda Antilleri" msgid "Angola" msgstr "Angola" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Antarktika" @@ -74,7 +76,7 @@ msgid "Aruba" msgstr "Aruba" msgid "Åland Islands" -msgstr "" +msgstr "Åland Adaları" msgid "Azerbaijan" msgstr "Azerbaycan" @@ -106,6 +108,9 @@ msgstr "Burundi" msgid "Benin" msgstr "Benin" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" @@ -115,6 +120,9 @@ msgstr "Brunei Darüsselam" msgid "Bolivia" msgstr "Bolivya" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Brezilya" @@ -140,17 +148,14 @@ msgid "Canada" msgstr "Kanada" msgid "Cocos (Keeling) Islands" -msgstr "" - -msgid "The Democratic Republic of the Congo" -msgstr "Kongo Demokratik Cumhuriyeti" - -msgid "Central African Republic" -msgstr "Orta Afrika Cumhuriyeti" +msgstr "Cocos (Keeling) Adaları" msgid "Congo" msgstr "Kongo" +msgid "Central African Republic" +msgstr "Orta Afrika Cumhuriyeti" + msgid "Switzerland" msgstr "İsviçre" @@ -176,7 +181,7 @@ msgid "Costa Rica" msgstr "Kosta Rika" msgid "Serbia and Montenegro" -msgstr "" +msgstr "Sırbistan - Karadağ" msgid "Cuba" msgstr "Küba" @@ -185,10 +190,10 @@ msgid "Cape Verde" msgstr "Yeşil Burun Adaları" msgid "Curaçao" -msgstr "" +msgstr "Curaçao" msgid "Christmas Island" -msgstr "" +msgstr "Christmas Adaları" msgid "Cyprus" msgstr "Kıbrıs" @@ -224,7 +229,7 @@ msgid "Egypt" msgstr "Mısır" msgid "Western Sahara" -msgstr "" +msgstr "Batı Sahra" msgid "Eritrea" msgstr "Eritre" @@ -236,7 +241,7 @@ msgid "Ethiopia" msgstr "Etiyopya" msgid "European Union" -msgstr "" +msgstr "Avrupa Birliği" msgid "Finland" msgstr "Finlandiya" @@ -247,8 +252,8 @@ msgstr "Fiji" msgid "Falkland Islands (Malvinas)" msgstr "Falkland Adaları (Malvinalar)" -msgid "Federated States of Micronesia" -msgstr "Mikronezya Federe Devletleri" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Faroe Adaları" @@ -272,7 +277,7 @@ msgid "French Guiana" msgstr "Fransız Guyanası" msgid "Guernsey" -msgstr "" +msgstr "Guerney" msgid "Ghana" msgstr "Gana" @@ -290,7 +295,7 @@ msgid "Guinea" msgstr "Gine" msgid "Guadeloupe" -msgstr "Guadlup" +msgstr "Guadalup" msgid "Equatorial Guinea" msgstr "Ekvator Ginesi" @@ -338,7 +343,7 @@ msgid "Israel" msgstr "İsrail" msgid "Isle of Man" -msgstr "" +msgstr "Isle of Man Adası" msgid "India" msgstr "Hindistan" @@ -349,8 +354,8 @@ msgstr "İngiliz Hint Okyanus Bölgesi" msgid "Iraq" msgstr "Irak" -msgid "Islamic Republic of Iran" -msgstr "İslami İran Cumhuriyeti" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "İzlanda" @@ -359,7 +364,7 @@ msgid "Italy" msgstr "İtalya" msgid "Jersey" -msgstr "" +msgstr "Cersey" msgid "Jamaica" msgstr "Jamaika" @@ -388,7 +393,7 @@ msgstr "Komorolar" msgid "Saint Kitts and Nevis" msgstr "Aziz Kitts ve Nevis" -msgid "The Democratic People's Republic of Korea" +msgid "North Korea" msgstr "" msgid "Republic of Korea" @@ -433,8 +438,8 @@ msgstr "Lüksemburg" msgid "Latvia" msgstr "Letonya" -msgid "Libyan Arab Jamahiriya" -msgstr "Libya Arap Cumhuriyeti" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Fas" @@ -442,14 +447,14 @@ msgstr "Fas" msgid "Monaco" msgstr "Monako" -msgid "Republic of Moldova" -msgstr "Moldova Cumhuriyeti" +msgid "Moldova" +msgstr "" msgid "Montenegro" -msgstr "" +msgstr "Karadağ" msgid "Saint Martin" -msgstr "" +msgstr "Aziz Martin" msgid "Madagascar" msgstr "Madagaskar" @@ -457,8 +462,8 @@ msgstr "Madagaskar" msgid "Marshall Islands" msgstr "Marşal Adaları" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Makedonya Eski Yugoslav Cumhuriyeti" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Mali" @@ -469,8 +474,8 @@ msgstr "Myanmar" msgid "Mongolia" msgstr "Moğolistan" -msgid "Macao" -msgstr "Makao" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Kuzey Mariyana Adaları" @@ -482,7 +487,7 @@ msgid "Mauritania" msgstr "Moritanya" msgid "Montserrat" -msgstr "Montserrat" +msgstr "Monserat" msgid "Malta" msgstr "Malta" @@ -524,7 +529,7 @@ msgid "Nicaragua" msgstr "Nikaragua" msgid "Netherlands" -msgstr "Felemenk" +msgstr "Hollanda" msgid "Norway" msgstr "Norveç" @@ -569,7 +574,7 @@ msgid "Saint Pierre and Miquelon" msgstr "Aziz Piyer ve Mikelon" msgid "Pitcairn Islands" -msgstr "" +msgstr "Pitcairn Adaları" msgid "Puerto Rico" msgstr "Porto Riko" @@ -590,7 +595,7 @@ msgid "Qatar" msgstr "Katar" msgid "Réunion" -msgstr "" +msgstr "Réunion" msgid "Romania" msgstr "Romanya" @@ -623,13 +628,13 @@ msgid "Singapore" msgstr "Singapur" msgid "Saint Helena" -msgstr "" +msgstr "Aziz Helena" msgid "Slovenia" msgstr "Slovenya" msgid "Svalbard and Jan Mayen" -msgstr "" +msgstr "Svalbard ve Jan Mayen" msgid "Slovakia" msgstr "Slovakya" @@ -649,14 +654,20 @@ msgstr "Somali" msgid "Suriname" msgstr "Surinam" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome ve Principe" msgid "El Salvador" msgstr "El Salvador" -msgid "Syrian Arab Republic" -msgstr "Suriye Arap Cumhuriyeti" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Svaziland" @@ -668,7 +679,7 @@ msgid "Chad" msgstr "Çad" msgid "French Southern Territories" -msgstr "Fransız Güney Bölgeleri" +msgstr "Güney Fransa Bölgeleri" msgid "Togo" msgstr "Togo" @@ -706,8 +717,8 @@ msgstr "Tuvalu" msgid "Taiwan" msgstr "Tayva" -msgid "United Republic of Tanzania" -msgstr "Tanzanya Birleşik Cumhuriyeti" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Ukrayna" @@ -727,8 +738,8 @@ msgstr "Uruguay" msgid "Uzbekistan" msgstr "Özbekistan" -msgid "Holy See (Vatican City State)" -msgstr "Kutsal Makam (Vatikan Şehir Devleti)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Aziz Vincent ve Granadinler" @@ -739,8 +750,8 @@ msgstr "Venezuela" msgid "Virgin Islands" msgstr "Virgin Adaları" -msgid "Viet Nam" -msgstr "Vietnam" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Vanuatu" @@ -765,4 +776,3 @@ msgstr "Zambiya" msgid "Zimbabwe" msgstr "Zimbabve" - diff --git a/apps/routerconsole/locale-countries/messages_uk.po b/apps/routerconsole/locale-countries/messages_uk.po index 656243e9e..46fea5e02 100644 --- a/apps/routerconsole/locale-countries/messages_uk.po +++ b/apps/routerconsole/locale-countries/messages_uk.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:33+0000\n" -"PO-Revision-Date: 2014-07-18 21:09+0000\n" -"Last-Translator: LinuxChata\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,6 +52,9 @@ msgstr "Нідерландські Антильські острови" msgid "Angola" msgstr "Ангола" +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Антарктика" @@ -103,6 +106,9 @@ msgstr "Бурунді" msgid "Benin" msgstr "Бенін" +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Бермуда" @@ -112,6 +118,9 @@ msgstr "Бруней Даруссалам" msgid "Bolivia" msgstr "Болівія" +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Бразилія" @@ -139,15 +148,12 @@ msgstr "Канада" msgid "Cocos (Keeling) Islands" msgstr "Кокосові (Кілінгові) острови" -msgid "The Democratic Republic of the Congo" -msgstr "Демократична Республіка Конго" +msgid "Congo" +msgstr "Конго" msgid "Central African Republic" msgstr "Центральна Африканська Республіка" -msgid "Congo" -msgstr "Конго" - msgid "Switzerland" msgstr "Швейцарія" @@ -244,8 +250,8 @@ msgstr "Фіджі" msgid "Falkland Islands (Malvinas)" msgstr "Фолклендські острови (Мальвінські)" -msgid "Federated States of Micronesia" -msgstr "Федеративні Штати Мікронезії" +msgid "Micronesia" +msgstr "" msgid "Faroe Islands" msgstr "Фарерські острови" @@ -346,8 +352,8 @@ msgstr "Британська територія в Індійському оке msgid "Iraq" msgstr "Ірак" -msgid "Islamic Republic of Iran" -msgstr "Ісламська Республіка Іран" +msgid "Iran" +msgstr "" msgid "Iceland" msgstr "Ісландія" @@ -385,8 +391,8 @@ msgstr "Комори" msgid "Saint Kitts and Nevis" msgstr "Федерація Сент-Кіттс і Невіс" -msgid "The Democratic People's Republic of Korea" -msgstr "Корейська Народно-Демократична Республіка" +msgid "North Korea" +msgstr "" msgid "Republic of Korea" msgstr "Республіка Корея" @@ -430,8 +436,8 @@ msgstr "Люксембург" msgid "Latvia" msgstr "Латвія" -msgid "Libyan Arab Jamahiriya" -msgstr "Лівія" +msgid "Libya" +msgstr "" msgid "Morocco" msgstr "Марокко" @@ -439,8 +445,8 @@ msgstr "Марокко" msgid "Monaco" msgstr "Монако" -msgid "Republic of Moldova" -msgstr "Республіка Молдова" +msgid "Moldova" +msgstr "" msgid "Montenegro" msgstr "Чорногорія " @@ -454,8 +460,8 @@ msgstr "Мадагаскар" msgid "Marshall Islands" msgstr "Маршаллові острови" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Македонія" +msgid "Macedonia" +msgstr "" msgid "Mali" msgstr "Малі" @@ -466,8 +472,8 @@ msgstr "М'янма" msgid "Mongolia" msgstr "Монголія" -msgid "Macao" -msgstr "Аоминь" +msgid "Macau" +msgstr "" msgid "Northern Mariana Islands" msgstr "Північні Маріанські острови" @@ -646,14 +652,20 @@ msgstr "Сомалі" msgid "Suriname" msgstr "Сурінам" +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Сан-Томе і Принсіпі" msgid "El Salvador" msgstr "Ель Сальвадор" -msgid "Syrian Arab Republic" -msgstr "Сирійська Арабська республіка" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" msgid "Swaziland" msgstr "Свазиленд" @@ -703,8 +715,8 @@ msgstr "Тувалу" msgid "Taiwan" msgstr "Тайвань" -msgid "United Republic of Tanzania" -msgstr "Об'єднана Республіка Танзанія" +msgid "Tanzania" +msgstr "" msgid "Ukraine" msgstr "Україна" @@ -724,8 +736,8 @@ msgstr "Уругвай" msgid "Uzbekistan" msgstr "Узбекістан" -msgid "Holy See (Vatican City State)" -msgstr "Святий Престол (Ватикан)" +msgid "Vatican" +msgstr "" msgid "Saint Vincent and the Grenadines" msgstr "Сент Вінсент і Ґренадіни" @@ -736,8 +748,8 @@ msgstr "Венесуела" msgid "Virgin Islands" msgstr "Віргінські острови" -msgid "Viet Nam" -msgstr "В'єтнам" +msgid "Vietnam" +msgstr "" msgid "Vanuatu" msgstr "Вануату" diff --git a/apps/routerconsole/locale-countries/messages_vi.po b/apps/routerconsole/locale-countries/messages_vi.po index ae321c075..cdfae30a0 100644 --- a/apps/routerconsole/locale-countries/messages_vi.po +++ b/apps/routerconsole/locale-countries/messages_vi.po @@ -3,973 +3,774 @@ # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers # -# dich_tran , 2011. +# Translators: +# dich_tran , 2011 msgid "" msgstr "" "Project-Id-Version: I2P\n" -"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" -"POT-Creation-Date: 2011-06-11 08:22+0000\n" -"PO-Revision-Date: 2011-06-11 08:42+0000\n" -"Last-Translator: ducki2p \n" -"Language-Team: Vietnamese (http://www.transifex.net/projects/p/I2P/team/vi/)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" +"Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#. Automatically generated pseudo-java for xgettext - do not edit -#. Translators may wish to translate a few of these, do not bother to -#. translate all of them!! -#: ../java/build/Countries.java:3 msgid "Anonymous Proxy" msgstr "" -#: ../java/build/Countries.java:4 msgid "Satellite Provider" msgstr "" -#: ../java/build/Countries.java:5 msgid "Andorra" msgstr "Andorra" -#: ../java/build/Countries.java:6 msgid "United Arab Emirates" msgstr "United Arab Emirates" -#: ../java/build/Countries.java:7 msgid "Afghanistan" msgstr "Afghanistan" -#: ../java/build/Countries.java:8 msgid "Antigua and Barbuda" msgstr "Antigua và Barbuda" -#: ../java/build/Countries.java:9 msgid "Anguilla" msgstr "Anguilla" -#: ../java/build/Countries.java:10 msgid "Albania" msgstr "Albania" -#: ../java/build/Countries.java:11 msgid "Armenia" msgstr "Armenia" -#: ../java/build/Countries.java:12 msgid "Netherlands Antilles" msgstr "Netherlands Antilles" -#: ../java/build/Countries.java:13 msgid "Angola" msgstr "Angola" -#: ../java/build/Countries.java:14 +msgid "Asia/Pacific Region" +msgstr "" + msgid "Antarctica" msgstr "Nam Cực" -#: ../java/build/Countries.java:15 msgid "Argentina" msgstr "Argentina" -#: ../java/build/Countries.java:16 msgid "American Samoa" msgstr "Samoa thuộc Mỹ" -#: ../java/build/Countries.java:17 msgid "Austria" msgstr "Áo" -#: ../java/build/Countries.java:18 msgid "Australia" msgstr "Úc" -#: ../java/build/Countries.java:19 msgid "Aruba" msgstr "Aruba" -#: ../java/build/Countries.java:20 msgid "Åland Islands" msgstr "" -#: ../java/build/Countries.java:21 msgid "Azerbaijan" msgstr "Azerbaijan" -#: ../java/build/Countries.java:22 msgid "Bosnia and Herzegovina" msgstr "Bosnia và Herzegovina" -#: ../java/build/Countries.java:23 msgid "Barbados" msgstr "Barbados" -#: ../java/build/Countries.java:24 msgid "Bangladesh" msgstr "Bangladesh" -#: ../java/build/Countries.java:25 msgid "Belgium" msgstr "Bỉ" -#: ../java/build/Countries.java:26 msgid "Burkina Faso" msgstr "Burkina Faso" -#: ../java/build/Countries.java:27 msgid "Bulgaria" msgstr "Bulgaria" -#: ../java/build/Countries.java:28 msgid "Bahrain" msgstr "Bahrain" -#: ../java/build/Countries.java:29 msgid "Burundi" msgstr "Burundi" -#: ../java/build/Countries.java:30 msgid "Benin" msgstr "Benin" -#: ../java/build/Countries.java:31 +msgid "Saint Barthélemy" +msgstr "" + msgid "Bermuda" msgstr "Bermuda" -#: ../java/build/Countries.java:32 msgid "Brunei Darussalam" msgstr "Brunei Darussalam" -#: ../java/build/Countries.java:33 msgid "Bolivia" msgstr "" -#: ../java/build/Countries.java:34 +msgid "Bonaire" +msgstr "" + msgid "Brazil" msgstr "Ba Tây" -#: ../java/build/Countries.java:35 msgid "Bahamas" msgstr "Bahamas" -#: ../java/build/Countries.java:36 msgid "Bhutan" msgstr "Bhutan" -#: ../java/build/Countries.java:37 msgid "Bouvet Island" msgstr "Bouvet Island" -#: ../java/build/Countries.java:38 msgid "Botswana" msgstr "Botswana" -#: ../java/build/Countries.java:39 msgid "Belarus" msgstr "Belarus" -#: ../java/build/Countries.java:40 msgid "Belize" msgstr "Belize" -#: ../java/build/Countries.java:41 msgid "Canada" msgstr "Canada" -#: ../java/build/Countries.java:42 -msgid "The Democratic Republic of the Congo" -msgstr "Cộng hòa Dân chủ Congo" +msgid "Cocos (Keeling) Islands" +msgstr "" -#: ../java/build/Countries.java:43 -msgid "Central African Republic" -msgstr "Cộng hòa Trung Phi" - -#: ../java/build/Countries.java:44 msgid "Congo" msgstr "Congo" -#: ../java/build/Countries.java:45 +msgid "Central African Republic" +msgstr "Cộng hòa Trung Phi" + msgid "Switzerland" msgstr "Thụy Sĩ" -#: ../java/build/Countries.java:46 msgid "Cote D'Ivoire" msgstr "Cote D'Ivoire" -#: ../java/build/Countries.java:47 msgid "Cook Islands" msgstr "Quần đảo Cook" -#: ../java/build/Countries.java:48 msgid "Chile" msgstr "Chile" -#: ../java/build/Countries.java:49 msgid "Cameroon" msgstr "Cameroon" -#: ../java/build/Countries.java:50 msgid "China" msgstr "Trung Quốc" -#: ../java/build/Countries.java:51 msgid "Colombia" msgstr "Colombia" -#: ../java/build/Countries.java:52 msgid "Costa Rica" msgstr "Costa Rica" -#: ../java/build/Countries.java:53 msgid "Serbia and Montenegro" msgstr "Serbia và Montenegro" -#: ../java/build/Countries.java:54 msgid "Cuba" msgstr "Cuba" -#: ../java/build/Countries.java:55 msgid "Cape Verde" msgstr "Cape Verde" -#: ../java/build/Countries.java:56 +msgid "Curaçao" +msgstr "" + +msgid "Christmas Island" +msgstr "" + msgid "Cyprus" msgstr "Cyprus" -#: ../java/build/Countries.java:57 msgid "Czech Republic" msgstr "Tiệp" -#: ../java/build/Countries.java:58 msgid "Germany" msgstr "Đức" -#: ../java/build/Countries.java:59 msgid "Djibouti" msgstr "Djibouti" -#: ../java/build/Countries.java:60 msgid "Denmark" msgstr "Đan Mạch" -#: ../java/build/Countries.java:61 msgid "Dominica" msgstr "Dominica" -#: ../java/build/Countries.java:62 msgid "Dominican Republic" msgstr "Cộng Hòa Dominican" -#: ../java/build/Countries.java:63 msgid "Algeria" msgstr "Algeria" -#: ../java/build/Countries.java:64 msgid "Ecuador" msgstr "Ecuador" -#: ../java/build/Countries.java:65 msgid "Estonia" msgstr "Estonia" -#: ../java/build/Countries.java:66 msgid "Egypt" msgstr "Ai Cập" -#: ../java/build/Countries.java:67 +msgid "Western Sahara" +msgstr "" + msgid "Eritrea" msgstr "Eritrea" -#: ../java/build/Countries.java:68 msgid "Spain" msgstr "Tây Ban Nha" -#: ../java/build/Countries.java:69 msgid "Ethiopia" msgstr "Ethiopia" -#: ../java/build/Countries.java:70 +msgid "European Union" +msgstr "" + msgid "Finland" msgstr "Phần Lan" -#: ../java/build/Countries.java:71 msgid "Fiji" msgstr "Fiji" -#: ../java/build/Countries.java:72 msgid "Falkland Islands (Malvinas)" msgstr "Quần đảo Falkland (Malvinas)" -#: ../java/build/Countries.java:73 -msgid "Federated States of Micronesia" -msgstr "Liên bang Micronesia" +msgid "Micronesia" +msgstr "" -#: ../java/build/Countries.java:74 msgid "Faroe Islands" msgstr "Quần đảo Faroe" -#: ../java/build/Countries.java:75 msgid "France" msgstr "Pháp" -#: ../java/build/Countries.java:76 msgid "Gabon" msgstr "Gabon" -#: ../java/build/Countries.java:77 msgid "United Kingdom" msgstr "Anh" -#: ../java/build/Countries.java:78 msgid "Grenada" msgstr "Grenada" -#: ../java/build/Countries.java:79 msgid "Georgia" msgstr "Georgia" -#: ../java/build/Countries.java:80 msgid "French Guiana" msgstr "Guiana thuộc Pháp" -#: ../java/build/Countries.java:81 +msgid "Guernsey" +msgstr "" + msgid "Ghana" msgstr "Ghana" -#: ../java/build/Countries.java:82 msgid "Gibraltar" msgstr "Gibraltar" -#: ../java/build/Countries.java:83 msgid "Greenland" msgstr "Greenland" -#: ../java/build/Countries.java:84 msgid "Gambia" msgstr "Gambia" -#: ../java/build/Countries.java:85 msgid "Guinea" msgstr "Guinea" -#: ../java/build/Countries.java:86 msgid "Guadeloupe" msgstr "Guadeloupe" -#: ../java/build/Countries.java:87 msgid "Equatorial Guinea" msgstr "Equatorial Guinea" -#: ../java/build/Countries.java:88 msgid "Greece" msgstr "Hy Lạp" -#: ../java/build/Countries.java:89 msgid "South Georgia and the South Sandwich Islands" msgstr "Quần đảo Nam Georgia và Nam Sandwich" -#: ../java/build/Countries.java:90 msgid "Guatemala" msgstr "Guatemala" -#: ../java/build/Countries.java:91 msgid "Guam" msgstr "Guam" -#: ../java/build/Countries.java:92 msgid "Guinea-Bissau" msgstr "Guinea-Bissau" -#: ../java/build/Countries.java:93 msgid "Guyana" msgstr "Guyana" -#: ../java/build/Countries.java:94 msgid "Hong Kong" msgstr "Hong Kong" -#: ../java/build/Countries.java:95 msgid "Honduras" msgstr "Honduras" -#: ../java/build/Countries.java:96 msgid "Croatia" msgstr "Croatia" -#: ../java/build/Countries.java:97 msgid "Haiti" msgstr "Haiti" -#: ../java/build/Countries.java:98 msgid "Hungary" msgstr "Hungary" -#: ../java/build/Countries.java:99 msgid "Indonesia" msgstr "Indonesia" -#: ../java/build/Countries.java:100 msgid "Ireland" msgstr "Ireland" -#: ../java/build/Countries.java:101 msgid "Israel" msgstr "Do Thái" -#: ../java/build/Countries.java:102 msgid "Isle of Man" msgstr "" -#: ../java/build/Countries.java:103 msgid "India" msgstr "Ấn Độ" -#: ../java/build/Countries.java:104 msgid "British Indian Ocean Territory" msgstr "Lãnh thổ Ấn Độ Dương thuộc Anh" -#: ../java/build/Countries.java:105 msgid "Iraq" msgstr "Iraq" -#: ../java/build/Countries.java:106 -msgid "Islamic Republic of Iran" -msgstr "Iran" +msgid "Iran" +msgstr "" -#: ../java/build/Countries.java:107 msgid "Iceland" msgstr "Iceland" -#: ../java/build/Countries.java:108 msgid "Italy" msgstr "Ý" -#: ../java/build/Countries.java:109 msgid "Jersey" msgstr "" -#: ../java/build/Countries.java:110 msgid "Jamaica" msgstr "Jamaica" -#: ../java/build/Countries.java:111 msgid "Jordan" msgstr "Jordan" -#: ../java/build/Countries.java:112 msgid "Japan" msgstr "Nhật Bản" -#: ../java/build/Countries.java:113 msgid "Kenya" msgstr "Kenya" -#: ../java/build/Countries.java:114 msgid "Kyrgyzstan" msgstr "Kyrgyzstan" -#: ../java/build/Countries.java:115 msgid "Cambodia" msgstr "Campuchia" -#: ../java/build/Countries.java:116 msgid "Kiribati" msgstr "Kiribati" -#: ../java/build/Countries.java:117 msgid "Comoros" msgstr "Comoros" -#: ../java/build/Countries.java:118 msgid "Saint Kitts and Nevis" msgstr "Saint Kitts và Nevis" -#: ../java/build/Countries.java:119 +msgid "North Korea" +msgstr "" + msgid "Republic of Korea" msgstr "Hàn Quốc" -#: ../java/build/Countries.java:120 msgid "Kuwait" msgstr "Kuwait" -#: ../java/build/Countries.java:121 msgid "Cayman Islands" msgstr "Quần đảo Cayman" -#: ../java/build/Countries.java:122 msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../java/build/Countries.java:123 msgid "Lao People's Democratic Republic" msgstr "Lào" -#: ../java/build/Countries.java:124 msgid "Lebanon" msgstr "Lebanon" -#: ../java/build/Countries.java:125 msgid "Saint Lucia" msgstr "Saint Lucia" -#: ../java/build/Countries.java:126 msgid "Liechtenstein" msgstr "Liechtenstein" -#: ../java/build/Countries.java:127 msgid "Sri Lanka" msgstr "Sri Lanka" -#: ../java/build/Countries.java:128 msgid "Liberia" msgstr "Liberia" -#: ../java/build/Countries.java:129 msgid "Lesotho" msgstr "Lesotho" -#: ../java/build/Countries.java:130 msgid "Lithuania" msgstr "Lithuania" -#: ../java/build/Countries.java:131 msgid "Luxembourg" msgstr "Luxembourg" -#: ../java/build/Countries.java:132 msgid "Latvia" msgstr "Latvia" -#: ../java/build/Countries.java:133 -msgid "Libyan Arab Jamahiriya" -msgstr "Libyan Arab Jamahiriya" +msgid "Libya" +msgstr "" -#: ../java/build/Countries.java:134 msgid "Morocco" msgstr "Ma-rốc" -#: ../java/build/Countries.java:135 msgid "Monaco" msgstr "Monaco" -#: ../java/build/Countries.java:136 -msgid "Republic of Moldova" -msgstr "Cộng hòa Moldova" +msgid "Moldova" +msgstr "" -#: ../java/build/Countries.java:137 msgid "Montenegro" msgstr "" -#: ../java/build/Countries.java:138 msgid "Saint Martin" msgstr "" -#: ../java/build/Countries.java:139 msgid "Madagascar" msgstr "Madagascar" -#: ../java/build/Countries.java:140 msgid "Marshall Islands" msgstr "Quần đảo Marshall" -#: ../java/build/Countries.java:141 -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "Cộng hoà Nam Tư cũ Macedonia" +msgid "Macedonia" +msgstr "" -#: ../java/build/Countries.java:142 msgid "Mali" msgstr "Mali" -#: ../java/build/Countries.java:143 msgid "Myanmar" msgstr "Miến Điện" -#: ../java/build/Countries.java:144 msgid "Mongolia" msgstr "Mông Cổ" -#: ../java/build/Countries.java:145 -msgid "Macao" -msgstr "Macao" +msgid "Macau" +msgstr "" -#: ../java/build/Countries.java:146 msgid "Northern Mariana Islands" msgstr "Quần đảo Bắc Mariana" -#: ../java/build/Countries.java:147 msgid "Martinique" msgstr "Martinique" -#: ../java/build/Countries.java:148 msgid "Mauritania" msgstr "Mauritania" -#: ../java/build/Countries.java:149 msgid "Montserrat" msgstr "Montserrat" -#: ../java/build/Countries.java:150 msgid "Malta" msgstr "Malta" -#: ../java/build/Countries.java:151 msgid "Mauritius" msgstr "Mauritius" -#: ../java/build/Countries.java:152 msgid "Maldives" msgstr "Maldives" -#: ../java/build/Countries.java:153 msgid "Malawi" msgstr "Malawi" -#: ../java/build/Countries.java:154 msgid "Mexico" msgstr "Mexico" -#: ../java/build/Countries.java:155 msgid "Malaysia" msgstr "Malaysia" -#: ../java/build/Countries.java:156 msgid "Mozambique" msgstr "Mozambique" -#: ../java/build/Countries.java:157 msgid "Namibia" msgstr "Namibia" -#: ../java/build/Countries.java:158 msgid "New Caledonia" msgstr "New Caledonia" -#: ../java/build/Countries.java:159 msgid "Niger" msgstr "Niger" -#: ../java/build/Countries.java:160 msgid "Norfolk Island" msgstr "Norfolk Island" -#: ../java/build/Countries.java:161 msgid "Nigeria" msgstr "Nigeria" -#: ../java/build/Countries.java:162 msgid "Nicaragua" msgstr "Nicaragua" -#: ../java/build/Countries.java:163 msgid "Netherlands" msgstr "Hà Lan" -#: ../java/build/Countries.java:164 msgid "Norway" msgstr "Na Uy" -#: ../java/build/Countries.java:165 msgid "Nepal" msgstr "Nepal" -#: ../java/build/Countries.java:166 msgid "Nauru" msgstr "Nauru" -#: ../java/build/Countries.java:167 msgid "Niue" msgstr "Niue" -#: ../java/build/Countries.java:168 msgid "New Zealand" msgstr "New Zealand" -#: ../java/build/Countries.java:169 msgid "Oman" msgstr "Oman" -#: ../java/build/Countries.java:170 msgid "Panama" msgstr "Panama" -#: ../java/build/Countries.java:171 msgid "Peru" msgstr "Peru" -#: ../java/build/Countries.java:172 msgid "French Polynesia" msgstr "Polynésie thuộc Pháp" -#: ../java/build/Countries.java:173 msgid "Papua New Guinea" msgstr "Papua New Guinea" -#: ../java/build/Countries.java:174 msgid "Philippines" msgstr "Phi-líp-pin" -#: ../java/build/Countries.java:175 msgid "Pakistan" msgstr "Pakistan" -#: ../java/build/Countries.java:176 msgid "Poland" msgstr "Ba Lan" -#: ../java/build/Countries.java:177 msgid "Saint Pierre and Miquelon" msgstr "Saint Pierre và Miquelon" -#: ../java/build/Countries.java:178 +msgid "Pitcairn Islands" +msgstr "" + msgid "Puerto Rico" msgstr "Puerto Rico" -#: ../java/build/Countries.java:179 msgid "Palestinian Territory" msgstr "Lãnh thổ Palestine" -#: ../java/build/Countries.java:180 msgid "Portugal" msgstr "Bồ Đào Nha" -#: ../java/build/Countries.java:181 msgid "Palau" msgstr "Palau" -#: ../java/build/Countries.java:182 msgid "Paraguay" msgstr "Paraguay" -#: ../java/build/Countries.java:183 msgid "Qatar" msgstr "Qatar" -#: ../java/build/Countries.java:184 msgid "Réunion" msgstr "Réunion" -#: ../java/build/Countries.java:185 msgid "Romania" msgstr "Romania" -#: ../java/build/Countries.java:186 msgid "Serbia" msgstr "Serbia" -#: ../java/build/Countries.java:187 msgid "Russian Federation" msgstr "Liên bang Nga" -#: ../java/build/Countries.java:188 msgid "Rwanda" msgstr "Rwanda" -#: ../java/build/Countries.java:189 msgid "Saudi Arabia" msgstr "Ả Rập Saudi" -#: ../java/build/Countries.java:190 msgid "Solomon Islands" msgstr "Quần đảo Solomon" -#: ../java/build/Countries.java:191 msgid "Seychelles" msgstr "Seychelles" -#: ../java/build/Countries.java:192 msgid "Sudan" msgstr "Sudan" -#: ../java/build/Countries.java:193 msgid "Sweden" msgstr "Thụy Điển" -#: ../java/build/Countries.java:194 msgid "Singapore" msgstr "Singapore" -#: ../java/build/Countries.java:195 +msgid "Saint Helena" +msgstr "" + msgid "Slovenia" msgstr "Slovenia" -#: ../java/build/Countries.java:196 +msgid "Svalbard and Jan Mayen" +msgstr "" + msgid "Slovakia" msgstr "Slovakia" -#: ../java/build/Countries.java:197 msgid "Sierra Leone" msgstr "Sierra Leone" -#: ../java/build/Countries.java:198 msgid "San Marino" msgstr "San Marino" -#: ../java/build/Countries.java:199 msgid "Senegal" msgstr "Senegal" -#: ../java/build/Countries.java:200 msgid "Somalia" msgstr "Somalia" -#: ../java/build/Countries.java:201 msgid "Suriname" msgstr "Suriname" -#: ../java/build/Countries.java:202 +msgid "South Sudan" +msgstr "" + msgid "Sao Tome and Principe" msgstr "Sao Tome và Principe" -#: ../java/build/Countries.java:203 msgid "El Salvador" msgstr "El Salvador" -#: ../java/build/Countries.java:204 -msgid "Syrian Arab Republic" -msgstr "Syria" +msgid "Sint Maarten" +msgstr "" + +msgid "Syria" +msgstr "" -#: ../java/build/Countries.java:205 msgid "Swaziland" msgstr "Swaziland" -#: ../java/build/Countries.java:206 msgid "Turks and Caicos Islands" msgstr "Quần đảo Turks và Caicos" -#: ../java/build/Countries.java:207 msgid "Chad" msgstr "Cá hồng" -#: ../java/build/Countries.java:208 msgid "French Southern Territories" msgstr "Nam lãnh thổ thuộc Pháp" -#: ../java/build/Countries.java:209 msgid "Togo" msgstr "Togo" -#: ../java/build/Countries.java:210 msgid "Thailand" msgstr "Thái Lan" -#: ../java/build/Countries.java:211 msgid "Tajikistan" msgstr "Tajikistan" -#: ../java/build/Countries.java:212 msgid "Tokelau" msgstr "Tokelau" -#: ../java/build/Countries.java:213 msgid "Timor-Leste" msgstr "Timor-Leste" -#: ../java/build/Countries.java:214 msgid "Turkmenistan" msgstr "Turkmenistan" -#: ../java/build/Countries.java:215 msgid "Tunisia" msgstr "Tunisia" -#: ../java/build/Countries.java:216 msgid "Tonga" msgstr "Tonga" -#: ../java/build/Countries.java:217 msgid "Turkey" msgstr "Thổ Nhỉ Kỳ" -#: ../java/build/Countries.java:218 msgid "Trinidad and Tobago" msgstr "Trinidad và Tobago" -#: ../java/build/Countries.java:219 msgid "Tuvalu" msgstr "Tuvalu" -#: ../java/build/Countries.java:220 msgid "Taiwan" msgstr "Đài Loan" -#: ../java/build/Countries.java:221 -msgid "United Republic of Tanzania" -msgstr "Tanzania" +msgid "Tanzania" +msgstr "" -#: ../java/build/Countries.java:222 msgid "Ukraine" msgstr "Ukraine" -#: ../java/build/Countries.java:223 msgid "Uganda" msgstr "Uganda" -#: ../java/build/Countries.java:224 msgid "United States Minor Outlying Islands" msgstr "Hoa Kỳ đảo nhỏ bên ngoài" -#: ../java/build/Countries.java:225 msgid "United States" msgstr "Hoa Kỳ" -#: ../java/build/Countries.java:226 msgid "Uruguay" msgstr "Uruguay" -#: ../java/build/Countries.java:227 msgid "Uzbekistan" msgstr "Uzbekistan" -#: ../java/build/Countries.java:228 -msgid "Holy See (Vatican City State)" -msgstr "Tòa Thánh (Vatican City State)" +msgid "Vatican" +msgstr "" -#: ../java/build/Countries.java:229 msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent và Grenadines" -#: ../java/build/Countries.java:230 msgid "Venezuela" msgstr "Venezuela" -#: ../java/build/Countries.java:231 ../java/build/Countries.java:232 msgid "Virgin Islands" msgstr "Quần đảo Virgin" -#: ../java/build/Countries.java:233 -msgid "Viet Nam" -msgstr "Việt Nam" +msgid "Vietnam" +msgstr "" -#: ../java/build/Countries.java:234 msgid "Vanuatu" msgstr "Vanuatu" -#: ../java/build/Countries.java:235 msgid "Wallis and Futuna" msgstr "Wallis và Futuna" -#: ../java/build/Countries.java:236 msgid "Samoa" msgstr "Samoa" -#: ../java/build/Countries.java:237 msgid "Yemen" msgstr "Yemen" -#: ../java/build/Countries.java:238 msgid "Mayotte" msgstr "Mayotte" -#: ../java/build/Countries.java:239 msgid "South Africa" msgstr "Nam Phi" -#: ../java/build/Countries.java:240 msgid "Zambia" msgstr "Zambia" -#: ../java/build/Countries.java:241 msgid "Zimbabwe" msgstr "Zimbabwe" - diff --git a/apps/routerconsole/locale-countries/messages_zh.po b/apps/routerconsole/locale-countries/messages_zh.po index 6bf396add..0a31a5811 100644 --- a/apps/routerconsole/locale-countries/messages_zh.po +++ b/apps/routerconsole/locale-countries/messages_zh.po @@ -2,30 +2,25 @@ # 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 -# +# # Translators: # ducki2p , 2011 -# xtoaster , 2012 -# walking , 2011 -# walking , 2011 # walking , 2013 # walking , 2011 # xtoaster , 2012 -# xtoaster , 2012 -# xtoaster , 2012 +# YF , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-14 13:34+0000\n" -"PO-Revision-Date: 2013-07-11 06:43+0000\n" -"Last-Translator: xtoaster \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/" -"language/zh_CN/)\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2015-07-17 01:08+0000\n" +"PO-Revision-Date: 2015-07-17 02:58+0000\n" +"Last-Translator: YF \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Anonymous Proxy" @@ -61,6 +56,9 @@ msgstr "荷兰属地" msgid "Angola" msgstr "安哥拉" +msgid "Asia/Pacific Region" +msgstr "亚洲/太平洋地区" + msgid "Antarctica" msgstr "南极洲" @@ -80,7 +78,7 @@ msgid "Aruba" msgstr "阿鲁巴" msgid "Åland Islands" -msgstr "Åland Islands" +msgstr "奥兰群岛" msgid "Azerbaijan" msgstr "阿塞拜疆" @@ -112,6 +110,9 @@ msgstr "不丹" msgid "Benin" msgstr "贝宁" +msgid "Saint Barthélemy" +msgstr "圣巴泰勒米" + msgid "Bermuda" msgstr "百慕大" @@ -121,6 +122,9 @@ msgstr "文莱达鲁萨兰" msgid "Bolivia" msgstr "玻利维亚" +msgid "Bonaire" +msgstr "博内尔" + msgid "Brazil" msgstr "巴西" @@ -148,15 +152,12 @@ msgstr "加拿大" msgid "Cocos (Keeling) Islands" msgstr "科科斯（基林）群岛" -msgid "The Democratic Republic of the Congo" -msgstr "民主刚果" +msgid "Congo" +msgstr "刚果" msgid "Central African Republic" msgstr "中非" -msgid "Congo" -msgstr "刚果" - msgid "Switzerland" msgstr "瑞士" @@ -200,7 +201,7 @@ msgid "Cyprus" msgstr "塞浦路斯" msgid "Czech Republic" -msgstr "捷克" +msgstr "捷克共和国" msgid "Germany" msgstr "德国" @@ -215,7 +216,7 @@ msgid "Dominica" msgstr "多米尼" msgid "Dominican Republic" -msgstr "多米尼加联邦" +msgstr "多米尼加共和国" msgid "Algeria" msgstr "阿尔及利亚" @@ -253,7 +254,7 @@ msgstr "斐济" msgid "Falkland Islands (Malvinas)" msgstr "福克兰群岛" -msgid "Federated States of Micronesia" +msgid "Micronesia" msgstr "密克罗尼西亚" msgid "Faroe Islands" @@ -355,7 +356,7 @@ msgstr "英属印度洋地区" msgid "Iraq" msgstr "伊拉克" -msgid "Islamic Republic of Iran" +msgid "Iran" msgstr "伊朗" msgid "Iceland" @@ -394,7 +395,7 @@ msgstr "科摩罗" msgid "Saint Kitts and Nevis" msgstr "圣克里斯多福与尼维斯" -msgid "The Democratic People's Republic of Korea" +msgid "North Korea" msgstr "朝鲜" msgid "Republic of Korea" @@ -439,7 +440,7 @@ msgstr "卢森堡" msgid "Latvia" msgstr "拉脱维亚" -msgid "Libyan Arab Jamahiriya" +msgid "Libya" msgstr "利比亚" msgid "Morocco" @@ -448,7 +449,7 @@ msgstr "摩洛哥" msgid "Monaco" msgstr "摩纳哥" -msgid "Republic of Moldova" +msgid "Moldova" msgstr "摩尔多瓦" msgid "Montenegro" @@ -463,8 +464,8 @@ msgstr "马达加斯加" msgid "Marshall Islands" msgstr "马绍尔群岛" -msgid "The Former Yugoslav Republic of Macedonia" -msgstr "前南斯拉夫之马其顿共和国" +msgid "Macedonia" +msgstr "马其顿" msgid "Mali" msgstr "马里" @@ -475,7 +476,7 @@ msgstr "缅甸" msgid "Mongolia" msgstr "蒙古" -msgid "Macao" +msgid "Macau" msgstr "澳门" msgid "Northern Mariana Islands" @@ -655,13 +656,19 @@ msgstr "索马里" msgid "Suriname" msgstr "苏里南" +msgid "South Sudan" +msgstr "南苏丹" + msgid "Sao Tome and Principe" msgstr "圣多美与普林西比共和国" msgid "El Salvador" msgstr "萨尔瓦多" -msgid "Syrian Arab Republic" +msgid "Sint Maarten" +msgstr "圣马丁岛" + +msgid "Syria" msgstr "叙利亚" msgid "Swaziland" @@ -712,7 +719,7 @@ msgstr "图瓦鲁" msgid "Taiwan" msgstr "台湾" -msgid "United Republic of Tanzania" +msgid "Tanzania" msgstr "坦桑尼亚" msgid "Ukraine" @@ -733,8 +740,8 @@ msgstr "乌拉圭" msgid "Uzbekistan" msgstr "乌兹别克斯坦" -msgid "Holy See (Vatican City State)" -msgstr "梵地冈" +msgid "Vatican" +msgstr "梵蒂冈" msgid "Saint Vincent and the Grenadines" msgstr "圣文森特和格林纳丁斯" @@ -745,7 +752,7 @@ msgstr "委内瑞拉" msgid "Virgin Islands" msgstr "维京群岛" -msgid "Viet Nam" +msgid "Vietnam" msgstr "越南" msgid "Vanuatu" @@ -771,4 +778,3 @@ msgstr "赞比亚" msgid "Zimbabwe" msgstr "津巴布韦" - diff --git a/apps/routerconsole/locale/messages_ar.po b/apps/routerconsole/locale/messages_ar.po index 365b38e53..408645877 100644 --- a/apps/routerconsole/locale/messages_ar.po +++ b/apps/routerconsole/locale/messages_ar.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/I2P/language/ar/)\n" "MIME-Version: 1.0\n" @@ -33,8 +33,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -47,8 +47,8 @@ msgstr[5] "" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -61,8 +61,8 @@ msgstr[5] "" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -75,8 +75,8 @@ msgstr[5] "" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -87,15 +87,9 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -106,7 +100,26 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" @@ -117,7 +130,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -164,7 +177,7 @@ msgstr "إلى" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "ﻻشيئ" @@ -303,17 +316,17 @@ msgstr "جاري التوقيف" msgid "Rejecting tunnels" msgstr "رفض الأنفاق" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "اعادة التوزيع" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -324,26 +337,26 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "فشل اعادة التوزيع" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "تم حفظ اعدادات اعادة التوزيع" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "اعادة التوزيع: تحميل العنوان" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -413,7 +426,7 @@ msgstr "صعب الوصول بأية وسيلة" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "الحالة" @@ -428,7 +441,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} مستعملة للاتصال الخارجي فقط" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "" @@ -451,13 +464,13 @@ msgid "" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "التعاريف" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -472,7 +485,7 @@ msgstr "النظير البعيد" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "" @@ -499,13 +512,13 @@ msgstr "مدة تلقى / بعث حزمة " #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "خامل" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "داخل/خارج" @@ -520,14 +533,14 @@ msgstr "مدة استمرار هذا الاتصال" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "فوق" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "الانحراف" @@ -576,7 +589,7 @@ msgstr "الحد الأقصى الحالي إرسال حجم الحزمة" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "" @@ -586,7 +599,7 @@ msgstr "العدد الاجمالي للحزم المرسلة الى المست #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "" @@ -595,7 +608,7 @@ msgid "The total number of packets received from the peer" msgstr "العدد الاجمالي للحزم المستقبلة" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "" @@ -604,7 +617,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "العدد الاجمالي للحزم المرسلة الى النظائر" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "" @@ -643,8 +656,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "مدة الاشتغال" @@ -739,17 +752,17 @@ msgid "NTCP connections" msgstr "اتصال NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "حد" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "انتهى الوقت" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "" @@ -762,19 +775,19 @@ msgid "Backlogged?" msgstr "السجلات" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "الداخل" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "الخارج" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -785,107 +798,107 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "اتصال UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "اتجاه/تقديم" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "حسب الاتصاب الوارد" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "حسب الاتصال الخارج" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "حسب معدل الداخل" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "حسب معدل الصادرة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "حسب مدة الاتصال" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "حسب انحراف الساعة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "حسب نافذة الازدحام" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "حسب مدة الانطلاق" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "حسب الوقت ذهابا وإيابا" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "حسب مهلة إعادة الإرسال" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "حسب أقصى مدة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "حسب الحزم المرسلة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "حسب الحزم المستقبلة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "حسب الحزم المعاد ارسالها" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "حسب الحزم المستقبلة اكثر من مرة" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "عرضنا لتعريفهم" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "عرصو علينا تقديمهم" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "اختنق" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "فشل واحد" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} فشل" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "ممنوع" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -923,66 +936,66 @@ msgstr "تجاوز النفق: ازدحام كبير" msgid "Dropping tunnel requests: Queue time" msgstr "تجاوز النفق: وقت الانتظار" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "يوجد اصدار جديد {0} للملحق" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "فشل البحث عم ترقية للملحق {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "ﻻيوجد اصدار جديد {0} للملحق" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B منقول" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "فشل في النقل {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "طريقة الترقية" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "أعد التشغيل" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "انتهى التحديث" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "من {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "ملف التحديث غير كامل {0} " -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "فشل في نسخ {0}" @@ -995,7 +1008,7 @@ msgstr "فشل في نسخ {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -1009,20 +1022,20 @@ msgstr "" msgid "Updating" msgstr "ترقية" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1212,16 +1225,20 @@ msgid "No new version found at {0}" msgstr "ﻻيوجد اصدار جديد {0} " #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "منع مؤقت {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "ممنوع الى اعادة تشغيل {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "الغاء المنع الآن" @@ -1322,18 +1339,18 @@ msgstr "الغاء المنع الآن" msgid "I2P Router Console" msgstr "مركز تحكم I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "خطأ في ترقية الإعدادات - انظر التفاصيل" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "تم حفظ الإعدادات بنجاح" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1541,7 +1558,7 @@ msgid "Add Client" msgstr "أضف مستخدم" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "مستخدم" @@ -1573,9 +1590,9 @@ msgid "Plugin" msgstr "الملحق" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "إصدار" @@ -1597,7 +1614,8 @@ msgstr "رخصة" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "موقع" @@ -1610,7 +1628,7 @@ msgid "Stop" msgstr "توقف" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "بحث عن الترقية" @@ -1632,7 +1650,7 @@ msgstr "حذف" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1642,7 +1660,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1661,7 +1679,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1790,8 +1808,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "حذف" @@ -1801,7 +1819,7 @@ msgstr "اختر فئة لإضافتها" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "سرعة الاتصال" @@ -1810,7 +1828,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "شبكة" @@ -1866,9 +1884,9 @@ msgid "UI" msgstr "واجهة مستخدم" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "نفق" @@ -1886,15 +1904,15 @@ msgid "Logging" msgstr "تسجيل" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "المستخدمين" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "احصائات" @@ -1906,8 +1924,8 @@ msgstr "متقدم" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2172,7 +2190,7 @@ msgstr "أعد التشغيل الآن" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "أعد التشغيل" @@ -2655,8 +2673,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2665,91 +2683,91 @@ msgstr "" msgid "Password" msgstr "كلمة السر" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "يوجد اصدار جديد " -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "توجد تحديثات، انقر زر على اليسار للتحميل" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "ﻻتوجد تحديثات" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "أبد" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "تحديث العناوين" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "تحديث المفاتيح الموثوقة." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "كل" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "إعلام فقط" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "حمل فقط" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "حمل، تحقق و أعد تشغيل" @@ -2875,7 +2893,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -3025,12 +3043,12 @@ msgid "Graph settings saved" msgstr "حفظ اعدادات الرسم البياني" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "دفتر العناوين" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3061,17 +3079,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "بريد الكتروني مجهول" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "بريد الكتروني" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "مساعدة روتر I2P" @@ -3081,17 +3099,17 @@ msgid "Router Console" msgstr "مركز تحكم I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "برنامج تورنت مجهول" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "تورنت" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3260,97 +3278,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3368,223 +3386,223 @@ msgid "No log messages" msgstr "لا تسجيل الرسائل" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "موجه" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "غير موجود في قاعدة الشبكة" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "محلي" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "غير منشور" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "الغاية" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "ينتهي في مدة {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "انتهى {0} منذ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "نفق" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "لم تتم تهيئة" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "احصائيات قاعدة البيانات I2P" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "عدد" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "نقل" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "البلد" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "المعلومات" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "معلومات النظائر" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "مختفي" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "تحديث" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} مدة" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "تم نشره منذ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "عناوين" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "ثمن" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "مختفي" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "آخر تحديث للأخبار {0} " -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "آخر تحديث للأخبار {0} " -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3650,19 +3668,19 @@ msgid "Groups (Caps)" msgstr "المجموعات" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "سرعة" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "القدرة" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "دمج" @@ -3685,7 +3703,7 @@ msgid "Failing" msgstr "فشل" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "مدمج" @@ -3762,71 +3780,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "نظير سريع" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "نظير ذو قدرة عالية" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "نظير مندمج" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "مجموعات" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "سرعة" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "القدرة" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "كم من الانفاق نطلب منهم الانضمام في ساعة؟" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "كم من النظائر موجودة مؤخرا؟" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "انضمام" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "الحالة" @@ -3962,277 +3980,277 @@ msgstr "الرسم البياني" msgid "Lifetime average value" msgstr "متوسط الحياة" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "مساعدة حول I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "مساعدة" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "خدمات I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P اعدادات موجه" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "أظهر الأنفاق الموجودة وحالة الانفاق " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "أظهر اتصالات المشاركين" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "أظهر قائمة بكل I2P المعروفة" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "تقرير" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "يجلات" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "أظهر اشتغال الموجه بريم بياني" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "رسم بياني" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "احصائات نصية للموجه" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "عام" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "هوية محلية" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "هوية موجهك I2P هو" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "لاتظهر لأحد" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "أظهر" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "مساعدة في اعدادات الجدار الناري لزيادة فعالية I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "مفعل" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "سريع" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "قدرة عالية" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "معروف" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "حدد سرعة الموجه" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "الاتصال الداخلي/خارجي" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "مجموع" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "مستعمل" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "تصفح" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "مشارك" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "نسبة المشاركة" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "ازدحام" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "تأخر" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "تأخر الرسالة" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "تأخر النفق" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4336,26 +4354,26 @@ msgstr "جاري بناء النفق" msgid "shared clients" msgstr "المستخدمين المشتركين" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "أنقر اعادة التشغبل للتثبيت" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "انقر زر التوقف وأعد التشغيل للتثبيت" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "اصدار {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4364,7 +4382,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4373,69 +4391,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "مساعدة خول اعدادات الجدار الناري" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "تأكد من NAT/جدار ناري" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "اعادة توزيع" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "أعادة التشغيل في {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "متوسط {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "عدد الأحداث في المدة" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" +msgid "avg" msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "الآن" @@ -4612,175 +4646,127 @@ msgid "Open Router Console in web browser at startup" msgstr "فتح شاشة التحكم في المتصفح عند البداية" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC بروكسي" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P خادم ويب" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "داكن" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "فاتح" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "ليل" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "تحديد سرعة الاتصال" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "التشفير" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "الأنفاق I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "شبكة" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "نقل" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "مفتاح" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "منفذ" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4949,7 +4935,7 @@ msgid "Share" msgstr "شارك" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "ملاحظة" @@ -4990,7 +4976,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -5029,27 +5015,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "اعدادات I2P متقدمة" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "بعض التغييرات تحتاج اعادة التشغيل لتفعيلها" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_cs.po b/apps/routerconsole/locale/messages_cs.po index 69da230c0..761950db6 100644 --- a/apps/routerconsole/locale/messages_cs.po +++ b/apps/routerconsole/locale/messages_cs.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Czech (http://www.transifex.com/projects/p/I2P/language/cs/)\n" "MIME-Version: 1.0\n" @@ -31,8 +31,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -42,8 +42,8 @@ msgstr[2] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -53,8 +53,8 @@ msgstr[2] "{0} sek." #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,8 +64,8 @@ msgstr[2] "{0} minut" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -73,15 +73,9 @@ msgstr[0] "{0} hodina" msgstr[1] "{0} hodiny" msgstr[2] "{0} hodin" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "neaplikovatelné" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -89,7 +83,23 @@ msgstr[0] "{0} den" msgstr[1] "{0} dny" msgstr[2] "{0} dnů" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "neaplikovatelné" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" @@ -97,7 +107,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -141,7 +151,7 @@ msgstr "Do" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "žádný" @@ -280,17 +290,17 @@ msgstr "Odmítám tunely: vypínání" msgid "Rejecting tunnels" msgstr "Odmítnutí tunelů" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Opětovné sdílení (reseeding)" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -298,26 +308,26 @@ msgstr[0] "Reseed získán pouze pro 1 router." msgstr[1] "Reseed získán pouze pro {0} routerů." msgstr[2] "Reseed získán pouze pro {0} routerů." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed selhal." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Další informace viz. {0}." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "reseed stránky nastavení" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseedovaní: načítání seedované URL." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -387,7 +397,7 @@ msgstr "Nedostupné na každém transportu" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -402,7 +412,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} je použito pouze pro odchozí spojení" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP není povolen" @@ -425,13 +435,13 @@ msgid "" msgstr "Pro nastavení těchto limitů přidejte nastavení i2np.ntcp.maxConnections=nnn a i2np.udp.maxConnections=nnn na stránce pokročilá nastavení." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definice" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -446,7 +456,7 @@ msgstr "Vzdálený sdíleč určený hashem routru." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Adresář" @@ -473,13 +483,13 @@ msgstr "Doba od posledního přijetí / odeslání paketu." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Nečinný" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "příchozí/odchozí" @@ -494,14 +504,14 @@ msgstr "Před jak dlouhou dobou bylo toto spojení navázáno" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Up" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Zkreslit" @@ -550,7 +560,7 @@ msgstr "Současná maximální velikost odeslaného paketu / předpokládaná ve #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -560,7 +570,7 @@ msgstr "Celkový počet paketů odeslaných " #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -569,7 +579,7 @@ msgid "The total number of packets received from the peer" msgstr "Celkový počet paketů obdržených od peeru" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -578,7 +588,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Celkový počet paketů znovu přenesených peeru. " #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -617,8 +627,8 @@ msgstr "WAN PPP Připojení" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -713,17 +723,17 @@ msgid "NTCP connections" msgstr "NTCP připojení" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limit" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -736,19 +746,19 @@ msgid "Backlogged?" msgstr "Backlogováno?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Příchozí" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Odchozí" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -756,107 +766,107 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP připojení" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Třídit podle hashe peeru" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Směr / Úvod" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Seřadit podle příchozí nečinnosti" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Seřadit podle odchozí nečinnosti" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Seřadit podle příchozí rychlosti" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Seřadit podle odchozí rychlosti " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Seřadit podle doby běhu připojení." -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Seřadit podle zkreslení času" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Seřadit podle okna přetížení" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Seřadit podle pomalého startu prahu" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Seřadit podle round trip time" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Seřadit podle časového limitu opakovaného přenosu" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Seřadit podle odchozí maximální přenosové jednotky" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Seředit podle odeslaných paketů" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Seřadit podle přijatých paketů" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Seřadit podle znovu odeslaných paketů " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Seřadit podle paketů obdržených více než jednou" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Nabídli jsme jim že je představíme" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Nabídli nám že nás představí" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Zadušen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 selhání" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} selhání" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Zakázáno" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "Backblogováno" @@ -894,66 +904,66 @@ msgstr "" msgid "Dropping tunnel requests: Queue time" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "" @@ -966,7 +976,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -980,20 +990,20 @@ msgstr "" msgid "Updating" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1183,16 +1193,20 @@ msgid "No new version found at {0}" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1293,18 +1307,18 @@ msgstr "" msgid "I2P Router Console" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1512,7 +1526,7 @@ msgid "Add Client" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "" @@ -1544,9 +1558,9 @@ msgid "Plugin" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "" @@ -1568,7 +1582,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "" @@ -1581,7 +1596,7 @@ msgid "Stop" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "" @@ -1603,7 +1618,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1613,7 +1628,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1632,7 +1647,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1761,8 +1776,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "" @@ -1772,7 +1787,7 @@ msgstr "" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "" @@ -1781,7 +1796,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "" @@ -1837,9 +1852,9 @@ msgid "UI" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "" @@ -1857,15 +1872,15 @@ msgid "Logging" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "" @@ -1877,8 +1892,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2140,7 +2155,7 @@ msgstr "" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "" @@ -2614,8 +2629,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2624,91 +2639,91 @@ msgstr "" msgid "Password" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "" @@ -2834,7 +2849,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2984,12 +2999,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3020,17 +3035,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "" @@ -3040,17 +3055,17 @@ msgid "Router Console" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3219,97 +3234,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3327,223 +3342,223 @@ msgid "No log messages" msgstr "" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3597,19 +3612,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "" @@ -3632,7 +3647,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "" @@ -3709,71 +3724,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3903,277 +3918,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4277,26 +4292,26 @@ msgstr "" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4305,7 +4320,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4314,69 +4329,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" +msgid "avg" msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "" @@ -4553,175 +4584,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 -msgid "IRC proxy" +msgid "shared clients (DSA)" msgstr "" #: ../java/strings/Strings.java:38 -msgid "eepsite" +msgid "IRC proxy" msgstr "" #: ../java/strings/Strings.java:39 -msgid "I2P webserver" +msgid "eepsite" msgstr "" #: ../java/strings/Strings.java:40 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4890,7 +4873,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4931,7 +4914,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4970,27 +4953,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_da.po b/apps/routerconsole/locale/messages_da.po index d909e6370..033b936fe 100644 --- a/apps/routerconsole/locale/messages_da.po +++ b/apps/routerconsole/locale/messages_da.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-18 15:17+0000\n" -"Last-Translator: cacapo \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Danish (http://www.transifex.com/projects/p/I2P/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -42,8 +42,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -52,8 +52,8 @@ msgstr[1] "{0} sek" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -62,37 +62,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 time" msgstr[1] "{0} timer" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "Ikke tingængelig " - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 dag" msgstr[1] "{0} dage" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "Ikke tingængelig " + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -135,7 +144,7 @@ msgstr "Til" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "ingen" @@ -274,43 +283,43 @@ msgstr "Afviser tunneler: Lukker ned!" msgid "Rejecting tunnels" msgstr "Afviser tunneler" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Reseeding: router info fra fil ({0} lykkedes, {1} fejl)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeder" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Reseed entede kun 1 router." msgstr[1] "Reseeder hentede kun {0} routere." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseeding fejlede" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Se {0} for at få hjælp." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "Reseeding konfigurationsside" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseeder: henter seed-URL." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -380,7 +389,7 @@ msgstr "Utilgængelig for alle transporter" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -395,7 +404,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} bruges kun til udadgående forbindelser" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP er ikke aktiveret." @@ -418,13 +427,13 @@ msgid "" msgstr "For at tilsidesætte grænsen for ændringen af bearbejdningsdata, skal du tilføje indstillingerne i2np.ntcp.maxConnections = nnn og i2np.udp.maxConnections = nnn på den Avanceret Konfigurationsside." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definationer " #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -439,7 +448,7 @@ msgstr "Fjern-peeren, identificeret af router hash" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dir" @@ -466,13 +475,13 @@ msgstr "Hvor længe siden en pakke blev modtaget / sent" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Hvile" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Ind/Ud" @@ -487,14 +496,14 @@ msgstr "Hvor længe siden denne forbindelse blev etableret" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Op" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Skæv" @@ -543,7 +552,7 @@ msgstr "Nuværende maksimale sendte pakkestørrelse / anslået maksimalt modtage #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -553,7 +562,7 @@ msgstr "Det samlede antal af pakker sendt af peeren" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -562,7 +571,7 @@ msgid "The total number of packets received from the peer" msgstr "Det samlede antal af pakker modtaget fra peeren" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dub TX" @@ -571,7 +580,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Det samlede antal pakker videreudsendes til peeren" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "DUB RX" @@ -610,8 +619,8 @@ msgstr "WAN PPP Forbindelse" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Oppetid" @@ -706,17 +715,17 @@ msgid "NTCP connections" msgstr "NTCP fobindelser " #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Grænse" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -729,126 +738,126 @@ msgid "Backlogged?" msgstr "Gemt fra tidligere?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Indadgående" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Udadgående" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} peer" msgstr[1] "{0} peers" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP forbindelser" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sorter efter peer hash" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Retning / Indledning" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sorter efter hvilende indadgående" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sorter efter hvilende udadgående" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sorter efter indadgående sats" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sorter efter udadgående sats" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sorter efter forbindelsens oppetid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sorter efter tidsforskel" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sorter efter overbelastnings vindue" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sorter efter langsom starttilstand" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sorter efter tiden fra start til slut" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sorter efter genafsendelses timeout" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sorter efter den maksimale udadgående overførsels-enhed" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sorter efter antal afsendte pakker" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sorter efter antal modtaget pakker" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sorter efter antal videresendte pakker " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sorter efter pakker der er modtaget mere end én gang" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Vi tilbød at indtroducere dem " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "De tilbød at idtoducere os" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Kvalt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 fejl" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} fejle" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Banned" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "backlogged" @@ -886,66 +895,66 @@ msgstr "Dropper tunnelforespørgsler: Høj belastning" msgid "Dropping tunnel requests: Queue time" msgstr "Dropper tunnelforespørgsler: Kø tid" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Nyt plugin version {0} er tilgængeligt" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Opdatering for plugin {0} kunne ikke tjekkes" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Der er ingen ny version tilgængelig for plugin {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B overført" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Installationen misslykkedes fra {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Overfører fil fra {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Opdatering blev downloaded" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Genstarter" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Opdatering mislykkedes" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "fra {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Usigneret opdaterings fil fra {0} er korrupt" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Det mislykkedes at kopiere til {0}" @@ -958,7 +967,7 @@ msgstr "Det mislykkedes at kopiere til {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "HTTP-klient proxy tunnel skal køre" @@ -972,20 +981,20 @@ msgstr "HTTP-klient proxy tunnel skal køre" msgid "Updating" msgstr "Opdatere" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "In - netværk opdateringer deaktiveret. Tjek pakke manager." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Inge skriverettigheder til I2P installationsmappen." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Du skal først opdatere til version {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Kræver Java version {0} men installeret Java version er {1}" @@ -1175,16 +1184,20 @@ msgid "No new version found at {0}" msgstr "Ingen ny version fundet på {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Midlertidige forbud udløber om {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Banned indtil genstart eller om {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "Unban nu" @@ -1285,18 +1298,18 @@ msgstr "Unban nu" msgid "I2P Router Console" msgstr "I2P Router-konsol" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Fejl ved opdatering af konfiguration - Se venligst fejlloggen" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Konfigurationen er gemt med success " -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1504,7 +1517,7 @@ msgid "Add Client" msgstr "Tilføj Klient" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Klient" @@ -1536,9 +1549,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Version" @@ -1560,7 +1573,8 @@ msgstr "Licens" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Hjemmeside" @@ -1573,7 +1587,7 @@ msgid "Stop" msgstr "Stop" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Check for opdateringer" @@ -1595,7 +1609,7 @@ msgstr "Slet" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1605,7 +1619,7 @@ msgstr "Slet valgte" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1624,7 +1638,7 @@ msgstr "Gendanne standarder" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1753,8 +1767,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Fjern" @@ -1764,7 +1778,7 @@ msgstr "Vælg en klasse der skal tilføjes" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Båndbredde" @@ -1773,7 +1787,7 @@ msgid "Home Page" msgstr "Hjemmeside" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Netværk" @@ -1829,9 +1843,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunneler" @@ -1849,15 +1863,15 @@ msgid "Logging" msgstr "Logning" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peers" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "statistik" @@ -1869,8 +1883,8 @@ msgstr "Avanceret" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2131,7 +2145,7 @@ msgstr "Genstart med det samme" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Genstart" @@ -2602,8 +2616,8 @@ msgid "User Name" msgstr "Brugernavn" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Tilføje" @@ -2612,91 +2626,91 @@ msgstr "Tilføje" msgid "Password" msgstr "Adgangskode" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Opdatere eller tjek forvejen i gang" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Der er en tilgængelig opdatering, prøver at downloade." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Der er en tilgængelig opdatering, klik på knappen til venstre for at downloade." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Der er ingen tilgængelige opdateringer" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Opdatering af nyhedsURL til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "intern" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Opdatering af proxyvært til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Opdatering af proxyport til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Opdaterer opdateringsfrekvens {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Aldrig" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Opdatering af opdateringspolicy til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Opdaterer opdaterings URLer." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Opdaterer betroede nøgler." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Opdaterer usigneret opdateringsURL til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "Opdaterer signered udviklingsbuild URL til {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Enhver" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Notificer kun" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Download og verificer kun" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Download, verificer og genstart" @@ -2822,7 +2836,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Ingen \"{0}\" hændelser fundet i tidligere {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tid" @@ -2972,12 +2986,12 @@ msgid "Graph settings saved" msgstr "Graf indstillinger blev gemt" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Adressebog" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Hold styr på din I2P host-fil her (I2P domænenavns vedtagelse)" @@ -3008,17 +3022,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P Hjemmesidekonfiguration" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonym webmail klient" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Router Hjælp" @@ -3028,17 +3042,17 @@ msgid "Router Console" msgstr "Router Konsol" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Indbygget anonym BitTorrent klient" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Lokal webserver" @@ -3207,97 +3221,97 @@ msgstr "HTTP proxyn er ikke oppe" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Din browser er ikke korrekt konfigueret til at bruge HTTP proxyn på {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Navn" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "I2P Jobkø" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Job körer" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Aktive job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "begyndte {0} siden" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Lige afslutet jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "afslutet {0} siden" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Færdige/ventede jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Planlagte jobs" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} vil starte i {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Samlede Jobstatistikker" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "I Kø" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Kører" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Dropped" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Avg" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Afventer" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Resumé" @@ -3315,223 +3329,223 @@ msgid "No log messages" msgstr "Der er ingen log beskeder" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Lokal Router" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Router Opslag" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Alle Routers" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Alle Routere med Fulle Stats" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "ikke fundet i netværksdatabasen" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Lokal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "ikke publiceret" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destination" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Føje til den lokale adressebog" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Udløber om {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Udløbet for {0} siden" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Ikke initialiseret" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Netværksdatabase Router statistik" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Antal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transporter" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Land" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Vores information" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Peer information for" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Hele posten" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Gemt" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Opdateret" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} siden" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publiceret" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Underskriftsnøgle" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adresse(r)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "omkostninger" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Gemt eller under opstart" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU med introdutører " -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP og SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP og SSU med introdutører" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 kun SSU, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 kun NTCP, SSU, introducers" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Nyheder blev sidst opdateret for {0} siden" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Nyheder blev sidst tjekket for {0} siden" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Skjul nyheder" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Vis nyheder" @@ -3581,19 +3595,19 @@ msgid "Groups (Caps)" msgstr "Grupper (Caps)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Hastighed" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapacitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integration" @@ -3616,7 +3630,7 @@ msgid "Failing" msgstr "Svigtende" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integreret" @@ -3693,71 +3707,71 @@ msgstr "1h fejlfrekvens" msgid "1d Fail Rate" msgstr "1d fejlfrekvens" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Tærskler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "Hurtige peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "Højkapacitet peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "godt integrerede peers " -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "som besluttet af profilarrangøren" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "Grupper" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "kapaciteter i netDb, anvendes ikke til at bestemme profilerne" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "caps" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "Top gennemstrømning (bytes pr. sekund) over en periode på 1 minut som klienten har holdt i den samme tunnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "hastighed" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "kapacitet" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "hvor mange tunneler kan vi spørge dem at tilslutte sig i timen?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "hvor mange nye peers har de fortalt os om på det seneste?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "Integration" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "er klienten banned, utilgængelig eller mislykkes tunnel testene?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "status" @@ -3885,277 +3899,277 @@ msgstr "Diagram over antal hændelser" msgid "Lifetime average value" msgstr "Livstids gennemsnitsværdi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Router Hjælp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Hjælp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Konfigurer opstart af klienter og webapps (tjenester); manuel start af hvilende tjenester" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P tjenester" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Konfigurer I2P Router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P Internt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Se eksisterende tunneler og status på tunneler som bygges" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Vis alle de nuværende klient forbindelser" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Vis seneste klient ydelsesprofiler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Vis liste over kendte I2P routere" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Sundheds Rapport" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Logs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Graf over routerens ydelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Grafer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Tekstbaseret statistik over routerens ydelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Lokale Tunneler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Skjulte Tjenster Manager" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Genarelt " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Din lokale identitet er din unike I2P router identitet, tilsvarande en ip adresse men tilpasset I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Aldrig vidaregive dette til nogen, da det kan afsløre din rigtige ip-adresse." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Lokal Identitet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Din unikke I2P router identitet er" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "afslør aldrig denne for nogen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "vis" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Den version af I2P som vi kører." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Hvor længe vi har været i gang i denne session" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Hjælp med konfiguration af firewall og router for den optimale I2P ydelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Se mere information på wikien" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Advarsel: ECDSA er ikke tilgængelig. Opdater din Java eller OS" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Konfigurere I2P Opdateringer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P Opdatering" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Peers som vi snakket med de sidste minutter/ sidste time" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Aktiv" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Antallet af peers til rådighed at bygge klienttunneler " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Hurtig" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Antallet af peers til rådighed at bygge sonderende tunneler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Høj kapacitet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Antallet af peers til rådighed for forespørgsler til netværksdatabasen " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Det samlade antal peers i vores netværkdatabase" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Kendte" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Konfigurer routerens båndbredde bevilling " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Båndbredde ind/ud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Used" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Bruges til opbygning og afprøvning af tunneler, og kommunikation med floodfill peers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Udforskende" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunneler, vi bruger til at levere eller få adgang til tjenester på netværket" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Tunneler vi deltager i, og direkte bidrager med båndbredde til netværket" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Deltagende" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Forholdet mellem tunnel hops vi leverer med tunnel hops vi bruger - en værdi større end 1.00 indikerer et positivt bidrag til netværket" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Del-ratio " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Hvad er der i routerens jobkø?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Overfyldning" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indikerer routerens ydeevne" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Arbejdsforsinkelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indikerer hvor hurtigt udgående beskeder til andre i2P routere er sendt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Besked fosinkelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Tiden for en tunneltest fra start til slut" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tunnel forsinkelse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Kø anmodninger fra andre routere til at deltage i tunneler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Efterslæb" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Nyheder &s; Opdateringer" @@ -4259,26 +4273,26 @@ msgstr "Opbygger tunneler" msgid "shared clients" msgstr "delte klienter " -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Klik på Genstart for at installere" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Klik på Luk Ned og Genstart for at installerer" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Version {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Opdatering tilgængelig" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Download {0} Opdatering" @@ -4287,7 +4301,7 @@ msgstr "Download {0} Opdatering" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "Hent signerede
Development opdatering
{0}" @@ -4296,69 +4310,85 @@ msgstr "Hent signerede
Development opdatering
{0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Download usigneret
Opdatering {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Hjælp med konfiguration af firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Tjek NAT/firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Reseed" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "rækkefølge " -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Top" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Ned" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Bund" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Vælg et felt til at tilføje" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "hændelser i {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "gennemsnit for {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Hændelser pr. periode" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "Gennemsnit" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "maks" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "nu" @@ -4535,175 +4565,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Åben Router Konsol in webbrowseren ved opstart" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassisk" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "mørk" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "lyst" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "midnat" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "BåndbreddeBegrænser" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "KlientBeskeder" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Kryptering" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp " -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPoo" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "JobKø" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "NetværksDatabase" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Stream" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Hastighedsregulator" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "vært" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "nøgle" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "tag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "konfigurere båndbredde" @@ -4872,7 +4854,7 @@ msgid "Share" msgstr "Del" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTE" @@ -4913,7 +4895,7 @@ msgid "Advanced network configuration page" msgstr "Avanceret network konfigurationsside" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4952,27 +4934,35 @@ msgid "" "computer's resources." msgstr "Floodill deltagelse hjælper netværket, men kan bruge mere af computerens ressourcer." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Automatisk" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Tvinge på" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Deaktivere" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Avanceret I2P konfiguration" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Nogle ændringer kræver et genstart, før de kan træde i kraft" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Hvis du vil foretage ændringer, skal du redigere filen {0}." diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 5f67f6edc..2869ea281 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -19,15 +19,16 @@ # nextloop , 2013 # pirr , 2012 # pirr , 2012 +# Forecast , 2015 # zeroflag , 2013 # zeroflag , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 18:14+0000\n" -"Last-Translator: Ettore Atalan \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,8 +47,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -56,8 +57,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -66,8 +67,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -76,37 +77,46 @@ msgstr[1] "{0} Minuten" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 Stunde" msgstr[1] "{0} Stunden" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "nicht verfügbar" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "einen Tag" msgstr[1] "{0} Tage" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "nicht verfügbar" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "{0,number,###} ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -149,7 +159,7 @@ msgstr "An" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "keine" @@ -288,43 +298,43 @@ msgstr "Weise Tunnelanfragen zurück: Beende Router" msgid "Rejecting tunnels" msgstr "Weise Tunnelanfragen zurück" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Reseede: Bekam Router Informationen aus der Datei ({0} erfolgreich, {1} Fehler)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeden" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Nur Daten eines Routers per Reseed erhalten" msgstr[1] "Nur {0} Routerinformationen per Reseed erhalten" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed fehlgeschlagen" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Für Hilfe, siehe {0}!" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "Konfigurationsseite für das Reseeden" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseed: Hole die Seed-URL" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -364,7 +374,7 @@ msgstr "Bekannte integrierte (FloodFill) Kontakte" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" -msgstr "" +msgstr "Größe des zulässigen Rückstands an Tunnelanfragen" #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:502 msgid "NetDb entry" @@ -394,7 +404,7 @@ msgstr "Unerreichbar auf allen Transporten" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -409,7 +419,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} wird nur für ausgehende Verbindungen genutzt" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP ist nicht aktiviert." @@ -432,13 +442,13 @@ msgid "" msgstr "Um diese Einstellungen zu umgehen, fügen Sie folgende Einstellungen der Seite \"Erweiterte Konfiguration\" hinzu: i2np.ntcp.maxConnections=nnn und i2np.udp.maxConnections=nnn" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definitionen" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -453,7 +463,7 @@ msgstr "Der entfernte Teilnehmer, über seine Router-Prüfsumme erkannt" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Richtung" @@ -480,13 +490,13 @@ msgstr "vergangene Zeit seit ein Paket empfangen/gesendet wurde" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "untätig" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "ein-/ausgehend" @@ -501,14 +511,14 @@ msgstr "wie lange die Verbindung schon besteht" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "verbunden" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Differenz" @@ -557,7 +567,7 @@ msgstr "derzeit maximale Größe der gesendeten Pakete / geschätzte maximale Gr #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "gesendet" @@ -567,7 +577,7 @@ msgstr "Gesamtanzahl der an den Teilnehmer gesendeten Pakete" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "empfangen" @@ -576,7 +586,7 @@ msgid "The total number of packets received from the peer" msgstr "Gesamtanzahl der vom Teilnehmer empfangenen Pakete" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "mehrfach gesendet" @@ -585,7 +595,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Gesamtanzahl der an den Teilnehmer erneut gesendeten Pakete" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "mehrfach empfangen" @@ -624,8 +634,8 @@ msgstr "WAN-PPP-Verbindung" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Laufzeit" @@ -720,17 +730,17 @@ msgid "NTCP connections" msgstr "NTCP-Verbindungen" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "obere Grenze" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -743,126 +753,126 @@ msgid "Backlogged?" msgstr "Rückstau" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "ankommend" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "abgehend" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} Teilnehmer" msgstr[1] "{0} Teilnehmer" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP-Verbindungen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Nach Router-Prüfsumme sortieren" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Richtung/Bekanntmachung" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sortieren nach untätigen eingehenden Verbindungen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sortieren nach untätigen ausgehenden Verbindungen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sortieren nach eingehender Transferrate" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sortieren nach ausgehender Transferrate" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sortieren nach Lebensdauer der Verbindung" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sortieren nach Zeitunterschied" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sortieren nach Größe des Pufferspeichers" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sortieren nach Grenzwert des verzögerten Startens" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sortieren nach Rundenzeit" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sortieren nach Timeout beim erneuten Senden" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sortieren nach maximaler ausgehender Transferpaketgröße" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sortieren nach Anzahl gesendeter Pakete" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sortieren nach Anzahl empfangener Pakete" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sortieren nach Anzahl erneut gesendeter Pakete" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sortieren nach Anzahl mehrfach empfangener Pakete" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Wir bieten an, diese bekannt zu machen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Diese boten an, uns bekannt zu machen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "gedrosselt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 Fehler" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} fehlgeschlagen" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Gesperrt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "im Rückstand" @@ -900,66 +910,66 @@ msgstr "Ignoriere Tunnelanfragen: Hohe Last" msgid "Dropping tunnel requests: Queue time" msgstr "Ignoriere Tunnelanfragen: zu lange Warteschlange" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Neue Version des Zusatzprogramms ist verfügbar ({0})" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Überprüfung auf neue Version des Zusatzprogramms {0} fehlgeschlagen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Keine neue Version des Zusatzprogrammes {0} verfügbar" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}Bytes übertragen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Installation von {0} fehlgeschlagen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Übertragung von {0} fehlgeschlagen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Aktualisierung heruntergeladen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Starte neu" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Aktualisierung verifiziert" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "von {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Unsignierte Aktualisierungsdatei von {0} ist fehlerhaft" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Kopieren nach {0} fehlgeschlagen" @@ -972,10 +982,10 @@ msgstr "Kopieren nach {0} fehlgeschlagen" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" -msgstr "" +msgstr "Proxy-Tunnel des HTTP-Clients muss aktiv sein" #. set status before thread to ensure UI feedback #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91 @@ -986,20 +996,20 @@ msgstr "" msgid "Updating" msgstr "Aktualisiere" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Netzwerkinterne Aktualisierungen deaktiviert. Schauen Sie im Paket Manager nach." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Keine Schreibberechtigung im I2P Installations Verzeichnis." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Sie müssen zuerst auf Version {0} upgraden." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Benötigt Java Version {0}, Sie haben aber Java Version {1} installiert" @@ -1189,16 +1199,20 @@ msgid "No new version found at {0}" msgstr "Keine neue Version unter {0} gefunden" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "vorübergehende Sperrung endet in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Gesperrt bis zum Neustart oder in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "Bann aufheben" @@ -1299,18 +1313,18 @@ msgstr "Bann aufheben" msgid "I2P Router Console" msgstr "I2P-Routerkonsole" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Fehler beim Aktualisieren der Konfiguration - Bitte schauen Sie in die Fehlerprotokolle!" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Konfiguration erfolgreich gespeichert" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1390,7 +1404,7 @@ msgstr "Starten" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:282 msgid "New client added" -msgstr "Neuer Klient hinzugefügt" +msgstr "Neuer Client hinzugefügt" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:287 msgid "Client configuration saved successfully" @@ -1518,7 +1532,7 @@ msgid "Add Client" msgstr "Klienten hinzufügen" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Klient" @@ -1550,9 +1564,9 @@ msgid "Plugin" msgstr "Zusatzprogramm" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Version" @@ -1574,7 +1588,8 @@ msgstr "Lizenz" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Webseite" @@ -1587,7 +1602,7 @@ msgid "Stop" msgstr "Stopp" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Auf Aktualisierungen prüfen" @@ -1609,7 +1624,7 @@ msgstr "löschen" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1619,7 +1634,7 @@ msgstr "Lösche ausgewähltes" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1638,7 +1653,7 @@ msgstr "Auf Standardwerte zurücksetzen" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1767,8 +1782,8 @@ msgstr "WARNUNG" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Entfernen" @@ -1778,7 +1793,7 @@ msgstr "Klasse auswählen" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Bandbreite" @@ -1787,7 +1802,7 @@ msgid "Home Page" msgstr "Homepage" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Netzwerk" @@ -1843,9 +1858,9 @@ msgid "UI" msgstr "Benutzerschnittstelle" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnel" @@ -1863,15 +1878,15 @@ msgid "Logging" msgstr "Statusmeldungen" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Teilnehmer" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistiken" @@ -1883,8 +1898,8 @@ msgstr "Erweitert" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2145,7 +2160,7 @@ msgstr "Sofortiger Neustart" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Neustart" @@ -2616,8 +2631,8 @@ msgid "User Name" msgstr "Benutzername" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Hinzufügen" @@ -2626,91 +2641,91 @@ msgstr "Hinzufügen" msgid "Password" msgstr "Passwort" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Es wird bereits auf Aktualisierungen geprüft." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Aktualisierung verfügbar; versuche, diese herunterzuladen" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Aktualisierung verfügbar. Klick auf den Knopf links, um sie herunterzuladen!" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Keine Aktualisierung verfügbar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Aktualisiere die Adresse für Benachrichtigungen auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "intern" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Aktualisiere Proxyserver auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Aktualisiere den Port des Proxys auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Aktualisiere die Häufigkeit des Neuladens auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nie" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Aktualisiere die Aktualisierungsrichtlinien auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Aktualisiere die Aktualisierungsadressen auf" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Aktualisiere die vertrauten Schlüssel" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Aktualisiere die Adresse der unsignierten Aktualisierungsdatei auf {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" -msgstr "" +msgstr "Aktualisiere URL für signierte Entwicklerversionen zu {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Alle" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Nur benachrichtigen" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Nur herunterladen und überprüfen" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Herunterladen, überprüfen und neustarten" @@ -2836,7 +2851,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Keine \"{0}\" Ereignisse gefunden in vorhergehende {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Zeit" @@ -2986,12 +3001,12 @@ msgid "Graph settings saved" msgstr "Einstellungen zu Grafiken gespeichert" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Adressbuch" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Verwalten Sie Ihre I2P-Adressen hier (I2P-Namensauflösung)" @@ -3022,17 +3037,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P-Homepagekonfiguration" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Webmail-Klient für anonyme E-Mail" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-Mail" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Hilfe zum I2P-Router" @@ -3042,17 +3057,17 @@ msgid "Router Console" msgstr "I2P-Routerkonsole" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Integrierter anonymer BitTorrent-Klient" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "BitTorrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Lokaler Webserver" @@ -3221,97 +3236,97 @@ msgstr "Der HTTP-Proxy ist nicht bereit" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Dein Browser ist nicht richtig konfiguriert, um den HTTP-Proxy auf {0} zu benutzen" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Name" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "I2P Job Queue" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Job Runners" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Aktive Jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "vor {0} gestartet" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Gerade beendete Jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "vor {0} beendet" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Fertige/wartende Jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Scheduled Jobs" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} wird in {1} starten" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Gesamte Job Statistik" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "Queued" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Laufend" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Verworfen" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Avg" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Wartend" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Überblick" @@ -3329,223 +3344,223 @@ msgid "No log messages" msgstr "keine Ereignisse" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Lokaler Router" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Routersuche" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Alle Router" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Alle Router mit vollständigen Statistiken" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "nicht in der Netzwerkdatenbank gefunden" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "lokal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "unveröffentlicht" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Ziel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Zum lokalen Adressbuch hinzufügen" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Wird in {0} ungültig" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Wurde vor {0} ungültig" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Schnittstelle" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Nicht initialisiert" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Netzwerkdatenbank Routerstatistiken" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Anzahl" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transporte" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Land" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Informationen über uns" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Informationen über den Teilnehmer" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Ganzer Eintrag" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Versteckt" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Aktualisiert" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "vor {0}" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Veröffentlicht" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Signierungsschlüssel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adresse(n)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "Kosten" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Versteckt oder Startphase" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU mit Hilfsrouter" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP und SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP und SSU mit Hilfsrouter" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "nur IPv6 SSU, Introducer" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSu" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, Introducer" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, Introducer" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "nur IPv6 NTCP, SSU, Introducer" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Zeit seit letzter Aktualisierung der Benachrichtigungen: {0};" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Zeit seit letzter Prüfung auf neue Benachrichtigungen: {0}" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Neuigkeiten verstecken" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Neuigkeiten anzeigen" @@ -3595,19 +3610,19 @@ msgid "Groups (Caps)" msgstr "Gruppen (Kategorien)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Geschwindigkeit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapazität" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integration" @@ -3630,7 +3645,7 @@ msgid "Failing" msgstr "fehlgeschlagen" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "integriert" @@ -3707,71 +3722,71 @@ msgstr "stündl. Fehlerrate" msgid "1d Fail Rate" msgstr "tägl. Fehlerrate" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Grenzwerte" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "schnelle Teilnehmer" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "Teilnehmer hoher Kapazität" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "gut integrierte Teilnehmer" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "wie vom Profilorganisator ermittelt" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "Gruppen" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "Werte in der Netzwerkdatenbank, nicht zum Ermitteln der Profile verwendet" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "Kategorien" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "maximaler Durchsatz (Bytes je Tunnel) innerhalb einer Minute, den ein Teilnehmer in einem einzelnen Tunnel erreicht hat" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "Geschwindigkeit" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "Kapazität" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "Wie viele Tunnel können wir bei diesem Teilnehmer innerhalb einer Stunde bekommen?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "Wie viele neue Kontakte hat dieser Teilnehmer uns kürzlich mitgeteilt?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "Integration" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "Ist der Teilnehmer gesperrt, unerreichbar, oder schlagen die Tunneltests fehl?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "Status" @@ -3899,277 +3914,277 @@ msgstr "Ereignisse graphisch darstellen" msgid "Lifetime average value" msgstr "Durchschnitt über Lebenszeit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Hilfe zum I2P-Router & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Hilfe & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Autostart-Einstellungen der Klienten und WebApplikationen (Services); manuelles Starten der ruhenden Services" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P-Dienste" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Konfiguration des I2P-Routers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Einstellungen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Betrachte die existierenden Tunnel und den Status des Tunnelaufbaus" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Zeige alle bestehenden Verbindungen zu Teilnehmern" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Zeige aktuelle Leistungsprofile der Teilnehmer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profile" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Eine Liste aller bekannten I2P-Router anzeigen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetzDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Gesundheitszustand" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Statusberichte" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Graphische Darstellung der Routerleistung" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Graphen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Statistiken über die Leistung des Routers in Textform" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Lokale Tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Verwaltung der versteckten Services" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Grundsätzliches" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Deine lokale Identität ist deine einzigartige I2P-Routeridentität, ähnlich einer IP-Adresse, jedoch speziell für I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Gib dies niemals irgendjemandem preis, es könnte deine echte IP-Adresse verraten." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "lokale Identität" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Ihre eindeutige I2P-Routeridentifikation ist" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "Verraten Sie sie niemandem!" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "anzeigen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Dies ist die Version von I2P, die aktuell läuft." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Wie lange ist der I2P-Router seit dem letztem Neustart aktiv" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Hilfe bei der Konfiguration Ihrer Firewall und Ihres Routers für eine optimale Leistung." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Mehr Informationen sind im Wiki verfügbar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Warnung: ECDSA ist nicht verfügbar. Aktualisieren Sie Ihr Java oder Betriebssystem" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Einstellungen zur Aktualisierung" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P-Aktualisierung" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Teilnehmer mit denen wir in den letzen Minuten / Stunden kommuniziert haben" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "aktiv" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Anzahl der für den Aufbau von Klient-Tunneln verfügbaren Teilnehmer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "schnell" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Anzahl der für den Aufbau von Erkundungstunneln verfügbaren Teilnehmer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "hohe Kapazität" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Anzahl der Teilnehmer, die für Anfragen an die Netzwerk-Datenbank zur Verfügung stehen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Gesamtanzahl an Teilnehmern in unserer Netzwerk-Datenbank" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "bekannt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Konfigurieren der Bandbreitenzuweisung des Routers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Bandbreite ein-/ausgehend" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "gesamt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "genutzt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "benutzt zum Aufbau und Testen von Tunneln, sowie der Kommunikation mit Floodfill-Teilnehmern" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Erkundung" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunnel, die wir zur Verfügung stellen oder nutzen, um auf Dienste im Netzwerk zuzugreifen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Tunnel an denen wir teilnehmen und über die wir direkt Bandbreite für das Netzwerk zur Verfügung stellen" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "teilnehmend an" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr " Verhältnis der Tunnelsprünge, die wir dem Netz zur Verfügugn stellen, zu denen, die wir selbst benutzen - ein Wert größer als 1,00 bedeutet einen positiven Beitrag zum I2P-Netzwerk" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Kooperationsfaktor" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Was ist in der Aufgabenliste des Routers?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Aufgaben" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "zeigt die gegenwärtige Leisutng des Routers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Aufgabenverzug" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "zeigt, wie schnell Nachrichten an andere I2P-Router gesendet werden" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Nachrichtenverzug" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Hin- und Rücklaufzeit für einen Tunneltest" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tunnelverzug" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "wartende Anfragen anderer Router zur Teilnahme in deren Tunneln" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Anfragenrückstau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Benachrichtigungen & Aktualisierungen" @@ -4273,26 +4288,26 @@ msgstr "Baue Tunnel auf" msgid "shared clients" msgstr "versch. Klienten" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Klicken Sie auf Neustart zum Installieren der" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Klicken Sie zum Installieren auf Herunterfahren und Neustarten" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Version {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Aktualisierung verfügbar" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Aktualisierung herunterladen ({0})" @@ -4301,78 +4316,94 @@ msgstr "Aktualisierung herunterladen ({0})" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" -msgstr "" +msgstr "Signierte Entwickler-
version herunterladen:
{0}" #. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" -msgstr "unsignierte Aktualisierung herunterladen: {0}" +msgstr "Unsignierte Aktualisierung herunterladen: {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Hilfe bei der Firewallkonfiguration" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Überprüfe die Netzwerkverbindung und deine NAT/Firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Hole neue Teilnehmerinformationen" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Reihenfolge" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "ganz oben" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "runter" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "ganz unten" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Markiere eine Sektion zum Hinzuzufügen" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "Ereignisse in {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "gemittelt für {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Ereignisse je Zeitintervall" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "Durchschnitt" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "Max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "Jetzt" @@ -4549,175 +4580,127 @@ msgid "Open Router Console in web browser at startup" msgstr "nach dem Starten die Routerkonsole im Browser anzeigen" #: ../java/strings/Strings.java:37 -msgid "IRC proxy" -msgstr "IRC-Brücke" +msgid "shared clients (DSA)" +msgstr "" #: ../java/strings/Strings.java:38 +msgid "IRC proxy" +msgstr "IRC-Proxy" + +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "Eepseite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P-Webserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" -msgstr "HTTP-Brücke" +msgstr "HTTP-Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 -msgid "eepProxy" -msgstr "eepBrücke" - #: ../java/strings/Strings.java:43 +msgid "eepProxy" +msgstr "eepProxy" + +#: ../java/strings/Strings.java:44 msgid "ircProxy" -msgstr "ircBrücke" +msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassisch" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "dunkel" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "hell" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "Mitternacht" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Bandbreitenbegrenzer" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "Klienten-Nachrichten" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Verschlüsselung" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "Pool im Netz" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "Auftragswarteschlange" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "NetzwerkDatenbank" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Strom" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Drosselung" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "Host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "Schlüssel" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "Port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "Bandbreite einstellen" @@ -4886,7 +4869,7 @@ msgid "Share" msgstr "für andere zur Benutzung freigegeben" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "HINWEIS" @@ -4927,7 +4910,7 @@ msgid "Advanced network configuration page" msgstr "Erweiterte Netzwerkkonfigurationsseite" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4958,35 +4941,43 @@ msgstr "I2P Erweiterte Konfiguration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:435 msgid "Floodfill Configuration" -msgstr "" +msgstr "Floodfill-Konfiguration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:437 msgid "" "Floodill participation helps the network, but may use more of your " "computer's resources." +msgstr "Floodfill-Teilnahme hilft dem Netzwerk, kann aber die Systemressourcen stärker beanspruchen." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Automatisch" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Erzwingen ein" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Deaktivieren" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Erweiterte I2P-Konfiguration" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Einige Einstellungen benötigen einen Routerneustart, um aktiv zu werden." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Um Änderungen vorzunehmen, bearbeiten Sie die Datei {0}." @@ -5359,7 +5350,7 @@ msgstr "IPv4-Konfiguration" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536 msgid "Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)" -msgstr "" +msgstr "Deaktiviere eingehende Verbindungen (Firewall ist aktiv)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538 msgid "IPv6 Configuration" @@ -5789,7 +5780,7 @@ msgstr "Sie haben unter TCP eingehend keinen Hostnamen und Port eingetragen und #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:792 msgid "Therefore your router cannot accept inbound connections." -msgstr "Somit kann Ihr Router keine eigehenden Verbindungen akzeptieren." +msgstr "Somit kann Ihr Router keine eingehenden Verbindungen akzeptieren." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:794 msgid "Please configure a TCP host and port above or enable UDP." @@ -5970,11 +5961,11 @@ msgstr "HTTP-Proxy aktivieren?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:543 msgid "HTTP Proxy Host" -msgstr "IP der HTTP-Brücke" +msgstr "Host des HTTP-Proxys" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:547 msgid "HTTP Proxy Port" -msgstr "Port der HTTP-Brücke" +msgstr "Port des HTTP-Proxys" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:551 msgid "Use HTTP Proxy Authorization?" @@ -6367,11 +6358,11 @@ msgstr "Vertraute Schlüssel" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:517 msgid "Update with signed development builds?" -msgstr "" +msgstr "Mit signierten Entwicklerversionen aktualisieren?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:521 msgid "Signed Build URL" -msgstr "" +msgstr "URL für signierte Aktualisierungen" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:525 msgid "Update with unsigned development builds?" @@ -6573,7 +6564,7 @@ msgstr "WebApplikation nicht gefunden" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:348 msgid "Web Application Not Running" -msgstr "Web Applikation ist nicht aktiv" +msgstr "Web-Anwendung nicht aktiv" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:350 msgid "The requested web application is not running." @@ -6582,7 +6573,7 @@ msgstr "Die angeforderte Web-Anwendung ist nicht aktiv." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/nowebapp_jsp.java:352 #, java-format msgid "Please visit the {0}config clients page{1} to start it." -msgstr "" +msgstr "Bitte gehen Sie auf die {0}Client-Konfigurationsseite{1} um zu starten." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/peers_jsp.java:146 msgid "peer connections" diff --git a/apps/routerconsole/locale/messages_el.po b/apps/routerconsole/locale/messages_el.po index 55500f5d1..48966945f 100644 --- a/apps/routerconsole/locale/messages_el.po +++ b/apps/routerconsole/locale/messages_el.po @@ -9,12 +9,13 @@ # Alex , 2012 # lixtetrax , 2012 # lixtetrax , 2012 +# LOUKAS SKOUROLIAKOS, 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Greek (http://www.transifex.com/projects/p/I2P/language/el/)\n" "MIME-Version: 1.0\n" @@ -34,8 +35,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -44,8 +45,8 @@ msgstr[1] "{0,number,####} μιλιδευτερόλεπτα" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -54,8 +55,8 @@ msgstr[1] "{0} δευτ" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,37 +65,46 @@ msgstr[1] "{0} λεπτ" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 ώρα" msgstr[1] "{0} ώρες" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "Μ/Δ" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 μέρα" msgstr[1] "{0} μέρες" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "Μ/Δ" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -137,10 +147,10 @@ msgstr "Σε" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" -msgstr "" +msgstr "κανένα" #. * IPv4 OK, IPv6 OK or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:311 @@ -276,43 +286,43 @@ msgstr "Απόρριψη τούνελ : Κλείσιμο" msgid "Rejecting tunnels" msgstr "Απόρριψη τούνελ" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Δείτε {0} για βοήθεια." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -382,7 +392,7 @@ msgstr "Μη προσβάσιμο από κανένα μεταφορέα" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Κατάσταση" @@ -397,7 +407,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} χρησιμοποιείται για εξερχόμενες συνδέσεις μονο" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "Το UPnP δεν είναι ενεργοποιημένο" @@ -420,13 +430,13 @@ msgid "" msgstr "Για να θέσετε δικά σας όρια, προσθέστε τα i2np.ntcp.maxConnections=nnn και i2np.udp.maxConnections=nnn στη σελίδα προχωρημένης παραμετροποίησης." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Ορισμοί" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -441,7 +451,7 @@ msgstr "Ο απομακρυσμένος ομότιμος, αναγνωρισμέ #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Κατάλογος" @@ -468,13 +478,13 @@ msgstr "Χρονικό διάστημα από την λήψη/αποστολή #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Αδρανής" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Μέσα/Έξω" @@ -489,14 +499,14 @@ msgstr "Χρονικό διάστημα από την εγκαθίδρυση α #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Πάνω" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Απόκλιση" @@ -545,7 +555,7 @@ msgstr "Τρέχον μέγιστο μέγεθος πακέτου αποστολ #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "Αποστολή" @@ -555,7 +565,7 @@ msgstr "Συνολικός αριθμός πακέτων που εστάλησα #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "Λήψη" @@ -564,7 +574,7 @@ msgid "The total number of packets received from the peer" msgstr "Συνολικός αριθμός πακέτων που ελήφθησαν από τον ομότιμο" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Ταυτόσημες TX" @@ -573,7 +583,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Συνολικός αριθμός πακέτων που επανεστάλησαν στον ομότιμο" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Ταυτόσημες RX" @@ -612,8 +622,8 @@ msgstr "Σύνδεση WAN PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -708,17 +718,17 @@ msgid "NTCP connections" msgstr "NTCP συνδέσεις" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Όριο" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Λήξη Χρόνου" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "" @@ -731,126 +741,126 @@ msgid "Backlogged?" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Εισερχόμενα" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Εξερχόμενα" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP συνδέσεις" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Ταξινόμηση σύμφωνα με το hash του ομότιμου" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Κατεύθυνση/Εισαγωγή" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Ταξινόμηση σύμφωνα την αδρανή εισερχόμενη" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Ταξινόμηση σύμφωνα την αδρανή εξερχόμενη" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Ταξινόμηση σύμφωνα με ρυθμό εισερχομένων" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Ταξινόμηση σύμφωνα με ρυθμό εξερχομένων" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Ταξινόμηση σύμφωνα με το χρόνο της σύνδεσης" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Ταξινόμηση σύμφωνα με την απόκλιση ρολογιού" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Ταξινόμηση σύμφωνα με το παράθυρο συμφόρησης" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Ταξινόμηση σύμφωνα με το κατώφλιο αργής εκκίνησης" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Ταξινόμηση σύμφωνα με τα απεσταλμένα πακέτα" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Ταξινόμηση σύμφωνα με τα ληφθέντα πακέτα" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Ταξινόμηση σύμφωνα με τον αριθμό πακέτων που επαναμεταδόθηκαν" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Ταξινόμηση σύμφωνα με τον αριθμό των πακέτων που ελήφθησαν πάνω από μια φορά" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Προσφερθήκαμε να τους εισάγουμε" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Προσθέρθηκαν να μας εισάγουν" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 αποτυχία" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} αποτυχίες" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Αποκλεισμένος" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -888,66 +898,66 @@ msgstr "Απόρριψη αιτημάτων για τούνελ: Υψηλό φο msgid "Dropping tunnel requests: Queue time" msgstr "Απόρριψη αιτημάτων για τούνελ: Χρόνος ουράς αναμονής" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Νέα έκδοση πρόσθετου {0} διαθέσιμη" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Ο έλεγχος για ενημέρωσεις του πρόσθετου {0} απέτυχε" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Δεν υπάρχει νέα έκδοση διαθέσιμη για το πρόσθετο {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} Bytes μεταφέρθηκαν" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Μεταφορά από {0} απέτυχε" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Η ενημέρωση κατέβηκε" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Γίνεται επανεκκίνηση" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Η ενημέρωση επαληθεύτηκε" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "από {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Το μη υπογεγραμμένο αρχείο ενημέρωσης από {0} είναι κατεστραμμένο" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Αντιγραφή από {0} απέτυχε" @@ -960,7 +970,7 @@ msgstr "Αντιγραφή από {0} απέτυχε" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -974,20 +984,20 @@ msgstr "" msgid "Updating" msgstr "Γίνεται ενημέρωση" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1177,16 +1187,20 @@ msgid "No new version found at {0}" msgstr "Δεν βρέθηκε νέα έκδοση στο {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1287,18 +1301,18 @@ msgstr "" msgid "I2P Router Console" msgstr "Κονσόλα I2P Router" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Σφάλμα κατά την ενημέρωση των ρυθμίσεων - παρακαλούμε δείτε τις καταγραφές λαθών" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Επιτυχής αποθήκευση ρυθμίσεων" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1506,7 +1520,7 @@ msgid "Add Client" msgstr "Προσθήκη Πελάτη" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Πελάτης" @@ -1538,9 +1552,9 @@ msgid "Plugin" msgstr "Πρόσθετο" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Έκδοση" @@ -1562,7 +1576,8 @@ msgstr "Άδεια" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Ιστότοπος" @@ -1575,7 +1590,7 @@ msgid "Stop" msgstr "Σταμάτα" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Έλεγχος για ενημερώσεις" @@ -1597,7 +1612,7 @@ msgstr "Διαγραφή" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1607,7 +1622,7 @@ msgstr "Διαγραφή επιλεγμένων" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1626,7 +1641,7 @@ msgstr "Επαναφορά προεπιλογών" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1755,8 +1770,8 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Αφαίρεση" @@ -1766,7 +1781,7 @@ msgstr "Επιλογή κλάσης για προσθήκη" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Εύρος Ζώνης" @@ -1775,7 +1790,7 @@ msgid "Home Page" msgstr "Αρχική Σελίδα" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Δίκτυο" @@ -1831,9 +1846,9 @@ msgid "UI" msgstr "Διεπαφή Χρήστη" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Τούνελ" @@ -1851,15 +1866,15 @@ msgid "Logging" msgstr "Καταγραφή" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Ομότιμοι" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Στατιστικά" @@ -1871,8 +1886,8 @@ msgstr "Προχωρημένα" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2133,7 +2148,7 @@ msgstr "Επανεκκίνηση αμέσως" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Επανεκκίνηση" @@ -2601,11 +2616,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:172 msgid "User Name" -msgstr "" +msgstr "Ονομα χρήστη" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Προσθήκη" @@ -2614,91 +2629,91 @@ msgstr "Προσθήκη" msgid "Password" msgstr "Κωδικός" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Διαθέσιμη ενημέρωση, προσπάθεια για κατέβασμα τώρα" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Ενημέρωση διαθέσιμη, πατήστε το κουμπί στα αριστέρα για κατέβασμα" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Καμιά ενημέρωση διαθέσιμη" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Ενημέρωση του URL ενημέρωσης σε {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "εσωτερικό" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Ενημέρωση της διεύθυνσης του proxy σε {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Ενημέρωση της πόρτας του proxy σε {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Ενημέρωση συχνότητας ανανέωσης σε {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Ποτέ" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Ενημέρωση πολιτικής ενημερώσεων σε {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Ανανέωση των διευθύνσεων URL για ενημερώσεις." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Ενημέρωση κλειδιών εμπιστοσύνης." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Κάθε" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Ειδοποίηση μόνο" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Κατέβασμα και ειδοποίηση μόνο" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Κατέβασμα, επαλήθευση και επανεκκίνηση" @@ -2824,7 +2839,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2974,12 +2989,12 @@ msgid "Graph settings saved" msgstr "Οι ρυθμίσεις των γραφημάτων αποθηκεύτηκαν" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3010,17 +3025,17 @@ msgid "I2P Home Page Configuration" msgstr "Ρύθμιση της Αρχικής Σελίδας I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "" @@ -3030,17 +3045,17 @@ msgid "Router Console" msgstr "Κονσόλα Router" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Τοπικός server ιστού" @@ -3209,97 +3224,97 @@ msgstr "Ο HTTP proxy server δεν είναι σε λειτουργία" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Ο browser σας δεν είναι σωστά ρυθμισμένος να χρησιμοποιεί HTTP proxy στο {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Όνομα" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Περίληψη" @@ -3317,223 +3332,223 @@ msgid "No log messages" msgstr "Κανένα μήνυμα καταγραφής" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Αναζήτηση Δρομολογητή" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Όλα οι δρομολογητές" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "δεν βρέθηκε στη βάση δεδομένων του δικτύου" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Τοπικό" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Μη δημοσιευμένο" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Προορισμός" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Λήγει σε {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Έληξε {0} πριν" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Τούνελ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Δεν αρχικοποιήθηκε" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Χώρα" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Τα στοιχεία μας" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Πληροφορίες ομότιμου για" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Πλήρης εγγραφή" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} πριν" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Δημοσιεύτηκε" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Διεύθυνση/εις" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "κόστος" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Κρυμμένο κατά την εκκίνηση" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP και SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Τα νέα ενημερώθηκαν {0} πριν." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Έγινε έλεγχος για νέα {0} πριν." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Κρύψιμο νέων" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Εμφάνιση νέων" @@ -3583,19 +3598,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Ταχύτητα" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Χωρητικότητα" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Ενσωμάτωση" @@ -3618,7 +3633,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Ενσωματωμένος" @@ -3695,71 +3710,71 @@ msgstr "Ρυθμός αποτυχίας 1 ώρας" msgid "1d Fail Rate" msgstr "Ρυθμός αποτυχίας 1 μέρας" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Κατώφλια" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "γρήγοροι ομότιμοι" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "ομότιμοι υψηλής χωρητικότητας" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "ομάδες" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "δυνατότητες στη βάση δεδομένων δικτύου, netDB, που δεν χρησιμοποιούνται για τον καθορισμό των προφίλ" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "ταχύτητα " -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "χωρητικότητα" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "ενσωμάτωση" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3887,277 +3902,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P Υπηρεσίες" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Προφίλ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Γραφήματα" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Γενικά" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Τοπική ταυτότητα" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "εμφάνιση" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4261,26 +4276,26 @@ msgstr "" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Κάνε κλικ στην επανεκκίνηση για εγκατάσταση" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Κάνε κλικ στο σβήσιμο και στη επανεκκίνησε για εγκατάσταση" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Έκδοση {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Κατέβασμα {0} Ενημερώσεων" @@ -4289,7 +4304,7 @@ msgstr "Κατέβασμα {0} Ενημερώσεων" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4298,69 +4313,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Κατέβασμα μη υπογεγραμμένης
Ενημέρωσης {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Ελέγξτε τη σύνδεση δικτύου και το NAT/firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Επίλεξε μια ενότητα για προσθήκη" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "γεγονότα σε {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Γεγονότα ανά περίοδο" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "μέσος όρος" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "τώρα" @@ -4537,175 +4568,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "κλασικό" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "σκοτεινό" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "ελαφρύ" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "μεσάνυχτα" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2P τούνελ" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Ρεύμα" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "κλειδί" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "πόρτα" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "Ρύθμιση εύρους ζώνης" @@ -4874,7 +4857,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "ΣΗΜΕΙΩΣΗ" @@ -4915,7 +4898,7 @@ msgid "Advanced network configuration page" msgstr "Σελίδα προχωρημένων ρυθμίσεων δικτύου" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4954,27 +4937,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" @@ -6521,15 +6512,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:148 msgid "logs" -msgstr "logs" +msgstr "εγγραφές" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:344 msgid "I2P Router Logs" -msgstr "Logs του I2P Router" +msgstr "Καταχωρήσεις του I2P Router" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:409 msgid "Critical Logs" -msgstr "Κρίσιμα logs" +msgstr "Κρίσιμαες εγγραφές" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:413 msgid "Router Logs" diff --git a/apps/routerconsole/locale/messages_es.po b/apps/routerconsole/locale/messages_es.po index fbd02a8fd..ce6316f26 100644 --- a/apps/routerconsole/locale/messages_es.po +++ b/apps/routerconsole/locale/messages_es.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 17:44+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 02:10+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/es/)\n" "MIME-Version: 1.0\n" @@ -44,8 +44,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -54,8 +54,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -64,8 +64,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -74,37 +74,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 hora" msgstr[1] "{0} horas" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/d" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 día" msgstr[1] "{0} días" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 año" +msgstr[1] "{0} años" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/d" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -147,7 +156,7 @@ msgstr "A" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "ninguno" @@ -286,43 +295,43 @@ msgstr "Rechazando túneles: Apagando" msgid "Rejecting tunnels" msgstr "Rechazando túneles" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Resembrado: Se obtuvo la información de routers I2P del fichero ({0} completados, {1} errores)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Resembrando (reseed)" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "El resembrado sólo obtuvo 1 router I2P." msgstr[1] "El resembrado sólo obtuvo {0} routers I2P." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "El resembrado falló." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Consulte {0} para obtener ayuda." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "página de configuración del resembrado (reseed)" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Resembrando: Descargando URL de la semilla (seed)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -392,7 +401,7 @@ msgstr "Inaccesible sobre cualquier transporte" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Estado" @@ -407,7 +416,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} se utiliza sólo para conexiones salientes" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP no está habilitado" @@ -430,13 +439,13 @@ msgid "" msgstr "Para rebasar estos límites, añada las configuraciones i2np.ntcp.maxConnections=nnn y i2np.udp.maxConnections=nnn en la página de configuración avanzada." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definiciones" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -451,7 +460,7 @@ msgstr "Par (peer) remoto vía identificador criptrográfico (hash) de su router #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dir" @@ -478,13 +487,13 @@ msgstr "El tiempo que hace que un paquete ha sido recibido / enviado" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Sin actividad" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Entrada/Salida" @@ -499,14 +508,14 @@ msgstr "El tiempo que hace que se estableció esta conexión" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Subida" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Desincronización" @@ -555,7 +564,7 @@ msgstr "Tamaño máximo actual de envío de paquete / tamaño máximo estimado d #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "Env" @@ -565,7 +574,7 @@ msgstr "El número total de paquetes enviados al par (peer)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "Rec" @@ -574,7 +583,7 @@ msgid "The total number of packets received from the peer" msgstr "El número total de paquetes recibidos del par (peer)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Env dup" @@ -583,7 +592,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "El número total de paquetes enviados de nuevo al par (peer)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Rec dup" @@ -622,8 +631,8 @@ msgstr "Conexión PPP WAN" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Periodo de actividad" @@ -718,17 +727,17 @@ msgid "NTCP connections" msgstr "Conexiones NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Límite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Periodo de espera" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -741,126 +750,126 @@ msgid "Backlogged?" msgstr "¿Pendiente?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Entrante" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Saliente" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} par" msgstr[1] "{0} pares" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Conexiones UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Ordenar por identificador criptográfico (hash) del par" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Dirección/Introducción" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Ordenar por inactividad entrante" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Ordenar por inactividad saliente" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Ordenar por tasa de entrada" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Ordenar por tasa de salida" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Ordenar por duración de la conexión" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Ordenar por desincronización del reloj" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Ordenar por ventana de congestión" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Ordenar por umbral del algoritmo de comienzo lento" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Ordenar por periodo de ida y vuelta" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Ordenar por periodo de espera de retransmisión" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Ordenar por unidad de transmisión máxima de salida" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Ordenar por paquetes enviados" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Ordenar por paquetes recibidos" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Ordenar por paquetes retransmitidos" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Ordenar por paquetes recibidos más de una vez" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Nos hemos ofrecido a introducirles" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Se han ofrecido a introducirnos" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Atascado" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 fallido" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} fallidos" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Excluido" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "pendientes" @@ -898,66 +907,66 @@ msgstr "Descartando solicitudes de túnel: Carga elevada" msgid "Dropping tunnel requests: Queue time" msgstr "Descartando solicitudes de túnel: Tiempo en cola" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Está disponible una nueva versión del complemento {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Fallo al buscar actualizaciones para el complemento {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "No hay ninguna versión nueva disponible para el complemento {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B transferidos" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "La instalación desde {0} falló" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Transferencia fallida de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Actualización descargada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Reiniciando" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Actualización verificada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "El archivo de actualización no firmado de {0} está dañado" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Fallo al copiar a {0}" @@ -970,7 +979,7 @@ msgstr "Fallo al copiar a {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "El túnel del proxy del cliente HTTP tiene que estar en marcha" @@ -984,20 +993,20 @@ msgstr "El túnel del proxy del cliente HTTP tiene que estar en marcha" msgid "Updating" msgstr "Actualizando" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Las actualizaciones desde el interior de la red están deshabilitadas. Revise el administrador de paquetes." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "No tiene permiso de escritura para el directorio de instalación de I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Primero tiene que actualizar a la versión {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Requiere Java versión {0}, pero la versión instalada de Java es {1}" @@ -1187,16 +1196,20 @@ msgid "No new version found at {0}" msgstr "No se encontró ninguna versión nueva en {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Excluido permanentemente" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "La exclusión temporal caducará en {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Excluido hasta el reinicio o en {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "readmitir ahora" @@ -1297,18 +1310,18 @@ msgstr "readmitir ahora" msgid "I2P Router Console" msgstr "Consola del router I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Error al actualizar la configuración - por favor revise los registros (logs) de errores" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configuración guardada con éxito" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1516,7 +1529,7 @@ msgid "Add Client" msgstr "Añadir cliente" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Cliente" @@ -1548,9 +1561,9 @@ msgid "Plugin" msgstr "Complemento" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versión" @@ -1572,7 +1585,8 @@ msgstr "Licencia" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Sitio web" @@ -1585,7 +1599,7 @@ msgid "Stop" msgstr "Detener" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Buscar actualizaciones" @@ -1607,7 +1621,7 @@ msgstr "Eliminar" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1617,7 +1631,7 @@ msgstr "Eliminar seleccionados" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1636,7 +1650,7 @@ msgstr "Restablecer valores predeterminados" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1765,8 +1779,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Eliminar" @@ -1776,7 +1790,7 @@ msgstr "Seleccione una clase a añadir" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Ancho de banda" @@ -1785,7 +1799,7 @@ msgid "Home Page" msgstr "Página principal" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Red" @@ -1841,9 +1855,9 @@ msgid "UI" msgstr "Interfaz de usuario" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Túneles" @@ -1861,15 +1875,15 @@ msgid "Logging" msgstr "Registro" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Pares (peers)" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Estadísticas" @@ -1881,8 +1895,8 @@ msgstr "Avanzado" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2143,7 +2157,7 @@ msgstr "Reiniciar inmediatamente" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Reiniciar" @@ -2614,8 +2628,8 @@ msgid "User Name" msgstr "Nombre de usuario" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Añadir" @@ -2624,91 +2638,91 @@ msgstr "Añadir" msgid "Password" msgstr "Contraseña" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Actualización o comprobación ya en marcha" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Actualización disponible; tratando de descargarla" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Actualización disponible, pulse el botón de la izquierda para descargarla" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Ninguna actualización disponible" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Actualizando URL de news (usenet) a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "interno" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Actualizando equipo (host) del proxy a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Actualizando puerto del servidor proxy a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Actualizando frecuencia de refresco a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nunca" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Actualizando política de actualización a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Actualizando URLs de actualización." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Actualizando claves de confianza." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Actualizando URL de actualización no firmada a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "Actualizando URL de versión firmada a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Cada" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Sólo notificar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Sólo descargar y verificar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Descargar, verificar y reiniciar" @@ -2834,7 +2848,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "No se encontraron eventos \"{0}\" en el anterior {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Hora" @@ -2984,12 +2998,12 @@ msgid "Graph settings saved" msgstr "Se guardó la configuración de la gráfica" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Addressbook (libreta de direcciones)" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Administre su fichero hosts de I2P aquí (resolución de nombres de dominios I2P)" @@ -3020,17 +3034,17 @@ msgid "I2P Home Page Configuration" msgstr "Configuración de la página principal de I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Cliente de correo web anónimo" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Correo electrónico" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Ayuda del router I2P" @@ -3040,17 +3054,17 @@ msgid "Router Console" msgstr "Consola del router I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Cliente BitTorrent anónimo integrado" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Servidor web local" @@ -3219,97 +3233,97 @@ msgstr "El proxy HTTP no está activo" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Su navegador no está correctamente configurado para utilizar el proxy HTTP en {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nombre" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "Cola de tareas de I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Ejecutores de las tareas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Tareas activas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "comenzó hace {0}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Tareas recién finalizadas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "finalizado hace {0}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Listo/esperando tareas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Tareas programadas" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} comenzará en {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Estadística de tareas totales" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Tarea" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "En cola" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Ejecuciones" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Desestimado" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Media" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Máx" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Mín" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Pendientes" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Resumen" @@ -3327,223 +3341,223 @@ msgid "No log messages" msgstr "No hay mensajes de registro (log)" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Router I2P local" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Búsqueda de router I2P" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Todos los routers I2P" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Todos los routers I2P con estadísticas completas" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router I2P" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "no se encuentra en la base de datos de red" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "No publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destino" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Añadir a la libreta de direcciones local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Caduca en {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Caducó hace {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Pasarela (gateway)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Túnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "No inicializado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Estadísticas del router I2P en la base de datos de red" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Recuento" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transportes" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "País" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Información propia" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Información del par para" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Entrada completa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Oculto" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Actualizado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "hace {0}" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Clave firmante" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Dirección(es)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "coste" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Oculto o iniciándose" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU con introductores" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP y SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP y SSU con introductores" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "SSU-introductores sólo IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "SSU IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "SSU-introductores IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "NTCP IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "NTCP-SSU IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "NTCP-SSU-introductores IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "NTCP-SSU-introductores sólo IPv6" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "News (usenet) actualizadas hace {0}." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "News (usenet) comprobadas hace {0}." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Ocultar news" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Mostrar news" @@ -3593,19 +3607,19 @@ msgid "Groups (Caps)" msgstr "Grupos (Capacidades)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Velocidad" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacidad" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integración" @@ -3628,7 +3642,7 @@ msgid "Failing" msgstr "Fallando" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrado" @@ -3705,71 +3719,71 @@ msgstr "Tasa de fallos a 1h" msgid "1d Fail Rate" msgstr "Tasa de fallos a 1d" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Umbrales" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "pares (peers) rápidos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "pares de alta capacidad" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "pares bien integrados" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "según lo determinado por el organizador del perfil" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "capacidades en la base de datos de red (netDb), no se usan para determinar los perfiles" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "capacidades" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "rendimiento máximo (bytes por segundo) durante un periodo de 1 minuto que el par (peer) ha sostenido en un solo túnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "velocidad" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "capacidad" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "¿a cuántos túneles podemos pedirles que se unan en una hora?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "¿cuántos pares (peers) nuevos nos han indicado ellos últimamente?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integración" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "¿el par está excluido, o es inalcanzable, o están fallando sus tests de túnel?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "estado" @@ -3897,277 +3911,277 @@ msgstr "Graficar recuento de eventos" msgid "Lifetime average value" msgstr "Valor medio del total de vida" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Ayuda del router I2P y preguntas frecuentes (FAQ)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Ayuda y preguntas frecuentes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Configurar el inicio de clientes y aplicaciones web (servicios); iniciar manualmente servicios inactivos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Servicios I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configurar router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Datos internos de I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Mostrar túneles existentes y estado de creación de túneles" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Mostrar todas las conexiones actuales con los pares (peers)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Mostrar perfiles de rendimiento de los pares recientes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Perfiles" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Mostrar la lista de todos los routers I2P conocidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB (base de datos de red)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Informe de salud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Registros (logs)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Graficar el rendimiento del router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Gráficos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Estadísticas textuales de rendimiento del router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Túneles locales" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Administrador de servicios ocultos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "General" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Su identidad local es la identificación única de su router I2P, similar a una dirección IP, pero específica de I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "NUNCA LA REVELE A NADIE, ya que puede exponer su dirección IP pública real." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Identidad local" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "La identificación única de su router I2P es " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "NUNCA LA REVELE A NADIE" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "mostrar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "La versión del software I2P que está ejecutando" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "El tiempo que lleva ejecutándose para esta sesión" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Ayuda con la configuración del cortafuegos (firewall) y del router I2P para un rendimiento óptimo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Vea más información en el wiki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Advertencia: ECDSA no está disponible. Actualice su Java o su sistema operativo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configurar actualizaciones de I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Actualización de I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Pares (peers) con los que nos hemos comunicado en los últimos minutos / última hora" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Activo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Número de pares disponibles para crear túneles de cliente" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Rápido" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Número de pares disponibles para crear túneles exploratorios" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Alta capacidad" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Número de pares disponibles para consultas a la base de datos de red" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Número total de pares (peers) en nuestra base de datos de red" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Conocidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configurar asignación de ancho de banda para el router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Ancho de banda de entrada/salida" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Usado" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Usado para crear y probar túneles, y comunicarse con los pares de inundación (floodfill)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Exploratorios" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Túneles que está usando para proporcionar o acceder a servicios en la red" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Túneles en los que está participando, aportando de forma directa ancho de banda a la red" +msgstr "Túneles en los que estamos participando, contribuyendo ancho de banda directamente a la red" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Participando en" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "La relación entre el número de saltos de los túneles que proporciona y el número de saltos de los que usa - un valor mayor que 1,00 indica una aportación positiva a la red" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Tasa de compartición" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "¿Qué hay en la cola de tareas del router I2P?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Congestión" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indica el rendimiento del router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Demora de tareas" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indica cómo de rápido se envían mensajes a otros routers I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Demora de mensajes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Duración del viaje de ida y vuelta de un test de túnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Demora de túneles" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Solicitudes en cola de otros routers I2P para participar en túneles" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Peticiones pendientes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "News (usenet) y actualizaciones" @@ -4271,26 +4285,26 @@ msgstr "Creando túneles" msgid "shared clients" msgstr "clientes compartidos" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Pulse \"Reiniciar\" para instalar" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Pulse \"Apagar\" y reinicie para instalar" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versión {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Actualización disponible" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Descargar actualización {0}" @@ -4299,7 +4313,7 @@ msgstr "Descargar actualización {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "Descargar actualización
de desarrollo firmada
{0}" @@ -4308,69 +4322,85 @@ msgstr "Descargar actualización
de desarrollo firmada
{0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Descargar actualización
no firmada de {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Ayuda con la configuración del cortafuegos (firewall)" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Comprobar conexión de red y NAT/cortafuegos" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Resembrar (reseed)" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Orden" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Techo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Mover a la parte superior" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Mover arriba" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Abajo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "Mover abajo" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Fondo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "Mover a la parte inferior" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Seleccione una sección a añadir" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "eventos en {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "promediado para {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Eventos por periodo" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "med" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "máx" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "ahora" @@ -4547,175 +4577,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Abrir la consola del router I2P en el navegador web al iniciar el router I2P" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "clientes compartidos (DSA)" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "Proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "Servidor web de I2P" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "Proxy HTTP" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "clásico" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "oscuro" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "claro" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "medianoche" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "LimitadorAnchoBanda" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "MensajesClientes" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Cifrado" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "DepósitoTúnelesRed" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "ColaTareas" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "BaseDatosRed" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Stream" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Regulador" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transporte" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "equipo(host)" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "clave" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "puerto" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "configurar ancho de banda" @@ -4884,7 +4866,7 @@ msgid "Share" msgstr "Compartir" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTA" @@ -4925,7 +4907,7 @@ msgid "Advanced network configuration page" msgstr "Página de configuración avanzada de la red" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4964,27 +4946,35 @@ msgid "" "computer's resources." msgstr "La participación de routers I2P de inundación (floodfills) ayuda a la red, pero puede usar muchos de los recursos de su computadora." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "Este router I2P es actualmente un participante en la inundación (floodfill)." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "Este router I2P no es actualmente un participante en la inundación (floodfill)." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Automática" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Forzar activado" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Dehabilitar" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configuración de I2P avanzada" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Algunos cambios pueden requerir un reinicio para que surtan efecto." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Para realizar cambios, edite el fichero {0}." diff --git a/apps/routerconsole/locale/messages_et.po b/apps/routerconsole/locale/messages_et.po index 2915c6251..b74f6802d 100644 --- a/apps/routerconsole/locale/messages_et.po +++ b/apps/routerconsole/locale/messages_et.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/I2P/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -31,8 +31,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -41,8 +41,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -51,8 +51,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -61,37 +61,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 tund" msgstr[1] "{0} tundi" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "puudub" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 päev" msgstr[1] "{0} päeva" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "puudub" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -134,7 +143,7 @@ msgstr "Kuhu" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "puudub" @@ -273,43 +282,43 @@ msgstr "Keeldun tunnelitest: Välja lülitumine" msgid "Rejecting tunnels" msgstr "Keeldun tunnelitest" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Hangin ruuterite kontakte" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Kontaktide hankel leiti vaid 1 ruuter." msgstr[1] "Kontaktide hankel leiti vaid {0} ruuterit." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Kontaktide hange ei õnnestunud." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Vaata {0} et leida abi." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "kontaktide hanke häälestusleht" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Kontaktide hange: toon loendi URL-i." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -379,7 +388,7 @@ msgstr "Pole ühelgi transpordil kättesaadav" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Staatus" @@ -394,7 +403,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} kasutatakse vaid välja ühendumiseks" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP pole sisse lülitatud" @@ -417,13 +426,13 @@ msgid "" msgstr "Et lubada piire ületada, kehtestage parameeter i2np.ntcp.maxConnections=nnn ning i2np.udp.maxConnections=nnn peenhäälestuse lehel." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definitsioonid" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -438,7 +447,7 @@ msgstr "Kauge ruuter, tuvastatud ruuteri hashi abil" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Suund" @@ -465,13 +474,13 @@ msgstr "Kaua on möödunud viimase paketi saamisest / saatmisest" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Jõude" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Sisse/Välja" @@ -486,14 +495,14 @@ msgstr "Kaua on möödunud ühenduse loomisest" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Üleval" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Ajanihe" @@ -542,7 +551,7 @@ msgstr "Kehtiv suurima saadetava paketi maht / oletatav suurim vastuvõetava pak #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -552,7 +561,7 @@ msgstr "Ruuterile saadetud pakettide koguarv" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -561,7 +570,7 @@ msgid "The total number of packets received from the peer" msgstr "Ruuterilt vastuvõetud pakettide koguarv" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "TX dupl" @@ -570,7 +579,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Ruuterile uuesti saadetud pakettide koguarv" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "RX dupl" @@ -609,8 +618,8 @@ msgstr "WAN PPP häälestus" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Tööiga" @@ -705,17 +714,17 @@ msgid "NTCP connections" msgstr "NTCP ühendusi" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Piir" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Ajalimiit" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -728,126 +737,126 @@ msgid "Backlogged?" msgstr "Ummik?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Sisse" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Välja" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP ühendused" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sorteeri ruuteri hashi järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Suund/Tutvustamine" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sorteeri saabuva jõudeaja järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sorteeri väljuva jõudeaja järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sorteeri saabuva kiiruse järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sorteeri väljuva kiiruse järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sorteeri ühenduse ea järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sorteeri ajanihke järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sorteeri ummikuakna järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sorteeri aeglase käivitumise läve järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sorteeri saatmise-kinnituse viive järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sorteeri uuesti saatmise ajalimiidi järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sorteeri väljuva suurima saateühiku järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sorteeri saadetud pakettide arvu järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sorteeri vastuvõetud pakettide arvu järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sorteeri uuesti saadetud pakettide arvu järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sorteeri mitmekordselt vastuvõetud pakettide arvu järgi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Me pakkusime end neile tutvustajaks" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Nad pakkusid end meile tutvustajaks" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Venib" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 viga" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} viga" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Bännitud" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -885,66 +894,66 @@ msgstr "Eiran tunneliosaluse palveid: Kõrge koormus" msgid "Dropping tunnel requests: Queue time" msgstr "Eiran tunneliosaluse palveid: Pikk järjekord" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Pluginale {0} on uus versioon" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Uuenduste otsing pluginale {0} ebaõnnestus" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Pluginale {0} uut versiooni ei ole" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B laetud" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Laadimine allikast {0} ebaõnnestus" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Uuendus alla laetud" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Käivitun uuesti" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Uuendus kontrollitud" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "allikast {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Allkirjata uuenduse fail allikast {0} on katki" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Ei suutnud kopeerida asukohta {0}" @@ -957,7 +966,7 @@ msgstr "Ei suutnud kopeerida asukohta {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -971,20 +980,20 @@ msgstr "" msgid "Updating" msgstr "Uuendan" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1174,16 +1183,20 @@ msgid "No new version found at {0}" msgstr "Allikas {0} polnud uut versiooni" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Ajutine bänn, aegub {0} pärast" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Bännitud kuni uuesti käivitumiseni või {0} möödumiseni" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "tühista bänn" @@ -1284,18 +1297,18 @@ msgstr "tühista bänn" msgid "I2P Router Console" msgstr "I2P ruuteri konsool" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Viga häälestuse uuendamisel - palun vaata vealogi" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Häälestus edukalt salvestatud" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1503,7 +1516,7 @@ msgid "Add Client" msgstr "Lisa klient" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Klient" @@ -1535,9 +1548,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versioon" @@ -1559,7 +1572,8 @@ msgstr "Litsents" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Veebileht" @@ -1572,7 +1586,7 @@ msgid "Stop" msgstr "Peata" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Otsi uuendusi" @@ -1594,7 +1608,7 @@ msgstr "Kustuta" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1604,7 +1618,7 @@ msgstr "Kustuta valitu" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1623,7 +1637,7 @@ msgstr "Taasta vaikimisi" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1752,8 +1766,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Eemalda" @@ -1763,7 +1777,7 @@ msgstr "Vali lisamiseks klass" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Ribalaius" @@ -1772,7 +1786,7 @@ msgid "Home Page" msgstr "Avaleht" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Võrk" @@ -1828,9 +1842,9 @@ msgid "UI" msgstr "Kasutajaliides" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnelid" @@ -1848,15 +1862,15 @@ msgid "Logging" msgstr "Logimine" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Ruuterid" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistika" @@ -1868,8 +1882,8 @@ msgstr "Peenhäälestus" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2130,7 +2144,7 @@ msgstr "Käivitu kohe uuesti" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Käivitu uuesti" @@ -2601,8 +2615,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2611,91 +2625,91 @@ msgstr "" msgid "Password" msgstr "Parool" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Uuendus saadaval, proovin nüüd alla laadida" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Uuendus saadaval, klõpsa vasakul nuppu et alla laadida" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Uuendusi pole" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Uuendan uudiste URL-iks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Uuendan proxy serveriks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Proxy pordiks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Uuendan sageduseks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Mitte kunagi" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Uuendan uuenduste poliitikaks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Uuendan uuenduste URL-id." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Uuendan usaldatud võtmeid." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Uuendan allkirjastamata uuenduse URL-iks {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Iga" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Üksnes teata" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Lae alla ja kontrolli allkiri" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Lae alla, kontrolli ja käivitu uuesti" @@ -2821,7 +2835,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2971,12 +2985,12 @@ msgid "Graph settings saved" msgstr "Graafikute häälestus salvestatud" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Aadressiraamat" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Halda siit oma I2P nimefaili (I2P domeenide lahendamist)" @@ -3007,17 +3021,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P Avalehe Konfiguratsioon" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonüümne veebimeili klient" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-post" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P ruuteri abi" @@ -3027,17 +3041,17 @@ msgid "Router Console" msgstr "Ruuteri konsool" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Sisseehitatud anonüümne BitTorrenti klient" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrentid" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Kohalik veebiserver" @@ -3206,97 +3220,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nimi" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3314,223 +3328,223 @@ msgid "No log messages" msgstr "Logis pole sõnumeid" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "Lüüsikirjegrupid" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Ruuter" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "ei leitud võrguandmebaasist" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "Lüüsikirjegrupp" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Kohalik" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Avaldamata" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Sihtvõti" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Aegub {0} pärast" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Aegus {0} eest" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Lüüs" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lüüsikirje" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Lähtestamata" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Võrguandmebaasi ruuterite statistika" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Arv" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transpordid" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Maa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Meie info" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Ruuter info ruuterile" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Täielik kirje" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Peidetud" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Uuendatud" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} eest" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Avaldatud" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Aadress(id)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "kulukus" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Peidetud või alles käivitub" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU tutvustajatega" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP ja SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP ja SSU tutvustajatega" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Uudiseid uuendati viimati {0} eest." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Uudiseid kontrolliti viimati {0} eest." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Peida uudised" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Näita uudised" @@ -3580,19 +3594,19 @@ msgid "Groups (Caps)" msgstr "Grupid (Võimekused)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Kiirus" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Maht" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integratsioon" @@ -3615,7 +3629,7 @@ msgid "Failing" msgstr "Läbikukkuvad" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Hästi integreerunud" @@ -3692,71 +3706,71 @@ msgstr "1h ebaõnnestumise tase" msgid "1d Fail Rate" msgstr "1p ebaõnnestumise tase" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Läved" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "kiired ruuterid" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "suure mahuga ruuterid" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr " hästi integreerunud ruuterid" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "profiili organiseerija vaatepunktist" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupid" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "võimekused võrguandmebaasis, ei kasutata profiilide määramisel" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "võimekused" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "suurim läbilaskevõime (baiti sekundis) 1 minutisel perioodil mida ruuter on ühes tunnelis suutnud saavutada" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "kiirus" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "maht" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "mitmes tunnelis võime neil tunnis osaleda paluda?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "mitmest uuest ruuterist nad meile hiljuti rääkinud on?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integratsioon" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "kas ruuter bännitud, kättesaadamatu või kukub tunnelitestides läbi?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "staatus" @@ -3884,277 +3898,277 @@ msgstr "Graafiku sündmuste arv" msgid "Lifetime average value" msgstr "Ruuteri tööea keskmine väärtus" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P ruuteri abi & KKK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Abi & KKK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Häälesta klientide ja veebirakenduste (teenuste) käivitumist; käivita magavaid teenuseid käsitsi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P teenused" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Häälesta I2P ruuterit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P sisemus" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Vaata tunnelite ja nende ehitamise staatust" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Näita kõiki ühendusi teiste ruuteritega" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Näita hiljutisi ruuterite jõudluse profiile" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiilid" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Näita nimekirja kõigist tuntud I2P ruuteritest" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "Võrguandmebaas" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Terviseraport" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Logid" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Ruuteri jõudlusgraafikud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Graafikud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Ruuteri jõudlusinfo teksti kujul" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Üldine" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Kohalik identiteet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Sinu I2P ruuteri unikaalne ID on" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "ära seda kellelegi avalda" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "näita" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Kui kaua on ruuter käesolevas sessioonis töötanud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Abi tulemüüri häälestamisel ja ruuteri jõudluse optimeerimisel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Aktiivne" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Kiire" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Suure mahuga" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Tuntud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Häälesta ruuteri ribalaiuse piiranguid" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Ribalaius sisse/välja" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Kokku" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Kasutatud" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Avastamine" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Osalemine" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Jagamistase" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Mis on ruuteri tööde järjekorras?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Ummik" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Töö viive" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Sõnumi viive" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tunneli viive" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Järjekord" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4258,26 +4272,26 @@ msgstr "Ehitan tunneleid" msgid "shared clients" msgstr "ühised klienditunnelid" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Käivita uuesti et paigaldada" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Lülita välja et uuesti käivitamisel paigaldada" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versioon {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Lae alla uuendus {0}" @@ -4286,7 +4300,7 @@ msgstr "Lae alla uuendus {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4295,69 +4309,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Lae alla allkirjata
uuendus {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Abi tulemüüri häälestamisel" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Kontrolli võrguühendust ja kohtvõrgu ruuterit/tulemüüri" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Hangi ruuterite kontakte" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "sundmusi {0} vältel" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "{0} keskmine" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Sündmusi perioodi kohta" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "keskm." -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "nüüd" @@ -4534,175 +4564,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Ava ruuteri konsool brauseris ruuteri käivitumisel" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P veebiserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassikaline" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "tume" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "hele" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "kesköö" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "key" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "ribalaiuse häälestus" @@ -4871,7 +4853,7 @@ msgid "Share" msgstr "jagamiseks" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NB" @@ -4912,7 +4894,7 @@ msgid "Advanced network configuration page" msgstr "Võrguseadete peenhäälestuse leht" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4951,27 +4933,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "I2P peenhäälestus" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Mõned muutused vajavad jõustumiseks uuesti käivitamist." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_fi.po b/apps/routerconsole/locale/messages_fi.po index 5b81a966a..631881ab3 100644 --- a/apps/routerconsole/locale/messages_fi.po +++ b/apps/routerconsole/locale/messages_fi.po @@ -4,6 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# Jorma Karvonen , 2015 # kytv , 2011, 2012 # kytv , 2011-2012 # oselotti, 2014 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-22 16:16+0000\n" +"Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/I2P/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,8 +35,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -44,8 +45,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -54,8 +55,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,42 +65,51 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 tunti" msgstr[1] "{0} tuntia" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 päivä" msgstr[1] "{0} päivää" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 vuosi" +msgstr[1] "{0} vuotta" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1 ns" +msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1 μs" +msgstr[1] "{0,number,###} μs" #: ../../../router/java/src/net/i2p/router/Blocklist.java:201 #, java-format @@ -128,16 +138,16 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/Blocklist.java:959 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "From" -msgstr "" +msgstr "Lähettäjä" #: ../../../router/java/src/net/i2p/router/Blocklist.java:961 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "To" -msgstr "" +msgstr "Vastaanottaja" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "ei mitään" @@ -276,43 +286,43 @@ msgstr "Torjutaan käytäviä: Järjestelmää suljetaan" msgid "Rejecting tunnels" msgstr "Torjutaan käytäviä" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Lisätietoja kohdasta {0}." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -382,7 +392,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Tila" @@ -397,7 +407,7 @@ msgid "{0} is used for outbound connections only" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP ei ole käytössä" @@ -420,13 +430,13 @@ msgid "" msgstr "Muuttaaksesi näitä rajoja, lisää asetukset i2np.ntcp.maxConnections=nnn ja i2np.udp.maxConnections=nnn erikoisasetussivulla." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Määritelmät" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -441,7 +451,7 @@ msgstr "Vertaissolmu, reitittimen tiivisteen mukaan tunnistettuna." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "" @@ -468,13 +478,13 @@ msgstr "Milloin on viimeksi lähetetty / vastaanotettu paketti" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Tyhjäkäynti" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Sisään/Ulos" @@ -489,14 +499,14 @@ msgstr "Milloin tämä yhteys rakennettiin" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Toiminnassa" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Vääristymä" @@ -545,7 +555,7 @@ msgstr "Tämänhetkinen suurin lähetettävä paketin koko / arvioitu suurin vas #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -555,7 +565,7 @@ msgstr "Vertaissolmulle lähetettyjen pakettien kokonaismäärä" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -564,7 +574,7 @@ msgid "The total number of packets received from the peer" msgstr "Vertaissolmulta vastaanotettujen pakettien kokonaismäärä" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -573,7 +583,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Vertaissolmulle uudelleenlähetettyjen pakettien kokonaismäärä" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -612,8 +622,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -708,17 +718,17 @@ msgid "NTCP connections" msgstr "NTCP-yhteydet" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Raja" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Aikakatkaisu" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -731,126 +741,126 @@ msgid "Backlogged?" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Sisääntulevia" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Ulosmeneviä" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} vertainen" msgstr[1] "{0} vertaista" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP-yhteydet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Järjestä vertaissolmun tiivisteen mukaan." -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Suunta/Esittely" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Järjestä sisääntulevien mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Järjestä ulosmenevien mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Järjestä sisääntulonopeuden mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Järjestä ulosmenonopeuden mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Järjestä yhteyden keston mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Järjestä aikavääristymän mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Järjestä tungosikkunan mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Järjestä edestakaisen matkan keston mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Järjestä uudelleenlähetyksen aikakatkaisun mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Järjestä suurimman siirtäyksikön koon mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Järjestä lähetettyjen pakettien määrän mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Järjestä vastaanotettujen pakettien määrän mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Järjestä uudelleenlähetettyjen pakettien mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Järjestä useammin kuin kerran vastaanotettujen pakettien mukaan" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Me tarjoiduimme esittelemään heidät" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "He tarjoituivat esittelemään meidät" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Tukossa" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 epäonnistuminen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} epäonnistumista" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Estetty" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -888,66 +898,66 @@ msgstr "Pudotetaan käytäväpyyntöjä: Raskas kuorma" msgid "Dropping tunnel requests: Queue time" msgstr "Pudotetaan käytäväpyyntöjä: Jonotusaika" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Päivitys ladattu" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Uudelleenkäynnistetään" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "" @@ -960,7 +970,7 @@ msgstr "" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -974,20 +984,20 @@ msgstr "" msgid "Updating" msgstr "Päivitetään" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1177,16 +1187,20 @@ msgid "No new version found at {0}" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Väliaikainen esto kestää vielä {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Estetty uudelleenkäynnistämiseen saakka tai vielä {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "poista esto nyt" @@ -1287,18 +1301,18 @@ msgstr "poista esto nyt" msgid "I2P Router Console" msgstr "I2P reitittimen ohjauspaneeli" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Virhe päivitettäessä asetuksia - tarkasta virhelokit." -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1416,7 +1430,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202 msgid "WebApp" -msgstr "" +msgstr "WebApp" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 msgid "started" @@ -1437,16 +1451,16 @@ msgstr "Ei määritelty lisäosan URL." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" -msgstr "" +msgstr "Sinun on kirjoitettava tiedosto" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "Asennus tiedostosta epäonnistui" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format msgid "No update URL specified for {0}" -msgstr "" +msgstr "Kohteelle {0} ei ole määritelty päivitysverkko-osoitetta" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:512 @@ -1506,7 +1520,7 @@ msgid "Add Client" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Asiakas" @@ -1538,9 +1552,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versio" @@ -1562,7 +1576,8 @@ msgstr "Lupa" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Verkkosivu" @@ -1575,7 +1590,7 @@ msgid "Stop" msgstr "Pysäytä" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Tarkista päivitykset" @@ -1597,7 +1612,7 @@ msgstr "Poista" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1607,7 +1622,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1626,7 +1641,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1635,7 +1650,7 @@ msgstr "Tallenna" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:29 msgid "Home page changed" -msgstr "" +msgstr "Kotisivu vaihtunut" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:51 msgid "Restored default settings" @@ -1755,8 +1770,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Poista" @@ -1766,7 +1781,7 @@ msgstr "" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "" @@ -1775,7 +1790,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Verkko" @@ -1831,9 +1846,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Käytävät" @@ -1851,15 +1866,15 @@ msgid "Logging" msgstr "Lokit" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Vertaiset" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Tilastot" @@ -1871,8 +1886,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -1919,7 +1934,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:311 msgid "Invalid port" -msgstr "" +msgstr "Virheellinen portti" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:289 msgid "Updating inbound TCP port to auto" @@ -2133,7 +2148,7 @@ msgstr "Uudelleenkäynnistä välittömästi" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Uudelleenkäynnistä" @@ -2601,11 +2616,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:172 msgid "User Name" -msgstr "" +msgstr "Käyttäjätunnus" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Lisää" @@ -2614,91 +2629,91 @@ msgstr "Lisää" msgid "Password" msgstr "Salasana" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Päivitys saatavilla, yritetään ladata nyt" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Päivitys saatavilla, klikkaa nappia vasemmalla ladataksesi" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Päivityksiä ei saatavilla" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "Sisäinen" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Ei koskaan" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Joka" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Vain ilmoita " -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Vain lataa ja varmista" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Lataa, tarkista ja käynnistä" @@ -2728,7 +2743,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:40 msgid "Critical error" -msgstr "" +msgstr "Kriittinen virhe" #: ../java/src/net/i2p/router/web/EventLogHelper.java:41 msgid "Installed new version" @@ -2736,11 +2751,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:42 msgid "Install failed" -msgstr "" +msgstr "Asennus epäonnistui" #: ../java/src/net/i2p/router/web/EventLogHelper.java:43 msgid "Network error" -msgstr "" +msgstr "Verkkovirhe" #: ../java/src/net/i2p/router/web/EventLogHelper.java:44 #: ../java/src/net/i2p/router/web/EventLogHelper.java:48 @@ -2824,7 +2839,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Aika" @@ -2974,12 +2989,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Osoitekirja" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3010,17 +3025,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Sähköposti" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Reitittimen ohje" @@ -3030,17 +3045,17 @@ msgid "Router Console" msgstr "Reitittimen ohjauspaneeli" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Sisäänrakennettu anonyymi BitTorrent-asiakasohjelma" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrentit" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Paikallinen web-palvelin" @@ -3085,7 +3100,7 @@ msgstr "UKK" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Frequently Asked Questions" -msgstr "" +msgstr "Usein Kysytyt Kysymykset" #: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "Community forum" @@ -3148,7 +3163,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:57 msgid "Pastebin" -msgstr "" +msgstr "Pastebin" #: ../java/src/net/i2p/router/web/HomeHelper.java:58 msgid "I2P News" @@ -3209,97 +3224,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nimi" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "aloitettiin {0} sitten" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Työ" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3317,223 +3332,223 @@ msgid "No log messages" msgstr "Ei lokiviestejä" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Paikallinen reititin" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Kaikki reitittimet" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Reititin" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "ei löytynyt verkkotietokannasta" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Paikallinen" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Julkaisematon" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Kohde" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Lisää paikalliseen osoitekirjaan" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Käytävä" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Ei alustettu" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Lukumäärä" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Maa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Meidän tieto" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Päivitetty" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} sitten" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Julkaistu" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Osoitteet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU ja esittelijät" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP ja SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP, SSU ja esittelijät" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 vain SSU, esittelijät" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, esittelijät" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, esittelijät" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 vain NTCP, SSU, esittelijät" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Uutiset viimeksi päivitetty {0} sitten." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Uutiset viimeksi tarkistettu {0} sitten." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Piilota uutiset" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Näytä uutiset" @@ -3583,19 +3598,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Nopeus" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "" @@ -3618,7 +3633,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "" @@ -3695,71 +3710,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "nopeus" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "Kuinka moneen käytävään voimme pyytää heitä osallistumaan tunnissa?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "onko vertaissolmu estetty, saavuttamaton tai epäonnistuu käytäväkokeissa?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3887,277 +3902,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Reitittimen ohje & UKK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Ohje & UKK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P Palvelut" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P Reitittimen asetukset" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P sisälmykset" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Näytä nykyiset käytävät ja käytävien rakentamistilanne" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiilit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Listaa kaikki tunnetut I2P reitittimet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Lokit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Kuvaajat" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Yleinen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Paikallinen identiteetti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Tämän I2P reitittimen ainutlaatuinen identiteetti on" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "älä koskaan paljasta sitä kenellekään" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "näytä" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Nopea" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Tuttu" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Kaistaa sisään/ulos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Yhteensä" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Käytetty" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Jakosuhde" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Tungos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Käytävän viive" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4261,26 +4276,26 @@ msgstr "Rakentaa käytäviä" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versio {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4289,7 +4304,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4298,69 +4313,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" -msgstr "maks" +msgid "avg" +msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "maks" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "nyt" @@ -4537,175 +4568,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P www-palvelin" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "perinteinen" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "tumma" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "vaalea" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "keskiyö" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Salaus" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PKäytävä" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "avain" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "portti" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4874,7 +4857,7 @@ msgid "Share" msgstr "Jaa" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4915,7 +4898,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4954,27 +4937,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Jotkut muutokset saattavat vaatia uudelleenkäynnistykset tullakseen voimaan." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index 19bacab51..a3147c16b 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-15 10:36+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-22 09:12+0000\n" "Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n" "MIME-Version: 1.0\n" @@ -45,8 +45,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -55,8 +55,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -65,8 +65,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -75,37 +75,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0}h" msgstr[1] "{0} heures" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/d" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0}j" msgstr[1] "{0} jours" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 année" +msgstr[1] "{0} années" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/d" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -148,7 +157,7 @@ msgstr "Vers" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "aucun" @@ -241,15 +250,15 @@ msgstr "Rejet des tunnels : démarrage" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:182 msgid "Rejecting tunnels: High message delay" -msgstr "Refus de tunnels: (délai de messages élevé)" +msgstr "Refus de tunnels: délai de messages élevé" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:195 msgid "Rejecting tunnels: Limit reached" -msgstr "Refus de tunnels: (limite atteinte)" +msgstr "Refus de tunnels: limite atteinte" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:227 msgid "Rejecting most tunnels: High number of requests" -msgstr "Refuse la plupart des tunnels: (trop de requêtes)" +msgstr "Refuse la plupart des tunnels: trop de requêtes" #. hard to do {0} from here #. setTunnelStatus("Accepting " + (100-(int)(100.0*probReject)) + "% of @@ -270,60 +279,60 @@ msgstr "Accepte les tunnels" #. always leave at least 4KBps free when allowing #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:336 msgid "Rejecting tunnels: Bandwidth limit" -msgstr "Refus de tunnels: (limite de bande passante)" +msgstr "Refus de tunnels: limite de bande passante" #. hard to do {0} from here #. setTunnelStatus("Rejecting " + ((int)(100.0*probReject)) + "% of tunnels: #. Bandwidth limit"); #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:406 msgid "Rejecting most tunnels: Bandwidth limit" -msgstr "Refuse la plupart des tunnels: (limite de bande passante)" +msgstr "Refuse la plupart des tunnels: limite de bande passante" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:528 msgid "Rejecting tunnels: Shutting down" -msgstr "Refuse les tunnels: (arrêt en cours)" +msgstr "Refuse les tunnels: arrêt en cours" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:541 msgid "Rejecting tunnels" msgstr "Refus des tunnels" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "Ré-essaimage : ai obtenu des infos de routeur depuis fichier ({0} fructueux, {1} erreurs)." +msgstr "Ré-essaimage : ai obtenu des infos de routeurs depuis fichier ({0} fructueux, {1} erreurs)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Réamorçage" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Le réamorçage n''a trouvé qu''un seul routeur." msgstr[1] "Le réamorçage n''a trouvé que {0} routeurs." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Échec de réamorçage." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Voir {0} pour l'aide." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "page de configuration du réamorçage" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Réamorçage: collecte des URL sources." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -393,7 +402,7 @@ msgstr "Inaccessible sur tous transport" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "État" @@ -408,7 +417,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} est utilisé seulement pour les connexions sortantes" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP n'est pas activé" @@ -431,13 +440,13 @@ msgid "" msgstr "Pour modifier ces limites, ajoutez les réglages i2np.ntcp.maxConnections=nnn et i2np.udp.maxConnections=nnn dans la configuration avancée." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Définitions" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -452,7 +461,7 @@ msgstr "Le pair distant, identifié par son hachage routeur" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Sens" @@ -479,13 +488,13 @@ msgstr "Temps écoulé depuis la dernière réception/émission d'un paquet " #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "En attente" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Entrant/Sortant" @@ -500,14 +509,14 @@ msgstr "Depuis combien de temps cette connexion est établie" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "En marche" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Dérive" @@ -556,7 +565,7 @@ msgstr "Taille actuelle maximum de paquet envoyé / taille maximum estimée de p #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -566,7 +575,7 @@ msgstr "Nombre de paquets envoyés au pair" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -575,7 +584,7 @@ msgid "The total number of packets received from the peer" msgstr "Nombre de paquets reçus du pair" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "TX dupl." @@ -584,7 +593,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Nombre de paquets retransmis au pair" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "RX dupl." @@ -623,8 +632,8 @@ msgstr "Connexion Internet PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Lancé depuis" @@ -719,17 +728,17 @@ msgid "NTCP connections" msgstr "Connexions NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Échéance" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -742,149 +751,149 @@ msgid "Backlogged?" msgstr "Réinscrit?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Entrant" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Sortant" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} pair" msgstr[1] "{0} pairs" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Connexions UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Tri par hachage de pair" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Direction/Introduction" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Tri par entrant inactif" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Tri par sortant inactif" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Tri par taux entrant" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Tri par taux sortant" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Tri par durée de connexion" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Tri par décalage d'horloge" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Tri par fenêtre de congestion" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Tri par seuil de démarrage lent" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Tri par durée d'aller-retour" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Tri pas dépassement de durée de retransmission" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Tri par MTU sortant" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Tri par paquets envoyés" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Tri par paquets reçus" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Tri par paquets renvoyés" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Tri par paquet reçus multiples" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Propositions de présentation à" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Ont proposé leur service" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Choqué" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 échec" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} échecs" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Banni" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "arriéré " #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:250 msgid "Dropping tunnel requests: Too slow" -msgstr "Perte de demandes de tunnels: Trop lent" +msgstr "Perte de demandes de tunnels : trop lent" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:260 msgid "Dropping tunnel requests: High job lag" -msgstr "Laisse tomber des demandes de tunnel : Haut décalage de travail" +msgstr "Laisse tomber des demandes de tunnel : haut décalage de travail" #. don't even bother, since we are so overloaded locally #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:451 msgid "Dropping tunnel requests: Overloaded" -msgstr "Perte de demandes de tunnnels: Surchargé" +msgstr "Perte de demandes de tunnnels : surchargé" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "Rejette les tunnels: mode caché" +msgstr "Rejette les tunnels : mode caché" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" -msgstr "Rejet de tunnels: surcharge de requêtes " +msgstr "Rejet de tunnels : surcharge de requêtes " #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:752 msgid "Rejecting tunnels: Connection limit" @@ -893,72 +902,72 @@ msgstr "Rejet de tunnels: limite de connexions" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:964 #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:997 msgid "Dropping tunnel requests: High load" -msgstr "Perte de tunnels: Forte charge" +msgstr "Perte de tunnels: forte charge" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1076 msgid "Dropping tunnel requests: Queue time" msgstr "Demandes de fermeture de tunnel: temps en file d'attente" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "La nouvelle version {0} du greffon est disponible" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Échec de la vérification de mise à jour du greffon {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Pas de nouvelle version pour le greffon {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}o transférés" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Installation échouée depuis {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Échec de transfert depuis {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Mise à jour téléchargée" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Redémarrage en cours" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Mise à jour vérifiée" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "depuis {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Le fichier de mise à jour non signé de {0} est corrompu" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Échec de copie vers {0}" @@ -971,7 +980,7 @@ msgstr "Échec de copie vers {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "Le tunnel proxy client HTTP doit être en cours de fonctionnement" @@ -985,20 +994,20 @@ msgstr "Le tunnel proxy client HTTP doit être en cours de fonctionnement" msgid "Updating" msgstr "Mise à jour en cours" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Mises à jour intra-réseau désactivées. Vérifiez le gestionnaire de paquet." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Pas de permission d'écriture pour le répertoire d'installation I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Vous devez d''abord mettre à jour vers la version {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Nécessite la version {0} Java mais la version Java installée est {1}" @@ -1188,16 +1197,20 @@ msgid "No new version found at {0}" msgstr "Pas de nouvelle trouvée sur {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Banni en permanence" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Le bannissement temporaire expire dans {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Banni jusqu''au redémarrage ou dans {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "lever le bannissement" @@ -1298,18 +1311,18 @@ msgstr "lever le bannissement" msgid "I2P Router Console" msgstr "Console du routeur I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Erreur pendant la mise à jour de la configuration: contrôlez les historiques" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configuration sauvegardée avec succès" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1348,7 +1361,7 @@ msgstr "Installer le greffon" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "Installer plugin depuis fichier" +msgstr "Installer plugin depuis le fichier" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 @@ -1517,7 +1530,7 @@ msgid "Add Client" msgstr "Ajouter un client" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Clients" @@ -1549,9 +1562,9 @@ msgid "Plugin" msgstr "Greffon" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Version" @@ -1565,7 +1578,7 @@ msgstr "Date" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:273 msgid "Author" -msgstr "Autheur" +msgstr "Auteur" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289 msgid "License" @@ -1573,7 +1586,8 @@ msgstr "Licence" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Site web" @@ -1586,7 +1600,7 @@ msgid "Stop" msgstr "Arrêt" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Vérifier les mises à jour" @@ -1594,7 +1608,7 @@ msgstr "Vérifier les mises à jour" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:364 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 msgid "Update" -msgstr "Mise à jour" +msgstr "Mettre à jour" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:369 #, java-format @@ -1608,7 +1622,7 @@ msgstr "Effacer" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1618,7 +1632,7 @@ msgstr "Efface la sélection" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1637,7 +1651,7 @@ msgstr "Restaurer à l'origine" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1766,8 +1780,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Supprimer" @@ -1777,7 +1791,7 @@ msgstr "Choisissez une classe à ajouter" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Bande passante" @@ -1786,7 +1800,7 @@ msgid "Home Page" msgstr "Page d'accueil" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Réseau" @@ -1842,9 +1856,9 @@ msgid "UI" msgstr "Apparence" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnels" @@ -1862,15 +1876,15 @@ msgid "Logging" msgstr "Historiques" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Pairs" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistiques" @@ -1882,8 +1896,8 @@ msgstr "Avancé" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2106,7 +2120,7 @@ msgstr "Ré-essaimage depuis fichier" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91 msgid "Reseed from file failed" -msgstr "Échec du ré-essaimage depuis fichier" +msgstr "Échec de ré-essaimage depuis fichier" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86 #, java-format @@ -2144,7 +2158,7 @@ msgstr "Redémarrer immédiatement" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Redémarrage" @@ -2615,8 +2629,8 @@ msgid "User Name" msgstr "Nom d'utilisateur" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Ajout" @@ -2625,91 +2639,91 @@ msgstr "Ajout" msgid "Password" msgstr "Mot de passe" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Mise à jour ou vérification déjà en cours" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Mise à jour disponible, essai de téléchargement en cours" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Mise à jour disponible, cliquez sur le bouton de gauche pour la télécharger" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Pas de mise à jour disponible" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Mise à jour des nouvelles URL à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "interne" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Mise à jour hôte proxy à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Mise à jour port proxy à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Mise à jour fréquence de rafraîchissement à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Jamais" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Mise à jour politique de mise à jour à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Mise à jour de l'URL de mises à jour." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Mise à jour des clefs de confiance." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Mise à jour URL de mise à jour non signée à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "Mise à jour l''URL de la build de développement signée à {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Tou(te)s les" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Notifier seulement" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Télécharger et vérifier seulement" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Télécharger, vérifier et redémarrer" @@ -2835,7 +2849,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Pas d''évènements \"{0}\" trouvés dans le(s) précédent {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Temps" @@ -2985,12 +2999,12 @@ msgid "Graph settings saved" msgstr "Réglages des graphiques enregistrés" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Carnet d'adresses" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Gérer votre fichier d'hôtes I2P ici (I2P DNS)" @@ -3021,17 +3035,17 @@ msgid "I2P Home Page Configuration" msgstr "Configuration page d'accueil I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Client webmail anonyme" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Messagerie web" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Aide du routeur I2P" @@ -3041,17 +3055,17 @@ msgid "Router Console" msgstr "Console du routeur I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Client bittorrent anonyme" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Serveur web local" @@ -3220,97 +3234,97 @@ msgstr "Le proxy HTTP n'est pas en place" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Votre navigateur n''est pas configuré correctement pour utiliser le proxy HTTP à {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nom" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "File d'attente job de I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Exécuteurs de job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Jobs actifs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "commencé {0} auparavant" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Jobs tout juste finis" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "fini {0} auparavant" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Jobs prêts/en attente" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Jobs prévus" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} va démarrer dans {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Statistiques totales des jobs" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "Mis en file d'attente" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Lancés" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Laissé tomber" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Moy" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "En suspens" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Sommaire" @@ -3328,223 +3342,223 @@ msgid "No log messages" msgstr "Historique vide" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Routeur local" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Regard routeur" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Tous routeurs" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Tous routeurs avec statistiques complètes" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "Jeux de baux" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Routeur" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "non trouvé dans la NetDb" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "Jeu de baux" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Pas publié" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destination" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Ajouter au carnet d'adresses local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Expirera dans {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Périmé il y a {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Passerelle" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Bail" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Pas initialisé" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Statistiques NetDb du routeur " -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Nombre" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transports" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Pays" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Ce routeur" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Informations pair" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Détails" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Caché" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Mise à jour terminée" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "il y a {0}" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publié il y a" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Signature de clé" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adresse(s)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "coût" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Masqué ou en cours de démarrage" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU avec représentants" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP et SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP et SSU avec représentants" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 only SSU, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 NTCP seul, SSU, introducers" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Actualités mises à jour il y a {0}." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." -msgstr "Actualités vérifiés il y a {0}" +msgstr "Actualités vérifiées il y a {0}." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Cacher les actualités" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Montrer les actualités" @@ -3594,19 +3608,19 @@ msgid "Groups (Caps)" msgstr "Groupes (capacités)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Vitesse" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacité" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Intégration" @@ -3629,7 +3643,7 @@ msgid "Failing" msgstr "Défaillant" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Bien intégrés" @@ -3706,71 +3720,71 @@ msgstr "Taux d'échec (1h)" msgid "1d Fail Rate" msgstr "Taux d'échec (1j)" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Seuils" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "pairs rapides" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "pairs à haute capacités" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "pairs bien intégrés" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "tels que définis par le gestionnaire de profils" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "Groupes" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "possibilités vues dans la base de données du réseau (non utilisées pour définir les profils)" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "Possib." -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" -msgstr "débit crête (o/s) tenu sur 1mn par le pair sur un seul tunnel" +msgstr "débit en crête (octets/s) tenu sur 1 mn par le pair sur un seul tunnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "Vitesse" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "Capacité" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" -msgstr "combien de tunnels nous pouvons lui demander de rejoindre en une heure." +msgstr "combien de tunnels pouvons-nous lui demander de rejoindre en une heure ?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" -msgstr "sur combien de nouveaux pairs il nous a renseigné récemment." +msgstr "de combien de nouveaux pairs il nous a-t-il renseigné récemment ?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "Intégration" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "Le pair banni, injoignable ou les tests de tunnels échouent." +msgstr "le pair est-il banni, injoignable, ou alors les tests de tunnels échouent ?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "État" @@ -3898,277 +3912,277 @@ msgstr "Nombre d'évènements de graphiques" msgid "Lifetime average value" msgstr "Durée de vie moyenne" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Aide routeur I2P & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Aide & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "configurer le démarrage des clients et des applications web (services); démarrer manuellement les services arrêtés" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Services I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P Routeur Configuration" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Configuration" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "État des tunnels existants et de la création de tunnels" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Afficher toutes les connexions actuelles aux pairs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Afficher les profils de la performance récente des pairs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profils" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Afficher tous les routeurs I2P connus" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDb" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Bilan de santé" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Historiques" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Graphique de performances du routeur" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Graphes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Statistiques textuelles de performance du routeur" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Tunnels locaux" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Gestionnaire de services cachés" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Général" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Votre identité locale est votre identité unique de routeur I2P, semblable à une adresse ip, mais adaptée à I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Ne divulguez jamais ceci à personne, car il peut révéler votre IP monde réel." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Identité locale" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "L'identité unique de votre routeur commence par" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "Ne la révélez JAMAIS à PERSONNE ! (Cliquez pour l'afficher)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "Détails" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "La version du logiciel I2P que nous faisons fonctionner" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Durée de cette session" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Aide à la configuration du pare-feu et du routeur pour optimiser les performances d'I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Pour plus d'informations lire le wiki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Avertissement: ECDSA n'est pas disponible. Mettez à niveau votre Java ou OS" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configure mises à jour I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Mise à jour I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Pairs auxquels nous avons parlé durant les dernières minutes / heure dernière" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Actifs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Le nombre de pairs disponibles pour la construction de tunnels exploratoires" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Rapides" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Le nombre de pairs disponibles pour la construction de tunnels exploratoires" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Hautes capacités" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Le nombre de pairs disponibles pour les demandes de bases de données réseau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Le nombre total de pairs dans notre base de données réseau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Connus" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configurer la bande passante du routeur" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Bande passante entrante/sortante" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Totale" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Utilisée" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Utilisés pour construire et tester des tunnels, et communiquer avec les pairs de remplissage par diffusion" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Exploratoires" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunnels que nous utilisons pour fournir ou accéder à des services sur le réseau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Tunnels auxquels nous participons, contribuant ainsi directement à la bande passante du réseau" +msgstr "Tunnels auxquels nous participons, contribuant directement à la bande passante du réseau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Participants" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Le ratio de sauts tunnel que nous offrons aux sauts tunnel que nous utilisons - une valeur supérieure à 1,00 indique une contribution positive au réseau" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Rapport de partage" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Afficher la file d'attente de travaux du routeur. " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Charge" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indique la performance du routeur" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Retard de tâches" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indique à quelle vitesse sont envoyés les messages sortants vers d'autres routeurs I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Retard de messages" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Temps aller-retour pour un essai tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Retard de tunnels" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Requêtes en attente issues d'autres routeurs désireux de participer à des tunnels" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "En attente" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Nouvelles et mises à jour" @@ -4272,26 +4286,26 @@ msgstr "Création des tunnels en cours" msgid "shared clients" msgstr "clients partagés" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Cliquez sur Redémarrer pour installer" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Cliquez sur \"Arrêter\" puis \"Démarrer\" pour installer" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Version {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Mise à jour disponible" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Télécharger la version {0}" @@ -4300,7 +4314,7 @@ msgstr "Télécharger la version {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "Télécharger la
mise à jour de développement
signée {0}" @@ -4309,69 +4323,85 @@ msgstr "Télécharger la
mise à jour de développement
signée {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Télécharger la version
non signée {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Aide à la configuration du pare-feu" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Vérifier NAT/pare-feu" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Réamorçage" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Ordre" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Haut" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Déplacer tout en haut" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Déplacer vers le haut" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Bas" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "Déplacer vers le bas" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Fond" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "Déplacer tout en bas" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Sélection d'une section à ajouter" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "Évènements en {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "moyenné pour {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Fréquence" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "moy" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "maintenant" @@ -4548,175 +4578,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Ouvrir la console du routeur dans le navigateur au démarrage" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "clients partagés (DSA)" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "Serveur web I2P" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "Mandataire HTTP" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "hôte eeProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "Mandataire IRC" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "Classique" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "Sombre" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "Clair" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "Minuit" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Limiteur de bande passante" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "Messages clients" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Cryptage" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "File d'attente de travaux" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "Base de données du réseau" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "flux" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Régulation" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "UDP" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "hôte" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "clef" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "Configurer la bande passante" @@ -4885,7 +4867,7 @@ msgid "Share" msgstr "Partagés" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTE" @@ -4926,7 +4908,7 @@ msgid "Advanced network configuration page" msgstr "Page de configuration réseau avancée" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4965,27 +4947,35 @@ msgid "" "computer's resources." msgstr "La participation au Floodfill (remplissage) aide le réseau, mais peut utiliser davantage de ressources de votre ordinateur." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "Ce routeur est actuellement un participant au remplissage (\"floodfill\")." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "Ce routeur n'est pas actuellement un participant au remplissage (\"floodfill\")." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Automatique" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Forcer active" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Désactiver" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configuration I2P avancée" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Pour prendre effet certains changement nécessitent un redémarrage." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Pour faire des changements, éditez le fichier {0}." @@ -5111,7 +5101,7 @@ msgstr "Les greffons listés ci-dessous sont démarrés par le client webConsole #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616 msgid "Plugin Installation from URL" -msgstr "Installation de plugin depuis URL" +msgstr "Installation de plugin depuis une URL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618 #, java-format @@ -5124,7 +5114,7 @@ msgstr "Pour installer un greffon, entrez son URL de téléchargement:" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:631 msgid "Plugin Installation from File" -msgstr "Installation de plugin depuis fichier" +msgstr "Installation de plugin depuis un fichier" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:635 msgid "Install plugin from file." @@ -6382,7 +6372,7 @@ msgstr "L'URL des versions non signées" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:536 msgid "Updates will be dispatched via your package manager." -msgstr "Les mises à jours seront relayées par votre gestionnaire de paquets" +msgstr "Les mises à jour seront relayées par votre gestionnaire de paquets." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/console_jsp.java:146 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:146 diff --git a/apps/routerconsole/locale/messages_hu.po b/apps/routerconsole/locale/messages_hu.po index c4f2a42e8..61097fd5e 100644 --- a/apps/routerconsole/locale/messages_hu.po +++ b/apps/routerconsole/locale/messages_hu.po @@ -4,15 +4,16 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# benewfy , 2015 # omgitsadalek , 2013 # omgitsadalek , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 12:47+0000\n" +"Last-Translator: benewfy \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +32,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -41,8 +42,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -51,8 +52,8 @@ msgstr[1] "{0} mp" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -61,37 +62,46 @@ msgstr[1] "{0} perc" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 óra" msgstr[1] "{0} óra" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "nem elérhető" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 nap" msgstr[1] "{0} nap" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 év" +msgstr[1] "{0} év" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "nem elérhető" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -134,7 +144,7 @@ msgstr "Ide" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "semmi" @@ -147,40 +157,40 @@ msgstr "Rendben" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:312 msgid "IPv4: OK; IPv6: Testing" -msgstr "" +msgstr "IPv4: OK; IPv6: Tesztelés" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:313 msgid "IPv4: OK; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: OK; IPv6: Tűzfalazva" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:314 msgid "IPv4: Testing; IPv6: OK" -msgstr "" +msgstr "IPv4: Tesztelés; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:315 msgid "IPv4: Firewalled; IPv6: OK" -msgstr "" +msgstr "IPv4: Tűzfalazva; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:316 msgid "IPv4: Disabled; IPv6: OK" -msgstr "" +msgstr "IPv4: Letiltva; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: Szimmetrikus NAT; IPv6: OK" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 msgid "Symmetric NAT" -msgstr "" +msgstr "Szimmetrikus NAT" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:320 msgid "IPv4: Symmetric NAT; IPv6: Testing" -msgstr "" +msgstr "IPv4: Szimmetrikus NAT; IPv6: Tesztelés" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 msgid "IPv4: Firewalled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Tűzfalazva; IPv6: Tesztelés" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:323 @@ -190,29 +200,29 @@ msgstr "Tűzfalazva" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:324 msgid "IPv4: Testing; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Tesztelés; IPv6: Tűzfalazva" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:325 msgid "IPv4: Disabled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Letiltva; IPv6: Tesztelés" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:326 msgid "IPv4: Disabled; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Letiltva; IPv6: Tűzfalazva" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:327 msgid "Disconnected" -msgstr "" +msgstr "Szétkapcsolt" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:328 msgid "Port Conflict" -msgstr "" +msgstr "Port Összeütközés" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:329 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722 msgid "Testing" -msgstr "Tesztelés alatt" +msgstr "Tesztelés" #. NPE, too early #. if (_context.router().getRouterInfo().getBandwidthTier().equals("K")) @@ -273,43 +283,43 @@ msgstr "Alagutak elutasítva: kikapcsolás folyamatban" msgid "Rejecting tunnels" msgstr "Alagutak elutasítása" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Újratáplálás (reseed) folyamatban" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Az újratáplálás csak 1 routert hozott." msgstr[1] "Az újratáplálás csak {0} routert hozott." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Újratáplálás (reseed) sikertelen." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Segítségért lásd {0}." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "újratáplálás (reseed) beállítási oldal" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Újratáplálás: táplálási URL kézbesítése." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -363,7 +373,7 @@ msgstr "Nincs átvitel (rejtett vagy indul)?" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 msgid "Unsupported signature type" -msgstr "" +msgstr "Nem támogatott aláírástípus" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:618 msgid "No support for our signature type" @@ -379,10 +389,10 @@ msgstr "Egyik átvitelen sem érhető el" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" -msgstr "Státusz" +msgstr "Állapot" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:692 msgid "Router Transport Addresses" @@ -394,7 +404,7 @@ msgid "{0} is used for outbound connections only" msgstr "A következő csak kimenő csatlakozásokhoz használva: {0}" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP nincs engedélyezve" @@ -417,13 +427,13 @@ msgid "" msgstr "E határok felülírásához a következő beállításokat a haladó beállitások oldalon: i2np.ntcp.maxConnections=nnn és i2np.udp.maxConnections=nnn ." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Meghatározások" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -438,7 +448,7 @@ msgstr "A távoli társ, router hash alapján azonosítva" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Könyvtár" @@ -465,13 +475,13 @@ msgstr "Mennyi idő telt el az utolsó csomag fogadása / küldése óta" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Üres" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Be/Ki" @@ -486,14 +496,14 @@ msgstr "Mennyi ideje lett a kapcsolat létrehozva" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Fel" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Pontatlanság" @@ -542,7 +552,7 @@ msgstr "Jelenlegi maximális küldési csomag méret / becsült maximális fogad #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "Küldött" @@ -552,7 +562,7 @@ msgstr "A társnak küldött csomagok teljes száma" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "Fogadott" @@ -561,7 +571,7 @@ msgid "The total number of packets received from the peer" msgstr "A társtól érkezett csomagok teljes száma" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Duplex Küldött" @@ -570,7 +580,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "A társnak újraközölt csomagok teljes száma" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Duplex Fogadott" @@ -609,8 +619,8 @@ msgstr "WAP PPP Kapcsolat" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Indítás óta eltelt idő" @@ -649,7 +659,7 @@ msgstr "UPnP Státusz" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668 msgid "Disabled UPnP Devices" -msgstr "" +msgstr "Letiltott UPnP Készülékek" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682 msgid "" @@ -705,19 +715,19 @@ msgid "NTCP connections" msgstr "NTCP kapcsolatok" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Határ" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Időtúllépés" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" -msgstr "" +msgstr "IPv6" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1361 msgid "Out Queue" @@ -728,126 +738,126 @@ msgid "Backlogged?" msgstr "Visszanaplózva?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Bejövő" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Kimenő" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{0} peer" +msgstr[1] "{0} peer" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP csatlakozások" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Rendezés társ hash szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Irány/Bemutató" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Rendezés üres bejövő szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Rendezés üres kimenő szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Rendezés bejövő sebesség szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Rendezés kimenő sebeeség szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Rendezés kapcsolat indítása óta eltelt idő szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Rendezés óra eltérése szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Rendezés torlódás ablak szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Rendezés lassú indítás küszöb szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Rendezés körbejárási idő szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Rendezés újraátviteli időtúllépés szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Rendezés maximális kimenő továbbítási egységenként" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Rendezés küldött csomagok szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Rendezés fogadott csomagok szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Rendezés újraközvetített csomagok szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Rendezés több, mint egyszer fogadott csomagok szerint" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Fejajánlottuk, hogy bemutatjuk őket" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Felajánlották, hogy bemutatnak minket" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Eltömődött" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 sikertelen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} sikertelen" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Kitiltva" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -866,7 +876,7 @@ msgstr "Alagút kérések elvetése: túlterhelt" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "" +msgstr "Alagutak elvetése: Rejtett mód" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" @@ -885,66 +895,66 @@ msgstr "Alagút kérések elvetése: Magas töltöttség" msgid "Dropping tunnel requests: Queue time" msgstr "Alagút kérések elvetése: Sorba állítási idő" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Elérhető új kiegészítő verzió: {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "{0} kiegészítő frissítés keresése sikertelen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Nincs elérhető új verzió a következő kiegészítőhöz: {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} B átviltelre került." -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" -msgstr "" +msgstr "Sikertelen telepítés tőle: {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Sikertelen átvitel a következőtől: {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Frissítés letöltve" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Újraindítás" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Frissítés igazolva" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "innen {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Az aláírás nélküli frissítési fájl korrupt a következőtől: {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Sikertelen másolás a következőre: {0}" @@ -957,10 +967,10 @@ msgstr "Sikertelen másolás a következőre: {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" -msgstr "" +msgstr "HTTP kliens proxy alagútnak futnia kell" #. set status before thread to ensure UI feedback #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91 @@ -971,23 +981,23 @@ msgstr "" msgid "Updating" msgstr "Frissítés" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" -msgstr "" +msgstr "Először frissítened kell a {0} verzióra" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" -msgstr "" +msgstr "{0} Java verzió szükséges, de a telepített Java verzió {1}" #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:62 #, java-format @@ -1000,7 +1010,7 @@ msgstr "Frissítés keresése a következő kiegészítőhöz: {0}" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:72 #, java-format msgid "Bad URL {0}" -msgstr "" +msgstr "Rossz URL {0}" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:95 #, java-format @@ -1174,16 +1184,20 @@ msgid "No new version found at {0}" msgstr "Nincs új verzió a következőn: {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Ideiglenes kitiltás lejár a következőn belül: {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Kitiltva a következő újraindításig vagy következőn belül: {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "Kitiltás visszavonása most" @@ -1284,18 +1298,18 @@ msgstr "Kitiltás visszavonása most" msgid "I2P Router Console" msgstr "I2P Router Konzol" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Hiba a beállítások frissítésekor - kérlek, nézd át a hibanaplót" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Beállítások sikeresen elmentve" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1334,7 +1348,7 @@ msgstr "Kiegészítő Telepítése" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "" +msgstr "Beépülő Telepítése Fájlból" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 @@ -1438,7 +1452,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "Sikertelen telepítés fájlból" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format @@ -1457,7 +1471,7 @@ msgstr "Az összes kiegészítő frissítése folyamatban" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:528 #, java-format msgid "Installing plugin from {0}" -msgstr "" +msgstr "Beépülő telepítése innen: {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:549 #, java-format @@ -1503,7 +1517,7 @@ msgid "Add Client" msgstr "Kliens Hozzáadása" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Kliens" @@ -1535,9 +1549,9 @@ msgid "Plugin" msgstr "Kiegészítő" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Verzió" @@ -1559,7 +1573,8 @@ msgstr "Licensz" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Weboldal" @@ -1572,7 +1587,7 @@ msgid "Stop" msgstr "Állj" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Frissítések ellenőrzése" @@ -1594,7 +1609,7 @@ msgstr "Törlés" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1604,7 +1619,7 @@ msgstr "Kiválasztottak Törlése" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1623,7 +1638,7 @@ msgstr "Alapértelmezett Beállítások Visszaállítása" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1752,8 +1767,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Eltávolítás" @@ -1763,7 +1778,7 @@ msgstr "Válassz hozzáadandó osztályt" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Sávszélesség" @@ -1772,7 +1787,7 @@ msgid "Home Page" msgstr "Kezdőlap" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Hálózat" @@ -1828,9 +1843,9 @@ msgid "UI" msgstr "Kezelőfelület" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Alagút" @@ -1848,15 +1863,15 @@ msgid "Logging" msgstr "Naplózás" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Társ" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statisztika" @@ -1868,8 +1883,8 @@ msgstr "Haladó" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -1893,7 +1908,7 @@ msgstr "TCP teljes letiltása" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256 #, java-format msgid "Updating TCP address to {0}" -msgstr "" +msgstr "TCP cím frissítése erre: {0}" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:263 msgid "Disabling inbound TCP" @@ -1906,7 +1921,7 @@ msgstr "Bejövő TCP Cím frissítése a következőhöz (automatikus):" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:278 #, java-format msgid "Updating TCP port to {0}" -msgstr "" +msgstr "TCP port frissítése erre: {0}" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:280 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:305 @@ -1916,7 +1931,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:311 msgid "Invalid port" -msgstr "" +msgstr "Érvénytelen port" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:289 msgid "Updating inbound TCP port to auto" @@ -1925,7 +1940,7 @@ msgstr "Bejövő TCP Port frissítése a következőhöz (automatikus):" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:303 #, java-format msgid "Updating UDP port to {0}" -msgstr "" +msgstr "UDP port frissítése erre: {0}" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:328 msgid "Gracefully restarting into Hidden Router Mode" @@ -1937,11 +1952,11 @@ msgstr "Türelmes újraindítás a Rejtett Router Üzemmódból való kilépés #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:339 msgid "Enabling UPnP" -msgstr "" +msgstr "UPnP engedélyezése" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:341 msgid "Disabling UPnP" -msgstr "" +msgstr "UPnP letiltása" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:350 msgid "Enabling laptop mode" @@ -1973,7 +1988,7 @@ msgstr "SSU bemutatók szükségesek" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:436 msgid "Invalid address" -msgstr "" +msgstr "Érvénytelen cím" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:442 #, java-format @@ -2130,7 +2145,7 @@ msgstr "Azonnali Újraindítás" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Újraindítás" @@ -2355,7 +2370,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129 msgid "Moved" -msgstr "" +msgstr "Áthelyezve" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136 msgid "Saved order of sections." @@ -2451,7 +2466,7 @@ msgstr "Kimenő opciók" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:471 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:477 msgid "Add user" -msgstr "" +msgstr "Felhasználó hozzáadása" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63 msgid "Theme change saved." @@ -2509,7 +2524,7 @@ msgstr "Észt" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "Greek" -msgstr "" +msgstr "Görög" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 msgid "English" @@ -2529,7 +2544,7 @@ msgstr "Francia" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86 msgid "Hungarian" -msgstr "" +msgstr "Magyar" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:87 msgid "Italian" @@ -2537,11 +2552,11 @@ msgstr "Olasz" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:88 msgid "Japanese" -msgstr "" +msgstr "Japán" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Malagasy" -msgstr "" +msgstr "Madagaszkári" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:90 msgid "Dutch" @@ -2549,7 +2564,7 @@ msgstr "Holland" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:91 msgid "Norwegian Bokmaal" -msgstr "" +msgstr "Norvég" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:92 msgid "Polish" @@ -2562,7 +2577,7 @@ msgstr "Portugál" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:95 msgid "Romanian" -msgstr "" +msgstr "Román" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96 msgid "Russian" @@ -2570,7 +2585,7 @@ msgstr "Orosz" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Slovak" -msgstr "" +msgstr "Szlovák" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Swedish" @@ -2578,7 +2593,7 @@ msgstr "Svéd" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99 msgid "Turkish" -msgstr "" +msgstr "Török" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100 msgid "Ukrainian" @@ -2601,8 +2616,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Hozzáadás" @@ -2611,91 +2626,91 @@ msgstr "Hozzáadás" msgid "Password" msgstr "Jelszó" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Frissítés elérhető, kísérlet a letöltésre" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Frissítés elérhető, a letöltéshez kattints a bal oldalon lévő gombra" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Nincs elérhető frissítés" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Hírek URL frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "belső" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Proxy hoszt frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Proxy port frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Frissítési gyakoriság frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Soha" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Frissítési házirend frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "A frissítési URL-ek frissítése." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Megbízható kulcsok frissítése." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Nem aláírt frissítő URL frissítése a következőre: {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Összes" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Csak jelez" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Csak letöltés és igazolás" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Letöltés, igazolás és újraindítás" @@ -2725,19 +2740,19 @@ msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:40 msgid "Critical error" -msgstr "" +msgstr "Kritikus hiba" #: ../java/src/net/i2p/router/web/EventLogHelper.java:41 msgid "Installed new version" -msgstr "" +msgstr "Új verzió telepítve" #: ../java/src/net/i2p/router/web/EventLogHelper.java:42 msgid "Install failed" -msgstr "" +msgstr "Sikertelen telepítés" #: ../java/src/net/i2p/router/web/EventLogHelper.java:43 msgid "Network error" -msgstr "" +msgstr "Hálózati hiba" #: ../java/src/net/i2p/router/web/EventLogHelper.java:44 #: ../java/src/net/i2p/router/web/EventLogHelper.java:48 @@ -2821,17 +2836,17 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" -msgstr "" +msgstr "Idő" #: ../java/src/net/i2p/router/web/EventLogHelper.java:182 msgid "Event" -msgstr "" +msgstr "Esemény" #: ../java/src/net/i2p/router/web/EventLogHelper.java:184 msgid "Details" -msgstr "" +msgstr "Részletek" #: ../java/src/net/i2p/router/web/FormHandler.java:251 msgid "" @@ -2971,12 +2986,12 @@ msgid "Graph settings saved" msgstr "Ábra beállítások elmentve" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Címjegyzék" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "I2P hosts fájl kezelése itt (I2P domain név feloldás)" @@ -3007,17 +3022,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P Kezdőlap Beállítása" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anoním webes e-mail kliens" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-mail" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Router Segítség" @@ -3027,17 +3042,17 @@ msgid "Router Console" msgstr "Router Konzol" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Beépített anoním BitTorrent Kliens" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Helyi web szerver" @@ -3206,97 +3221,97 @@ msgstr "A HTTP proxy nincs bekapcsolva" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "A böngésződ nincs megfelelően beállítva, hogy HTTP proxyt használjon a következőn: {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Név" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "Átlag" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" -msgstr "" +msgstr "Max" + +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +msgid "Min" +msgstr "Min" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 -msgid "Min" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Összegzés" @@ -3314,223 +3329,223 @@ msgid "No log messages" msgstr "Nincs naplóüzenet" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Helyi router" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Router keresése" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Összes router" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Összes router minden adattal" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSet-ek" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "nem található a hálózati adatbázisban" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Helyi" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Nem közzétett" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Célállomás" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Lejár {0} belül" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Lejárt {0} ezelőtt" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Átjáró (Gateway)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Kiad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Alagút" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Nincs inicializálva" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Hálózati Adatbázis Router Statisztika" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Mennyiség" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Átvitel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Ország" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Mi infónk" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Társ infó a következőnek" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Teljes bejegyzés" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Rejtett" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Frissített" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} előtt" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Közzétett" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Cím(ek)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "költség" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Rejtett vagy indul" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU bemutatókkal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP és SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP és SSU bemutatókkal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" -msgstr "" +msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" -msgstr "" +msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" -msgstr "" +msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Hírek utoljára frissítve: {0} " -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Hírek utoljára ellenőrzve ezelőtt: {0} " -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Hírek elrejtése" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Hírek mutatása" @@ -3580,19 +3595,19 @@ msgid "Groups (Caps)" msgstr "Csoport" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Sebesség" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapacitás" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integráltság" @@ -3615,7 +3630,7 @@ msgid "Failing" msgstr "Elromló" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrált" @@ -3692,71 +3707,71 @@ msgstr "Sikertelen ráta 1 óra alatt" msgid "1d Fail Rate" msgstr "Sikertelen ráta 1 nap alatt" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Küszöb" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "gyors társak" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "nagy kapacitású társak" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "jól integrálódott társak" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "ahogy a profil rendezőben meghatározva" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "csoport" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "Adottságok a NetDb-ben, nincs felhasználva a profilok meghatározásához" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "tető" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "csúcs átvilel (bájt / másodperc) az alatt az 1 perces időtartam alatt, melyben a társ egyedülálló alagutat tartott fenn" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "sebesség" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "kapacitás" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "Óránként hány alagútba kérhetjük őket, hogy csatlakozzanak?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "A közelmúltban hány új társról szóltak nekünk?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integráció" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "a társ kitiltva, nem elérhető vagy az alagút tesztjei sikertelenek?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "állapot" @@ -3884,279 +3899,279 @@ msgstr "Ábra Események Száma" msgid "Lifetime average value" msgstr "Élethossz átlag érték" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Router Segítség és GYIK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Segítség és GYIK" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Beállítások a kliensek és webalkalmazások (szolgáltatások) indítására vonatkozóan; elfekvő szolgáltatások kézi indítása" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P Szolgáltatások" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P Router Beállítása" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P Belső" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Létező alagutak és alagút építési állapot megtekintése" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Minden jelenlegi társ csatlakozás megjelenítése" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "A legutóbbi társ teljesítmény profilok megjelenítése" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profil" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Minden ismert I2P router listájának megjelenítése" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Egészségi Állapot" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Napló" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Ábra router teljesítmény" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Ábra" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Szöveges router teljesítmény statisztika" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" -msgstr "" +msgstr "Helyi Alagutak" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Általános" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Ezt ne tedd közzé, mert tartalmazza az igazi ip címedet." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Helyi Személyazonosság" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Egyedi I2P router azonosítód a következő:" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "soha ne fedd fel senkinek" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "Mutat" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "A futó I2P alkalmazás verziója" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Mióta fut ez a munkaszakasz" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Segítség a tűzfal és router beállítására az I2P optimális teljesítménye érdekében" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "I2P frissítések konfigurálása" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P frissítés" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Utóbbi percek/óra kapcsolatai" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Aktív" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "A kliens csatornát létrehozó kapcsolatok száma" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Gyors" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Nagy kapacitású" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "A hálózati adatbázisban szereplő összes kapcsolat száma" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Ismert" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "A router szávszélesség elosztásának beállítása" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Sávszélesség Be/Ki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Összes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Használt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Felderítő" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Résztvevő" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Megosztási ráta" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Mi van a router munka várólistájában?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Torlódás" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "A router teljesítményét szemlélteti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Feladat késés" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Más I2P routereknek küldött üzenetek gyorsaságát szemlélteti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Üzenet késés" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Alagút lemaradás" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Vissznapló" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" -msgstr "" +msgstr "Hírek & Frissítések" #: ../java/src/net/i2p/router/web/SummaryHelper.java:143 msgid "ERR-Client Manager I2CP Error - check logs" @@ -4189,7 +4204,7 @@ msgstr "FIGYELEM-Tűzfalazva és floodfill" #: ../java/src/net/i2p/router/web/SummaryHelper.java:194 msgid "Disconnected - check network cable" -msgstr "" +msgstr "Szétkapcsolva - ellenőrizd a hálózati kábelt" #: ../java/src/net/i2p/router/web/SummaryHelper.java:197 msgid "" @@ -4215,7 +4230,7 @@ msgstr "Hozzáadás/Eltávolítás/Szerkesztés, valamint saját kliens és szer #: ../java/src/net/i2p/router/web/SummaryHelper.java:450 msgid "Hidden Service" -msgstr "" +msgstr "Rejtett Szolgáltatás" #: ../java/src/net/i2p/router/web/SummaryHelper.java:454 msgid "Show tunnels" @@ -4258,26 +4273,26 @@ msgstr "Alagutak építés alatt" msgid "shared clients" msgstr "osztott kliensek" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Telepítéshez kattints az újraindításra" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Telepítéshez kattints a lekapcsolás és újraindítás -ra" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "{0} Verzió" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" -msgstr "" +msgstr "Frissítés elérhető" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "{0} Frissítés Letöltése" @@ -4286,7 +4301,7 @@ msgstr "{0} Frissítés Letöltése" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4295,69 +4310,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Aláírás nélküli
Frissítés Letöltése {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Segítség a tűzfal beállításához" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Ellenőrizd a hálózati kapcsolatokat és a NAT-ot/tűzfalat" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Újratáplálás (reseed)" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "Események a következőben: {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "átlagolva a következőhöz: {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Események időszakonként" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "átlag" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "maximum" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "most" @@ -4534,175 +4565,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Indításkor a Router Konzol megnyitása böngészőben" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eep oldal" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webszerver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klasszikus" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "sötét" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "világos" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "éjfél" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "SávszélességHatároló" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "KliensÜzenetek" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Titkosítás" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PAlagút" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetKészlet" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "MunkaSor" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "HálózatiAdatbázis" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Stream" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Gát" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Szállítás" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "hoszt" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "kulcs" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "sávszélesség beállítása" @@ -4871,7 +4854,7 @@ msgid "Share" msgstr "Megoszt" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "MEGJEGYZÉS" @@ -4912,7 +4895,7 @@ msgid "Advanced network configuration page" msgstr "Haladó hálózati beállítások lap" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4951,27 +4934,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "Automatikus" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Haladó I2P Beállítások" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Némely változtatás érvénybe lépéséhez újraindítás szükséges." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" @@ -5122,7 +5113,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:646 msgid "Update All Plugins" -msgstr "" +msgstr "Összes Beépülő Frissítése" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150 msgid "config home" @@ -5148,7 +5139,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:416 msgid "Applications and Configuration" -msgstr "" +msgstr "Alkalmazások és Konfiguráció" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:150 msgid "config keyring" @@ -5340,7 +5331,7 @@ msgstr "Kísérleti" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532 msgid "IPv4 Configuration" -msgstr "" +msgstr "IPv4 Konfiguráció" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536 msgid "Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)" @@ -5348,15 +5339,15 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:538 msgid "IPv6 Configuration" -msgstr "" +msgstr "IPv6 Konfiguráció" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:542 msgid "Disable IPv6" -msgstr "" +msgstr "IPv6 Letiltás" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:546 msgid "Enable IPv6" -msgstr "" +msgstr "IPv6 Engedélyezés" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:550 msgid "Prefer IPv4 over IPv6" @@ -6382,14 +6373,14 @@ msgstr "Üdvözöl az I2P" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:336 msgid "I2P Addressbook" -msgstr "" +msgstr "I2P Címjegyzék" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:338 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:339 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:338 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:338 msgid "Open in new tab" -msgstr "" +msgstr "Megnyitás új lapon" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/dns_jsp.java:342 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:343 @@ -6403,7 +6394,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:344 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:344 msgid "Click here to continue." -msgstr "" +msgstr "Kattints ide a folytatáshoz." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:159 msgid "Internal Error" @@ -6478,11 +6469,11 @@ msgstr "nem található" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:146 msgid "events" -msgstr "" +msgstr "események" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/events_jsp.java:334 msgid "I2P Event Log" -msgstr "" +msgstr "I2P Eseménynapló" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graph_jsp.java:148 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/graphs_jsp.java:146 @@ -6534,11 +6525,11 @@ msgstr "Router Napló" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:419 msgid "Event Logs" -msgstr "" +msgstr "Eseménynaplók" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:421 msgid "View event logs" -msgstr "" +msgstr "Eseménynaplók megtekintése" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:423 msgid "Service (Wrapper) Logs" @@ -6604,11 +6595,11 @@ msgstr "Frissítés {0} Kikapcs" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:164 msgid "torrents" -msgstr "" +msgstr "torrentek" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/torrents_jsp.java:336 msgid "I2P Torrent Downloader" -msgstr "" +msgstr "I2P Torrent Letöltő" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/tunnels_jsp.java:146 msgid "tunnel summary" @@ -6630,8 +6621,8 @@ msgstr "Profil társanként {0}" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:164 msgid "webmail" -msgstr "" +msgstr "webmail" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:336 msgid "I2P Webmail" -msgstr "" +msgstr "I2P Webmail" diff --git a/apps/routerconsole/locale/messages_it.po b/apps/routerconsole/locale/messages_it.po index 921d2f815..4643d2b4c 100644 --- a/apps/routerconsole/locale/messages_it.po +++ b/apps/routerconsole/locale/messages_it.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/it/)\n" "MIME-Version: 1.0\n" @@ -46,8 +46,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -56,8 +56,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -66,8 +66,8 @@ msgstr[1] "{0} sec" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -76,37 +76,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 ora" msgstr[1] "{0} ore" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 giorno" msgstr[1] "{0} giorni" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" msgstr[1] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -149,7 +158,7 @@ msgstr "A" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "nessuno" @@ -288,43 +297,43 @@ msgstr "Rifiutando i tunnel: Arresto" msgid "Rejecting tunnels" msgstr "Rifiutando i tunnel" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeding" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Il reseed ha recuperato solo 1 router." msgstr[1] "Il reseed ha recuperato solo {0} router." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed fallito" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Guarda {0} per aiuto" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "Pagina di configurazione del reseed" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseed: recupero dell'URL dei seed." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -394,7 +403,7 @@ msgstr "Irraggiungibile su ogni trasporto" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Stato" @@ -409,7 +418,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} è usato solo per le connessioni in uscita" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP non è abilitato" @@ -432,13 +441,13 @@ msgid "" msgstr "Per sistemare questi limiti, aggiungi l'impostazione i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn nella pagina di configurazione avanzata." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definizioni" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -453,7 +462,7 @@ msgstr "Peer remoto, identificato dall'hash del router" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Cartella" @@ -480,13 +489,13 @@ msgstr "Quanto è passato dalla ricezione/invio di un pacchetto" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Inattivo" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Entrata/Uscita" @@ -501,14 +510,14 @@ msgstr "Quanto è passato dall'inizio di questa connessione" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Su" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Disallinea" @@ -557,7 +566,7 @@ msgstr "Dimensione corrente massima pacchetti in invio / dimensione massima stim #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -567,7 +576,7 @@ msgstr "Il numero totale di pacchetti inviati al peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -576,7 +585,7 @@ msgid "The total number of packets received from the peer" msgstr "Il numero totale di pacchetti ricevuti dal peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -585,7 +594,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Il numero totale di pacchetti ritrasmessi al peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -624,8 +633,8 @@ msgstr "Connessione WAN PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Intervallo di attività" @@ -720,17 +729,17 @@ msgid "NTCP connections" msgstr "Connessioni NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Intervallo" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -743,126 +752,126 @@ msgid "Backlogged?" msgstr "Arretrato?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "In ingresso" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "In uscita" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} peer" msgstr[1] "{0} peer" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Connessioni UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Ordina secondo l' hash dei peer" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Direzione/Introduzione" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Ordina secondo il tempo di inattività dei tunnel in entrata" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Ordina secondo il tempo di inattività dei tunnel in uscita" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Ordina secondo la velocità dei tunnel in entrata" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Ordina secondo la velocità dei tunnel in uscita" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Ordina per tempo di connessione" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Ordina secondo la discrepanza di ciclo" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Ordina per finestra di congestione" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Ordina secondo la soglia di avvio lento" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Ordina per tempo di ciclo" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Ordina secondo l'intervallo di ritrasmissione" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Ordina secondo l'unità massima di trasmissione in uscita" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Ordina per pacchetti inviati" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Ordina per pacchetti ricevuti" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Ordina per pacchetti ritrasmessi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Ordina per pacchetti ricevuti più di una volta" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Ci siamo offerti di introdurli" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Hanno offerto di introdurci" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Congestionato" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 fallimento" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} fallimenti" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Bannato" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "ritardi" @@ -900,66 +909,66 @@ msgstr "Abbandono delle richieste tunnel: Carico elevato" msgid "Dropping tunnel requests: Queue time" msgstr "Abbandono delle richieste tunnel: Tempo della coda scaduto" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Una nuova versione del plugin {0} è disponibile" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Controllo aggiornamenti per il plugin {0} fallito" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Nessuna nuova versione del plugin {0} è disponibile" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B trasferiti" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Trasferimento fallito da {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Aggiornamento scaricato" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Riavvio" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Aggiornamento verificato" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "da {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Il file di aggiornamento non firmato ricevuto da {0} è corrotto" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Copia a {0} fallita" @@ -972,7 +981,7 @@ msgstr "Copia a {0} fallita" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -986,20 +995,20 @@ msgstr "" msgid "Updating" msgstr "In aggiornamento" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Aggiornamenti in-network disabilitati. Controlla il packet manager." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Non hai i permessi di scrittura per la cartella di installazione di I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Devi prima aggiornare alla versione {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Richiede la versione {0} di Java ma è installata la versione {1}" @@ -1189,16 +1198,20 @@ msgid "No new version found at {0}" msgstr "Nessuna nuova versione trovata a {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Interdizione temporanea che scade in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Bannato fino al riavvio o in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "riammissione istantanea" @@ -1299,18 +1312,18 @@ msgstr "riammissione istantanea" msgid "I2P Router Console" msgstr "Console router I2P " -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Errore nell'aggiornamento della configurazione - vedere i log di errore" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configurazione salvata con successo" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1518,7 +1531,7 @@ msgid "Add Client" msgstr "Aggiugi client" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Client" @@ -1550,9 +1563,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versione" @@ -1574,7 +1587,8 @@ msgstr "Licenza" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Sito web" @@ -1587,7 +1601,7 @@ msgid "Stop" msgstr "Ferma" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Verifica aggiornamento" @@ -1609,7 +1623,7 @@ msgstr "Cancella" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1619,7 +1633,7 @@ msgstr "Elimina selezionati" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1638,7 +1652,7 @@ msgstr "Ripristina" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1767,8 +1781,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Rimuovi" @@ -1778,7 +1792,7 @@ msgstr "Seleziona una classe da aggiungere" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Larghezza di banda" @@ -1787,7 +1801,7 @@ msgid "Home Page" msgstr "Pagina Principale" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Rete" @@ -1843,9 +1857,9 @@ msgid "UI" msgstr "Interfaccia Utente" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnel" @@ -1863,15 +1877,15 @@ msgid "Logging" msgstr "Registro" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peer" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistiche" @@ -1883,8 +1897,8 @@ msgstr "Avanzate" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2145,7 +2159,7 @@ msgstr "Riavvia immediatamente" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Riavvio" @@ -2616,8 +2630,8 @@ msgid "User Name" msgstr "Nome Utente" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Aggiungi" @@ -2626,91 +2640,91 @@ msgstr "Aggiungi" msgid "Password" msgstr "Password" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Aggiornamento o controllo già in corso" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Aggiornamento disponibile, tentativo di scaricamento in corso" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Aggiornamento disponibile, fai click sul pulsante a sinistra per scaricarlo" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Nessun aggiornamento disponibile" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Aggiornando URL notizie a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "interno" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Aggiornando host proxy a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Aggiornando porta proxy a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Aggiornando frequenza di aggiornamento a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Mai" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Aggiornando politica di aggiornamento a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Aggiornamento degli URL degli aggiornamenti." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Aggiornamento delle chiavi di fiducia." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Aggiornando URL aggiornamenti non firmati a {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Ogni" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Segnala solo" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Scarica e verifica soltanto" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Scarica, verifica e riavvia" @@ -2836,7 +2850,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tempo" @@ -2986,12 +3000,12 @@ msgid "Graph settings saved" msgstr "Impostazioni del grafico salvate" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Rubrica" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Gestisci qui i tuoi file host I2P (risoluzione del nome di dominio I2P)" @@ -3022,17 +3036,17 @@ msgid "I2P Home Page Configuration" msgstr "Configurazione Pagina Principale I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Client di posta elettronica anonimo" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-mail" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Aiuto per il router I2P" @@ -3042,17 +3056,17 @@ msgid "Router Console" msgstr "Console del Router" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Client BitTorrent anonimo incorporato" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Server web locale" @@ -3221,97 +3235,97 @@ msgstr "Il proxy HTTP non è avviato" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Il tuo browser non è configurato correttamente per usare il proxy HTTP al {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nome" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "Coda dei Job I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Esecutori dei Job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Job attivi" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "avviato {0} fa" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Job appena terminato" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "terminato {0} fa" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Job pronti/in attesa" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Job pianificati" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} partirà in {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Statistice Job Globali" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Job" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "In coda" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "In esecuzione" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Media" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Pending" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Sommario" @@ -3329,223 +3343,223 @@ msgid "No log messages" msgstr "Nessun messaggio di log" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Router locale" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Lookup del router" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Tutti i Router" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Tutti i Router con tutte le statistiche" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "Insiemi di Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "non trovato nel database della rete" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "Serie di Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Locale" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Non pubblicato" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destinazione" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Scade in {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Scaduto {0} fa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Non inizializzata" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Statistiche del Router nel Database della Rete" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Conto" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Trasporti" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Paese" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Informazioni su di noi" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Informazioni del Peer per" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Voce completa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Nascosto" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Aggiornato" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} fa" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Pubblicato" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Indirizzo/i" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "costo" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Nascosto o in avvio" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU con introduttori" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP e SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP e SSU con introduttori" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 solo SSU, presentatori" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, presentatori" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, presentatori" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 solo NTCP, SSU, presentatori" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Notizie aggiornate {0} fa." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Notizie controllate {0} fa." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Nascondi notizie" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Mostra notizie" @@ -3595,19 +3609,19 @@ msgid "Groups (Caps)" msgstr "Gruppi (Maiuscole)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Velocità" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacità" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integrazione" @@ -3630,7 +3644,7 @@ msgid "Failing" msgstr "In fallimento" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrato" @@ -3707,71 +3721,71 @@ msgstr "Tasso di fallimento di 1h" msgid "1d Fail Rate" msgstr "Tasso di fallimento di 1g" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Soglie" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "peer veloci" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "peer ad alta capacità" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "peer ben integrati" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "come determinato dall'organizzatore del profilo" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "gruppi" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "capacità nel database di rete, non usate per determinare profili" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "maiuscole" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "picco di throughput (byte al secondo) che il peer ha sostenuto in un singolo tunnel nell'intervallo di 1 minuto " -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "velocità" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "capacità" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "a quanti tunnel possiamo chiedergli di partecipare in un'ora?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "di quanti peer ci hanno fatto sapere ultimamente?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integrazione" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "per caso il peer è bandito, irraggiungibile, o fallisce i test del tunnel? " -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "stato" @@ -3899,277 +3913,277 @@ msgstr "Grafo Conteggio Eventi " msgid "Lifetime average value" msgstr "Valore medio nell'arco di vita" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Aiuto & Router I2P; FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Aiuto & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Configura l'avvio di client e webapps (servizi); avvia manualmente servizi dormienti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Servizi I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configura il Router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Interni I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Vedi i tunnel esistenti e lo stato della costruzione dei tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Mostra tutte le connessioni correnti dei peer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Mostra i profili di prestazioni recenti dei peer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profili" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Mostra la lista di tutti i router I2P conosciuti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Rapporto di salute" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Registri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Grafico delle prestazioni del router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Grafici" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Statistiche testuali delle prestazioni del router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Generale" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "La tua identità locale è rappresentata dall'identità del tuo i2P router, che è simile ad un indirizzo ip ma appartenente alla rete i2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "NON divulgare queste stringhe a nessuno, esse potrebbero rivelare il tuo vero ip." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Identità locale" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "La tua identità unica del router I2P è" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "non rivelarla mai a nessuno" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "mostra" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "La versione di I2P che stai eseguendo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Da quanto tempo stiamo funzionando in questa sessione" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Aiuto nella configurazione del tuo firewall e del tuo router per ottenere prestazioni ottimali da I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configura aggiornamenti I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Aggiornamento I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Peers con i quali abbiamo comunicato negli ultimi minuti/ultima ora" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Attivo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Numero di peers disponibili per costruire i client-tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Veloce" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Numero di peers disponibili per costruire tunnel di esplorazione" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Alta capacità" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Numero di peers disponibili per le ricerche" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Numero totale di peers nel nostro database di reti" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Conosciuto" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configura l'allocazione di banda del router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Largheza di banda entrata/uscita" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Totale" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Usato" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Usato per costruire/testare i tunnel e comunicare con i peers di accumulo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Esplorativo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunnel che stiamo usando per promuovere o accedere a servizi in rete" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Tunnel ai quali contribuiamo facendone parte con la nostra larghezza di banda" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Partecipando" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Il rapporto tra hops di tunnel che proponiamo rispetto a quelli che usiamo, più il valore si avvicina a 1.00 più contribuiamo alla rete i2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Tasso di condivisione" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Cosa c'è nella coda di lavoro del router?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Congestione" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indica le performance del router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Ritardo nel compito" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indica quanto veloci sono i messaggi in uscita verso gli altri router I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Ritardo nel messaggio" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Test (tempo) di un ciclo tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Lag del tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Richieste in coda da parte di altri routers per partecipare ai tunnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Arretrati" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "News & Aggiornamenti" @@ -4273,26 +4287,26 @@ msgstr "Costruendo i tunnel" msgid "shared clients" msgstr "client condivisi" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Cliccare Riavvia per installare" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Cliccare Spegni per riavviare e installare" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versione {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Aggiornamento disponibile" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Scaricamento {0} Aggiornamento" @@ -4301,7 +4315,7 @@ msgstr "Scaricamento {0} Aggiornamento" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4310,69 +4324,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Scaricamento Aggiornamento {0} Non Firmato
" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Aiuto con la configurazione del firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Controlla la connessione di rete e il NAT/firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Reseed" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Ordine" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Sopra" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Sotto" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Basso" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Seleziona una sezione da aggiungere" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "eventi in {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "media per {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Eventi per periodo" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "med" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "massimo" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "ora" @@ -4549,175 +4579,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Apri la console del router nel browser all'avvio" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "Proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "Webserver I2P" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "Proxy HTTP" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "classico" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "scuro" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "luminoso" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "mezzanotte" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Limitatore di Banda" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "Messaggi Client" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Cifratura" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Tunnel I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "Coda Lavori" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "Database di Rete" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Flusso" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Velocità" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Trasporto" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "chiave" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "porta" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "configura larghezza di banda" @@ -4886,7 +4868,7 @@ msgid "Share" msgstr "Condivisione" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTA" @@ -4927,7 +4909,7 @@ msgid "Advanced network configuration page" msgstr "Pagina di configurazione avanzata della rete" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4966,27 +4948,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configurazione avanzata I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Certi cambiamenti possono richiedere un riavvio per avere effetto." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_ja.po b/apps/routerconsole/locale/messages_ja.po index 1da892428..136d6df97 100644 --- a/apps/routerconsole/locale/messages_ja.po +++ b/apps/routerconsole/locale/messages_ja.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-16 09:35+0000\n" -"Last-Translator: g3600303 \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,8 +37,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -46,8 +46,8 @@ msgstr[0] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -55,8 +55,8 @@ msgstr[0] "{0} 秒" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,34 +64,42 @@ msgstr[0] "{0} 分" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0} 時間" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0} 日" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -133,7 +141,7 @@ msgstr "送信先" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "なし" @@ -272,42 +280,42 @@ msgstr "トンネルを拒否中: シャットダウン" msgid "Rejecting tunnels" msgstr "トンネルを拒否中" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "リシード中" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "リシードは {0} ルーターのみ取得しました。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "リシード失敗。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "ヘルプについては {0} をご覧ください。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "リシード設定ページ" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "リシード中: シード URL を取得中" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -377,7 +385,7 @@ msgstr "すべてのトランスポートに到達不可" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "ステータス" @@ -392,7 +400,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} は送信接続にのみ使用されます。" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP は有効ではありません" @@ -415,13 +423,13 @@ msgid "" msgstr "これらの制限を上書きするには、高度な設定ページに設定 i2np.ntcp.maxConnections=nnn 及び i2np.udp.maxConnections=nnn を加えてください。" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "定義" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -436,7 +444,7 @@ msgstr "リモートピア、ルーターハッシュにより識別" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "ディレクトリ" @@ -463,13 +471,13 @@ msgstr "パケットが受信/送信されてからの経過時間" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "アイドル" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "入出力" @@ -484,14 +492,14 @@ msgstr "この接続が確立以後の経過時間" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "アップ" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "スキュー" @@ -540,7 +548,7 @@ msgstr "現在の最大送信パケットサイズ / 推定最大受信パケッ #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -550,7 +558,7 @@ msgstr "ピアに送信されたパケットの合計数" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -559,7 +567,7 @@ msgid "The total number of packets received from the peer" msgstr "ピアから受信したパケットの合計数" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -568,7 +576,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "ピアに再送されたパケットの合計数" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -607,8 +615,8 @@ msgstr "WAN PPP 接続" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "稼働時間" @@ -703,17 +711,17 @@ msgid "NTCP connections" msgstr "NTCP 接続" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "制限" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "タイムアウト" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -726,125 +734,125 @@ msgid "Backlogged?" msgstr "バッグログされていますか？" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "着信" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "送信" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} ピア" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP 接続" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "ピアハッシュでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "説明/指示" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "アイドルの受信でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "アイドルの送信でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "受信速度でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "送信速度でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "接続稼働時間でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "クロックスキューでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "輻輳ウィンドウでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "スロースタートしきい値でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "往復時間でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "再送信タイムアウトでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "送信最大伝送単位でソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "送信パケットでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "受信パケットでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "再送パケットでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "二度以上受信したパケットでソート" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "We offered to introduce them" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "They offered to introduce us" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "絞られました" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 回失敗" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} 回失敗" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "禁止されました" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "バッグログされました" @@ -882,66 +890,66 @@ msgstr "トンネル要求ドロップ: 高いロード" msgid "Dropping tunnel requests: Queue time" msgstr "トンネル要求ドロップ: キュー時間" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "新しいプラグインのバージョン {0} が利用できます。" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "プラグイン {0} のアップデート確認に失敗" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "プラグイン {0} の新しいバージョンは利用できません。" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B 転送" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "{0} からの転送に失敗しました" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "更新がダウンロードされました" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "再起動中" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "更新が確認されました" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "{0} から" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "{0} からの署名されていない更新ファイルは破損しています" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "{0} へのコピーに失敗" @@ -954,7 +962,7 @@ msgstr "{0} へのコピーに失敗" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -968,20 +976,20 @@ msgstr "" msgid "Updating" msgstr "更新中" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "ネットワーク内アップデートが無効になりました。パッケージマネージャーを確認してください。" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "I2P のインストールディレクトリに対する書き込み権限がありません。" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "まずバージョン {0} にアップデートしなければなりません" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Java のバージョン {0} が必要ですが、インストールされている Java のバージョンは {1} です" @@ -1171,16 +1179,20 @@ msgid "No new version found at {0}" msgstr "{0} に新しいバージョンが見つかりませんでした" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "{0} に期限切れとなる一時禁止" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "再起動か {0} まで禁止" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "今すぐ禁止解除" @@ -1281,18 +1293,18 @@ msgstr "今すぐ禁止解除" msgid "I2P Router Console" msgstr "I2P ルーターコンソール" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "設定を更新する際にエラー - エラーログを確認してください" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "設定は正常に保存されました" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1500,7 +1512,7 @@ msgid "Add Client" msgstr "クライアントを追加" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "クライアント" @@ -1532,9 +1544,9 @@ msgid "Plugin" msgstr "プラグイン" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "バージョン" @@ -1556,7 +1568,8 @@ msgstr "ライセンス" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "ウェブサイト" @@ -1569,7 +1582,7 @@ msgid "Stop" msgstr "停止" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "アップデートを確認" @@ -1591,7 +1604,7 @@ msgstr "削除" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1601,7 +1614,7 @@ msgstr "選択削除" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1620,7 +1633,7 @@ msgstr "デフォルトに戻す" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1749,8 +1762,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "削除" @@ -1760,7 +1773,7 @@ msgstr "追加するクラスを選択" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "帯域幅" @@ -1769,7 +1782,7 @@ msgid "Home Page" msgstr "ホームページ" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "ネットワーク" @@ -1825,9 +1838,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "トンネル" @@ -1845,15 +1858,15 @@ msgid "Logging" msgstr "ロギング" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "ピア" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "統計" @@ -1865,8 +1878,8 @@ msgstr "詳細" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2126,7 +2139,7 @@ msgstr "すぐに再起動" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "再起動" @@ -2594,8 +2607,8 @@ msgid "User Name" msgstr "ユーザー名" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "追加" @@ -2604,91 +2617,91 @@ msgstr "追加" msgid "Password" msgstr "パスワード" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "アップデートチェックは実行中です" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "アップデートが利用でき、現在ダウンロード試行中です" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "アップデートが利用でき、左のボタンをクリックするとダウンロードします" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "利用可能なアップデートなし" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "内部" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "アップデート URL を更新中。" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "信頼されているキーを更新中。" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "いつも" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "通知のみ" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "ダウンロードと検証のみ" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "ダウンロードと検証、再起動" @@ -2814,7 +2827,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "時間" @@ -2964,12 +2977,12 @@ msgid "Graph settings saved" msgstr "グラフ設定が保存されました" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "アドレスブック" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "ここで I2P の hosts ファイルを管理 (I2P のドメイン名解決)" @@ -3000,17 +3013,17 @@ msgid "I2P Home Page Configuration" msgstr "I2Pのホームページカスタマイズ" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "匿名ウェブメールクライアント" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Eメール" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P ルーターヘルプ" @@ -3020,17 +3033,17 @@ msgid "Router Console" msgstr "ルーターコンソール" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "内蔵匿名 BitTorrent クライアント" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "ローカルウェブサーバー" @@ -3199,97 +3212,97 @@ msgstr "HTTPプロキシは起動していません" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "名前" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "有効なジョブ" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "合計ジョブ統計" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "キュー" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "平均" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "最大" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "最小" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "保留中" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3307,223 +3320,223 @@ msgid "No log messages" msgstr "ログメッセージなし" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "リースセット" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "ルーター" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "ネットワークデータベース内に見つかりませんでした" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "リースセット" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "ローカル" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "未公開" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "宛先" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "{0} に期限切れ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "{0} 前に期限切れ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "ゲートウェイ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "リース" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "トンネル" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "未初期化" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "ネットワークデータベースルーター統計" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "カウント" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "トランスポート" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "国" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "情報" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "次のピアの情報: " -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "非表示" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "更新" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} 前" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "公開済み" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "アドレス" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "コスト" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "隠すか起動中" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "イントロデューサー付き SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP 及び SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP 及びイントロデューサー付き SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "ニュースは {0} に最終更新。" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "ニュースは {0} に最終確認。" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3569,19 +3582,19 @@ msgid "Groups (Caps)" msgstr "グループ (大文字)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "速度" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "許容数" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "統合" @@ -3604,7 +3617,7 @@ msgid "Failing" msgstr "失敗" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "統合済み" @@ -3681,71 +3694,71 @@ msgstr "1時間失敗率" msgid "1d Fail Rate" msgstr "1日失敗率" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "しきい値" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "高速なピア" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "許容数の大きいピア" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "上手く統合されているピア" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "プロファイル管理ソフトで判断するように" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "グループ" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "netDb の許容数、プロファイルの判断には使用されません" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "大文字" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "速度" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "許容数" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "一時間でどれだけ多くのトンネルの参加を求められるか？" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "最近どれだけ多くの新規ピアを伝えたか？" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "統合" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "ピアが禁止されていたり、到達不可であったり、トンネルテストに失敗しているか？" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "ステータス" @@ -3871,277 +3884,277 @@ msgstr "グラフイベントカウント" msgid "Lifetime average value" msgstr "生涯平均値" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P ルーターヘルプ & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "ヘルプと FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "クライアントとウェブアプリ (サービス) のスタートアップを構成。手動で休止サービスを開始" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P サービス" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P ルーターを構成" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P 内部" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "既存のトンネルとトンネル作成ステータスを表示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "現在のピア接続をすべて表示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "最近のピアパフォーマンスプロファイルを表示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "プロファイル" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "既存の全 I2P ルーターの一覧を表示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "健全度報告" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "ログ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "ルーターパフォーマンスをグラフ化" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "グラフ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "テキストのルーターパフォーマンス統計" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "一般" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "ローカル識別子は一意な I2P ルーターの識別子であり、 IP アドレスに近いですが、 I2P に合わせています。" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "ローカル識別子" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "あなたの一意な I2P ルーター識別子は" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "誰にも決して明かさない" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "表示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "起動中の I2P ソフトウェアのバージョン" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "このセッションでどれだけの間起動しているか" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "最適な I2P パフォーマンスを得るためにファイアーウォールとルーターを構成するのに役立ちます" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "アクティブ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "高速" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "予備トンネルの形成に利用できるピアの数" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "高許容数" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "ネットワークデータベースに利用できるピアの数の照会" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "ネットワークデータベース内の合計ピア数" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "既知" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "ルーターの帯域幅割り当てを設定" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "帯域幅 入力/出力" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "合計" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "使用済み" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "トンネルの作成・テストと、floodfillピアとコミュニケーションを取るのに使用された" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "予備" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "参加中" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "共有比率" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "ルーターのジョブキューに何があるか？" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "混雑状態" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "ジョブラグ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "メッセージ遅延" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "トンネルラグ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "バックラグ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4245,26 +4258,26 @@ msgstr "トンネルを構成中" msgid "shared clients" msgstr "共有されたクライアント" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "インストールするには再起動をクリック" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "インストールするにはシャットダウンをクリックして再起動" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "バージョン {0} " -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4273,7 +4286,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4282,69 +4295,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "ファイアーウォールの構成に役立ちます" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "リシード" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "{0} のイベント" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "{0} の平均" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "イベントと期間" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "平均" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "最大" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "現在" @@ -4521,175 +4550,127 @@ msgid "Open Router Console in web browser at startup" msgstr "スタートアップ時にウェブブラウザでルーターコンソールを開く" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC プロキシ" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P ウェブブラウザ" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP プロキシ" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "クラシック" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "ダーク" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "ライト" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "ミッドナイト" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "帯域幅リミッター" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "クライアントメッセージ" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "暗号化" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "ネットワークデータベース" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "トランスポート" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "帯域幅を設定" @@ -4858,7 +4839,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4899,7 +4880,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4938,27 +4919,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_nb.po b/apps/routerconsole/locale/messages_nb.po index ebb3940d7..d0dae71ae 100644 --- a/apps/routerconsole/locale/messages_nb.po +++ b/apps/routerconsole/locale/messages_nb.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/I2P/language/nb/)\n" "MIME-Version: 1.0\n" @@ -34,8 +34,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -44,8 +44,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -54,8 +54,8 @@ msgstr[1] "{0} sek" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,37 +64,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 time" msgstr[1] "{0} timer" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 dag" msgstr[1] "{0} dager" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -137,7 +146,7 @@ msgstr "Til" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "" @@ -276,43 +285,43 @@ msgstr "Avviser tunneler: Avslutter" msgid "Rejecting tunnels" msgstr "Avviser tunneler" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeding" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Reseed mottok bare 1 ruter." msgstr[1] "Reseed mottok bare {0} rutere." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed feilet." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Se {0} for hjelp." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "reseed instillings side" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseeding: mottar seed URL." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -382,7 +391,7 @@ msgstr "Utilgjengelig på alle transporter" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -397,7 +406,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} er brukt for bare utgående tilkoblinger" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "" @@ -420,13 +429,13 @@ msgid "" msgstr "For å overstyre de begrensningene, legg til instillingene i2np.ntcp.maxConnections=nnn og i2np.udp.maxConnections=nnn på den avanserte konfigurasjon siden." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definisjoner" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -441,7 +450,7 @@ msgstr "Den eksterne peer, identifisert av ruter hash" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Mappe" @@ -468,13 +477,13 @@ msgstr "Hvor lenge siden en pakke har blitt mottat / sendt" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Tomgang" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Inn/Ut" @@ -489,14 +498,14 @@ msgstr "Hvor lenge siden denne tilkoblingen var etablert" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Opp" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "klokkeforskyvning" @@ -545,7 +554,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -555,7 +564,7 @@ msgstr "Totalt antall pakker sendt til peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -564,7 +573,7 @@ msgid "The total number of packets received from the peer" msgstr "Det totale antall pakker mottatt fra peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -573,7 +582,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Det totale antallet pakker videresendes til peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -612,8 +621,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -708,17 +717,17 @@ msgid "NTCP connections" msgstr "NTCP tilkoblinger" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Begrensing" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -731,126 +740,126 @@ msgid "Backlogged?" msgstr "Backlogged?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Inngående" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Utgående" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP tilkoblinger" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sorter ut ifra peer hash" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Rettning/Innledning" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sorter etter tomgang ingående" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sorter etter tomgang utgående" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sorter etter inngående hastighet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sorter etter utgående hastighet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sorter etter tilkobling oppetid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sorter etter klokkeforskyvning" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sorter etter pakker sendt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sorter etter pakker mottatt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sorter etter videresendte pakker " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sorter etter pakker som er mottatt mer enn én gang" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Vi tilbød å introdusere dem" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "De tilbød seg å introdusere oss" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Kvalt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 feil" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} feiler" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Bannet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -888,66 +897,66 @@ msgstr "Dropper tunnel forespørsler: Høy last" msgid "Dropping tunnel requests: Queue time" msgstr "Dropper tunneler forespørsler: Kø tid" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B overført" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Overføring fra {0} feilet" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Oppdatering nedlastet" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Starter om igjen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Oppdatering kontrollert" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "fra {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Usignert oppdateringsfil fra {0} er korrupt" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Klarte ikke å kopiere til {0}" @@ -960,7 +969,7 @@ msgstr "Klarte ikke å kopiere til {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -974,20 +983,20 @@ msgstr "" msgid "Updating" msgstr "Oppdaterer" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Krever Java-versjon {0}, installert versjon av java er {1}" @@ -1177,16 +1186,20 @@ msgid "No new version found at {0}" msgstr "Ingen ny versjon funnet på {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1287,18 +1300,18 @@ msgstr "" msgid "I2P Router Console" msgstr "I2P Ruter Konsoll" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Innstillingene er lagret" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1506,7 +1519,7 @@ msgid "Add Client" msgstr "Legg til klient" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Klient" @@ -1538,9 +1551,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versjon" @@ -1562,7 +1575,8 @@ msgstr "Lisens" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Webside" @@ -1575,7 +1589,7 @@ msgid "Stop" msgstr "Stopp" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Se etter oppdateringer" @@ -1597,7 +1611,7 @@ msgstr "Slett" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1607,7 +1621,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1626,7 +1640,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1755,8 +1769,8 @@ msgstr "ADVARSEL" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Fjern" @@ -1766,7 +1780,7 @@ msgstr "Velg klasse å legge til" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Båndbredde" @@ -1775,7 +1789,7 @@ msgid "Home Page" msgstr "Startside" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Nettverk" @@ -1831,9 +1845,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunneller" @@ -1851,15 +1865,15 @@ msgid "Logging" msgstr "Logging" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peers" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statestikk" @@ -1871,8 +1885,8 @@ msgstr "Avansert" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2133,7 +2147,7 @@ msgstr "Omstart umiddelbart" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Omstart" @@ -2604,8 +2618,8 @@ msgid "User Name" msgstr "Brukernavn" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Legg til" @@ -2614,91 +2628,91 @@ msgstr "Legg til" msgid "Password" msgstr "Passord" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Oppdatering tilgjengelig, prøver å laste ned nå" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Oppdatering tilgjengelig, klikk knappen til venstre for å laste ned" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Ingen oppdatering tilgjengelig" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Aldri" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Hver" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Bare meld fra" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Bare last ned og verifiser" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Last ned, kontrollere og ta omstart" @@ -2824,7 +2838,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tid" @@ -2974,12 +2988,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3010,17 +3024,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-post" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "" @@ -3030,17 +3044,17 @@ msgid "Router Console" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Lokal vev-tjener" @@ -3209,97 +3223,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Navn" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Snitt" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Maks" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Utestående" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3317,223 +3331,223 @@ msgid "No log messages" msgstr "" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Lokal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Upublisert" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destinasjon" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Utløper om {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Utløp for {0} siden" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Antall" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Land" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Vår informasjon" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Skjult" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Oppdatert" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} siden" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publisert" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adresse(r)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "kostnad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Skjult eller starter opp" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Gjem nyheter" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Vis nyheter" @@ -3583,19 +3597,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Hastighet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapasitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integrasjon" @@ -3618,7 +3632,7 @@ msgid "Failing" msgstr "Mislyktes" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrert" @@ -3695,71 +3709,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "status" @@ -3887,277 +3901,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P-oppdatering" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4261,26 +4275,26 @@ msgstr "" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Trykk omstart for å installere" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Klikk Slå av og omstart for å installere" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versjon {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Oppdateringer tilgjengelig" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4289,7 +4303,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4298,69 +4312,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" -msgstr "maks" +msgid "avg" +msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "maks" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "" @@ -4537,175 +4567,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 -msgid "IRC proxy" +msgid "shared clients (DSA)" msgstr "" #: ../java/strings/Strings.java:38 -msgid "eepsite" +msgid "IRC proxy" msgstr "" #: ../java/strings/Strings.java:39 -msgid "I2P webserver" +msgid "eepsite" msgstr "" #: ../java/strings/Strings.java:40 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassisk" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Kryptering" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4874,7 +4856,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4915,7 +4897,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4954,27 +4936,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_nl.po b/apps/routerconsole/locale/messages_nl.po index 95a009cfb..3ae1204af 100644 --- a/apps/routerconsole/locale/messages_nl.po +++ b/apps/routerconsole/locale/messages_nl.po @@ -23,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-17 20:55+0000\n" -"Last-Translator: Nathan Follens\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,8 +44,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -54,8 +54,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -64,8 +64,8 @@ msgstr[1] "{0} s" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -74,37 +74,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 uur" msgstr[1] "{0} uren" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "nvt" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 dag" msgstr[1] "{0} dagen" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "nvt" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -147,7 +156,7 @@ msgstr "Naar" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "geen" @@ -286,43 +295,43 @@ msgstr "Tunnels geweigerd: Aan het afsluiten" msgid "Rejecting tunnels" msgstr "Tunnels geweigerd" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeden" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Reseed heeft slechts 1 router opgehaald." msgstr[1] "Reseed heeft slechts {0} routers opgehaald." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed gefaald" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Zie {0} voor hulp." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "reseed configuratie pagina" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseed: opvragen seed URL." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -392,7 +401,7 @@ msgstr "Onbereikbaar op alle transports" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -407,7 +416,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} is alleen gebruikt voor uitgaande connecties" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP is niet ingeschakeld." @@ -430,13 +439,13 @@ msgid "" msgstr "Om deze limieten te overschrijven, voeg dan de instelling i2np.ntcp.maxConnections=nnn en i2np.udp.maxConnections=nnn toe aan de geavanceerde configuratie pagina." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definities" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -451,7 +460,7 @@ msgstr "De remote peer, geïdentificeerd door de router hash" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Richting" @@ -478,13 +487,13 @@ msgstr "Hoe lang sinds een pakket ontvangen / verstuurd is" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Idle" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "In/Uit" @@ -499,14 +508,14 @@ msgstr "Hoe lang sinds deze connectie is gemaakt" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Up" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Afwijking" @@ -555,7 +564,7 @@ msgstr "Huidige maximum verzonden pakket grootte / verwachte maximimum ontvangen #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -565,7 +574,7 @@ msgstr "Het totaal aantal pakketten verzonden aan de peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -574,7 +583,7 @@ msgid "The total number of packets received from the peer" msgstr "Het totaal aantal ontvangen pakketten van de peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -583,7 +592,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Het totaal aantal pakketten dat opnieuw is verzonden aan de peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -622,8 +631,8 @@ msgstr "WAN PPP Verbinding" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Uptime" @@ -718,17 +727,17 @@ msgid "NTCP connections" msgstr "NTCP connecties" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limiet" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Time-out" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -741,126 +750,126 @@ msgid "Backlogged?" msgstr "In achterstand?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Inkomend" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Uitgaand" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} peer" msgstr[1] "{0} peers" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP connecties" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Gesorteerd op peer hash" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Richting/Introductie" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Gesorteerd op idle inkomend" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Gesorteerd op idle uitgaand" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Gesorteerd op inkomende snelheid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Gesorteerd op uitgaande snelheid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Gesorteerd op uptime van de connectie" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Gesorteerd op klok afwijking" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Gesorteerd op congestion window" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Gesorteerd op vertraagde-start drempel" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Gesorteerd op rondgangstijd" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Gesorteerd op herzendings time-out" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Gesorteerd op uitgaande maximum verzend unit" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Gesorteerd op verzonden pakketten" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Gesorteerd op ontvangen pakketten" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Gesorteerd op herzonden pakketten" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Gesorteerd op meerdere keren ontvangen pakketten" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "We hebben aangeboden ze te introduceren" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Zij hebben aangeboden ons te introduceren" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Verstikt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 gefaald" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} gefaald" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Verbannen" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "achterstand" @@ -898,66 +907,66 @@ msgstr "Negeer tunnel aanvragen: Hoge load" msgid "Dropping tunnel requests: Queue time" msgstr "Negeer tunnel aanvragen: Wachttijd" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Nieuwe plugin versie {0} is beschikbaar" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Update check voor plugin {0} gefaald" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Geen nieuwe versie beschikbaar voor plugin {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B ontvangen" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Overdracht gefaald van {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Update gedownload" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Herstarten" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Update geverifieerd" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "van {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Niet-ondertekende update bestand van {0} is corrupt" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Kopie naar {0} gefaald" @@ -970,7 +979,7 @@ msgstr "Kopie naar {0} gefaald" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -984,20 +993,20 @@ msgstr "" msgid "Updating" msgstr "Aan het updaten" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "In-netwerk updates uitgeschakeld. Controleer de pakket manager." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Geen schrijf toestemming voor de I2P installatie map." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Je moet eerst updaten naar versie {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Je hebt Java versie {0} nodig, maar hebt Java versie {1} geïnstalleerd" @@ -1187,16 +1196,20 @@ msgid "No new version found at {0}" msgstr "Geen nieuwe versie gevonden op {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Tijdelijke verbanning verloopt in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Verbanning tot volgende herstart of in {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "Hef verbanning nu op" @@ -1297,18 +1310,18 @@ msgstr "Hef verbanning nu op" msgid "I2P Router Console" msgstr "I2P Router Console" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Fout bij updaten dan de configuratie - kijk in de fout logs" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configuratie succesvol opgeslagen" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1516,7 +1529,7 @@ msgid "Add Client" msgstr "Client Toevoegen" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Client" @@ -1548,9 +1561,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versie" @@ -1572,7 +1585,8 @@ msgstr "Licentie" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Website" @@ -1585,7 +1599,7 @@ msgid "Stop" msgstr "Stop" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Controlleer op updates" @@ -1607,7 +1621,7 @@ msgstr "Verwijder" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1617,7 +1631,7 @@ msgstr "Verwijderd selectie" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1636,7 +1650,7 @@ msgstr "Herstel standaard instellingen" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1765,8 +1779,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Verwijder" @@ -1776,7 +1790,7 @@ msgstr "Selecteer een klasse om toe te voegen" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Bandwidth" @@ -1785,7 +1799,7 @@ msgid "Home Page" msgstr "Home Page" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Netwerk" @@ -1841,9 +1855,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnels" @@ -1861,15 +1875,15 @@ msgid "Logging" msgstr "Logging" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peers" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistieken" @@ -1881,8 +1895,8 @@ msgstr "Geavanceerd" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2143,7 +2157,7 @@ msgstr "Herstart onmiddelijk" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Herstart" @@ -2614,8 +2628,8 @@ msgid "User Name" msgstr "Gebruikersnaam" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Voeg toe" @@ -2624,91 +2638,91 @@ msgstr "Voeg toe" msgid "Password" msgstr "Wachtwoord" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Bijwerken of controle reeds gestart" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Update beschikbaar, probeer nu te downloaden" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Update beschikbaar, klik op de linker knop om te downloaden" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Geen update beschikbaar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Nieuws URL vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "intern" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Proxy host vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Proxy poort vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Ververs snelheid vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nooit" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Update beleid vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Updaten update URLs." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Updaten vertrouwde sleutels." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Niet-ondertekende update URL vernieuwen naar {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Elke" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Alleen melden" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Download en alleen controlleren" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Download, controlleer en herstart" @@ -2834,7 +2848,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Geen \"{0}\" gebeurtenissen gevonden in de vorige {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tijd" @@ -2984,12 +2998,12 @@ msgid "Graph settings saved" msgstr "Grafiek instellingen opgeslagen" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Adresboek" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Beheer je I2P hosts bestand hier (I2P domeinnaam bepaling)" @@ -3020,17 +3034,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P Home Page Configuratie" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonieme webmail client" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Router Hulp" @@ -3040,17 +3054,17 @@ msgid "Router Console" msgstr "Router Console" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Ingebouwde anonieme BitTorrent Client" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Lokale webserver" @@ -3219,97 +3233,97 @@ msgstr "De HTTP proxy is niet ingeschakeld" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Je browser is niet juist geconfigureerd om de HTTP proxy op {0} te gebruiken" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Naam" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "I2P Taak wachtrij" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Taak verwerkers" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Aktieve taken" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "{0} geleden gestart" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Net voltooide taken" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "{0} geleden voltooid" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Gereed/wachtende taken" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Geplande taken" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} start in {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Totale Taak Statistieken" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Taak" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "Geplanned" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Lopen" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Gmd" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Te doen" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Samenvatting" @@ -3327,223 +3341,223 @@ msgid "No log messages" msgstr "Geen log berichten" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Lokale router" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Router Opzoeken" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Alle Routers" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Alle Routers met volledige statistieken" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "niet gevonden in netwerk database" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Lokaal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Niet-gepubliceerd" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Bestemming" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Toevoegen aan lokaal adresboek" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Verloopt in {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Verliep {0} geleden" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Niet geïnitialiseerd" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Netwerk Database Router Statistieken" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Aantal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transports" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Land" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Onze info" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Peer info voor" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Volledige item" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Verborgen" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Geupdate" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} geleden" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Gepubliceerd" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Handtekening sleutel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adres(sen)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "kosten" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Verborgen of aan het opstarten" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU met introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP en SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP en SSU met introducers" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 Only SSU, aanbieders" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, aanbieders" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, aanbieders" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 Only NTCP, SSU, aanbieders" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Nieuws {0} geleden voor het laatste geupdate." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Nieuws {0} geleden voor het laatste gecontrolleerd." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Verberg nieuws" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Toon nieuws" @@ -3593,19 +3607,19 @@ msgid "Groups (Caps)" msgstr "Groupen (Caps)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Snelheid" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capaciteit" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integratie" @@ -3628,7 +3642,7 @@ msgid "Failing" msgstr "Gefaald" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Geïntegreerd" @@ -3705,71 +3719,71 @@ msgstr "1u Fout Rato" msgid "1d Fail Rate" msgstr "1d Four Rato" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Drempelwaarden" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "snelle peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "hoge capaciteits peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr " goed geïntegreerde peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "zoals bepaald door de profiel organisator" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "groepen" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "capaciteiten in de netDb, niet gebruikt om profielen te bepalen" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "caps" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "piek doorvoer (bytes per seconde) over een 1 minuut periode zoals de peer heeft ondervonden in een enkele tunnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "snelheid" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "capaciteit" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "hoeveel tunnels kunnen we ze vragen om zich in een uur bij aan te sluiten?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "hoeveel nieuwe peers hebben ze ons recentelijk over verteld?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integratie" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "is de peer verbannen, of onbereikbaar, of faalt het tunnel tests?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "status" @@ -3897,277 +3911,277 @@ msgstr "Grafiek Aantal Gebeurtenissen" msgid "Lifetime average value" msgstr "Levenslange gemiddelde waarde" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Router Hulp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Hulp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Configureer de opstart van clients en webapps (services); start sluimerende services handmatig" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P Services" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configureer I2P Router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P Intern" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Bekijk bestaande tunnels en tunnel opbouw status" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Toon alle huidige peer connecties" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Toon recente peer prestatie profielen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profielen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Toon lijst met alle bekende I2P routers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Gezondheids Rapport" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Logs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Grafieken router prestatie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Grafieken" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Tekstuele router prestatie statistieken" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Lokale tunnels" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Verborgen diensten-beheerder" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Algemeen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Jouw Local Identity is jouw unieke I2P router identiteit, vergelijkbaar met een IP-adres, maar dan voor I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Laat anderen dit nooit weten, aangezien het je echte IP kan openbaren." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Lokale Identiteit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Je unique I2P router identiteit is" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "vertel dit aan niemand" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "toon" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "De in gebruik zijnde versie van de I2P software" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Hoe lang draaien we al voor deze sessie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Hulp bij het configureren van je firewall en router voor optimale I2P prestatie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Bekijk de wiki voor meer informatie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Waarschuwing: ECDSA is niet beschikbaar. Werk Java of je besturingssysteem bij" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configureer I2P Updates" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P Update" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Peers waarmee wij in de laatste minuten/het laatste uur gecommuniceerd hebben." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Actief" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Het aantal peers beschikbaar voor het bouwen van client tunnels." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Snel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Het aantal peers beschikbaar voor het bouwen van exploratory tunnels." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Grote capaciteit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Het aantal peers beschikbaar voor netwerk database aanvragen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Het totaal aantal peers in onze netwerkdatabase" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Bekend" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configureer router bandbreedte toewijzing" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Bandbreedte in/uit" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Totaal" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Gebruikt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Gebruikt voor het bouwen en testen van tunnels, en om te communiceren met floodfill peers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Onderzoekend" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunnels die we gebruiken om diensten in het netwerk te voorzien of om toegang toe te hebben" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Tunnels waarvan we deel uitmaken door rechtstreeks brandbreedte tot het netwerk te voorzien" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Deelnemend" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "De verhouding van tunnel hops die we leveren en tunnel hops die we gebruiken - een waarde groter dan 1.00 geeft aan dat je positief bijdraagt aan het netwerk" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Share rato" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Wat is er in de taken wachtrij van de router?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Verstopping" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Geeft aan hoe de router presteert" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Taak vertraging" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Geeft aan hoe snel uitgaande berichten naar andere I2P routers verstuurd worden" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Bericht vertraging" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Heen en weer tijd voor een tunnel test" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tunnel vertraging" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Wachtrij van verzoeken van andere routers om deel te nemen in tunnels" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Achterstand" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Nieuws & Updates" @@ -4271,26 +4285,26 @@ msgstr "Tunnels aan het bouwen" msgid "shared clients" msgstr "gedeelde clients" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Klik Herstart om te installeren" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Klik Afsluiten and herstart om te installeren" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versie {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Update beschikbaar" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Download {0} Update" @@ -4299,7 +4313,7 @@ msgstr "Download {0} Update" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4308,69 +4322,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Download Niet-ondertekende
Update {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Hulp met firewall configuratie" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Controleer netwerk connectie en NAT/firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Reseed" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Volgorde" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Bovenaan" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Onder" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Onderaan" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Selecteer een sectie om toe te voegen" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "gebeurtenissen in {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "gemiddeld voor {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Gebeurtenissen per periode" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "gemiddeld" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "nu" @@ -4547,175 +4577,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Open Router Console in web browser bij opstarten" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassiek" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "donker" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "licht" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "middernacht" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "BandwidthLimiter" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "ClientMessages" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Encryption" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "JobQueue" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "NetworkDatabase" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Stream" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Throttle" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "key" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "stel bandbreedte in" @@ -4884,7 +4866,7 @@ msgid "Share" msgstr "Share" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "OPMERKING" @@ -4925,7 +4907,7 @@ msgid "Advanced network configuration page" msgstr " network configuratie pagina" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4964,27 +4946,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Geavanceerde I2P Configuratie" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Voor de toepassing van sommige wijzigingen is een herstart nodig." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Om te veranderen, wijzig het bestand {0}." diff --git a/apps/routerconsole/locale/messages_pt.po b/apps/routerconsole/locale/messages_pt.po index b90db0c5b..578d5d32b 100644 --- a/apps/routerconsole/locale/messages_pt.po +++ b/apps/routerconsole/locale/messages_pt.po @@ -33,8 +33,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n" "MIME-Version: 1.0\n" @@ -54,8 +54,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -64,8 +64,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -74,8 +74,8 @@ msgstr[1] "{0} seg" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -84,37 +84,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 hora" msgstr[1] "{0} horas" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "indisponível" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 dia" msgstr[1] "{0} dias" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "indisponível" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -157,7 +166,7 @@ msgstr "Para" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "nenhum" @@ -296,43 +305,43 @@ msgstr "A rejeitar túneis: A Desligar" msgid "Rejecting tunnels" msgstr "A rejeitar túneis" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Ressemeando: dados obtidos ({0} com sucesso, {1} erros)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Ressemeando" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "A propagação encontrou apenas 1 Roteador." msgstr[1] "A propagação encontrou {0} Roteadores." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "A propagação falhou." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Ver {0} para ajuda." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "página de configuração de propagação" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Propagação: procurar semente de URL" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -402,7 +411,7 @@ msgstr "Inalcançável em qualquer transporte" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Estado" @@ -417,7 +426,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} é usado para conexões de saída apenas" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP não está habilitado" @@ -440,13 +449,13 @@ msgid "" msgstr "Para substituir esses limites, adiciona as definições i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn na página de configuração avançada." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definições" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -461,7 +470,7 @@ msgstr "O Par/Vizinho remoto, identificado pelo hash de roteador" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dir" @@ -488,13 +497,13 @@ msgstr "Quanto tempo desde que o ultimo pacote foi recebido / enviado" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Inativo" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Entrada/Saída" @@ -509,14 +518,14 @@ msgstr "A quanto tempo foi estabelecida esta conexão" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Cima" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Skew" @@ -565,7 +574,7 @@ msgstr "Limite máximo actual de tamanho de pacotes / máximo estimado de tamanh #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -575,7 +584,7 @@ msgstr "O numero total de pacotes enviados pelo par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -584,7 +593,7 @@ msgid "The total number of packets received from the peer" msgstr "O numero total de pacotes recebidos pelo par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -593,7 +602,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "O numero total de pacotes retransmitidos para o par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -632,8 +641,8 @@ msgstr "Conexão PPP na WAN" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Tempo em funcionamento" @@ -728,17 +737,17 @@ msgid "NTCP connections" msgstr "Conexões NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Tempo Limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -751,126 +760,126 @@ msgid "Backlogged?" msgstr "Voltar Logado?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Entrada" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Saída" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} par" msgstr[1] "{0} pares" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Conexões UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Ordenar por tipos de Pares" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Direcção/Introdução" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Ordenar por entrada inactiva" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Ordenar por saída inactiva" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Ordenar por taxa de entrada" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Ordenar por taxa de saída" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Ordenar por tempo de conexão ligada" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Ordenar por desajustamento do relógio" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Ordenar por janela de congestionamento" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Ordenar por limitador de inicio lento " -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Ordenar por tempo de ida e volta" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Ordenar por tempo limite de retransmissão" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Ordenar por unidade de transmissão de saída máxima" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Ordenar por envio de pacotes" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Ordenar por pacotes recebidos" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Ordenar por pacotes retransmitidos" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Ordenar por pacotes recebidos mais que uma vez" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Oferecemos-nos para os apresentar" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Eles oferecem-se para nos apresentar" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Sufocada" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 falha" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} falhas" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Banido" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "backlogged" @@ -908,66 +917,66 @@ msgstr "A rejeitar pedidos de túneis: Carga elevada" msgid "Dropping tunnel requests: Queue time" msgstr "A descartar pedidos de túneis: Tempo de fila" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Nova versão para a extensão {0} está disponível" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Não foi possível verificar por atualizações {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Nenhuma versão nova disponível para extrensão {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} bytes transferidos" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Instalação falhada de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Falha na transferência de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Atualização baixada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Reiniciando" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Atualização verificada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Arquivo de atualização sem assinatura {0} está corrompido" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Cópia para {0} falhou" @@ -980,7 +989,7 @@ msgstr "Cópia para {0} falhou" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -994,20 +1003,20 @@ msgstr "" msgid "Updating" msgstr "Atualizando" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Actualizações na rede desactivadas. Verifique o gestor de pacotes." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Não possui permissões de escrita no directório de instalação do I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Necessita primeiro de actualizar para a versão {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Java na versão {0} é requerido, no entanto a versão {1} é a actualmente instalada" @@ -1197,16 +1206,20 @@ msgid "No new version found at {0}" msgstr "Nenhuma versão nova encontrada em {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Banimento temporário termina em {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Banido até reiniciar ou em {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "desbanir agora" @@ -1307,18 +1320,18 @@ msgstr "desbanir agora" msgid "I2P Router Console" msgstr "Painel do Roteador I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Erro ao atualizar a configuração - consulte os logs de erros" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configuração salva com sucesso" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1526,7 +1539,7 @@ msgid "Add Client" msgstr "Adicionar cliente" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Cliente" @@ -1558,9 +1571,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versão" @@ -1582,7 +1595,8 @@ msgstr "Licença" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Website" @@ -1595,7 +1609,7 @@ msgid "Stop" msgstr "Stop" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Verificar por actualizações " @@ -1617,7 +1631,7 @@ msgstr "Apagar" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1627,7 +1641,7 @@ msgstr "Apagar selecionados" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1646,7 +1660,7 @@ msgstr "Voltar ao padrão" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1775,8 +1789,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Remover" @@ -1786,7 +1800,7 @@ msgstr "Selecione uma classe para adicionar" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Velocidade" @@ -1795,7 +1809,7 @@ msgid "Home Page" msgstr "Página inicial" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Network" @@ -1851,9 +1865,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnels" @@ -1871,15 +1885,15 @@ msgid "Logging" msgstr "Logging" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Pares" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Stats" @@ -1891,8 +1905,8 @@ msgstr "Advanced " #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2153,7 +2167,7 @@ msgstr "reiniciar imediatamente" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "reiniciar" @@ -2624,8 +2638,8 @@ msgid "User Name" msgstr "Nome de usuário" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Adicionar" @@ -2634,91 +2648,91 @@ msgstr "Adicionar" msgid "Password" msgstr "Palavra-passe" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Atualização ou verificação já em andamento" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Atualização disponível, tentando baixar agora" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Atualização disponível, clique no botão à esquerda para baixar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Nenhuma atualização disponível" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Atualizando a URL de notícias para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "interno" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Alterando servidor proxy para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Alterando porta do proxy para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Alterando período de atualização para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nunca" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Alterando política de atualização para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Actualizando actualização de URL ." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Atualizando chaves confiadas." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Alterando URL de atualizações não assinadas para {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Sempre" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Avisar apenas" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Descarregar e verificar apenas" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Descarregar, verificar e reiniciar" @@ -2844,7 +2858,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tempo" @@ -2994,12 +3008,12 @@ msgid "Graph settings saved" msgstr "Configurações de gráfico salvas" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Livro de endereços" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Gerenciar o seu arquivo de hosts I2P aqui (resolução de nomes de domínio I2P)" @@ -3030,17 +3044,17 @@ msgid "I2P Home Page Configuration" msgstr "Configuração da página inicial do I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Cliente do webmail anônimo" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Ajuda do Roteador I2P" @@ -3050,17 +3064,17 @@ msgid "Router Console" msgstr "Painel do Roteador" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Cliente BitTorrent anônimo embutido" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrentes" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Servidor web local" @@ -3229,97 +3243,97 @@ msgstr "O proxy HTTP não está alcançável" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "O navegador não está configurado adequadamente para usar o proxy HTTP em {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nome" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "Lista Tarefas I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Executador de tarefas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Tarefas activas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "iniciado à {0}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Tarefas completadas recentemente" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "finalizado à {0}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Tarefas finalizadas/espera" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Tarefas agendadas" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} será iniciado em {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Estatísticas das tarefas" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Tarefa" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "Em espera" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Em execução" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Média" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Máximo" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Mínimo" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Em espera" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Resumo" @@ -3337,223 +3351,223 @@ msgid "No log messages" msgstr "Sem registro de mensagens" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Roteador Local" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Pesquisa de Roteador" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Todos os roteadores" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Todos os roteadores com status completo" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Roteador" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "não encontrado no banco de dados da rede" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Não publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destino" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Expira em {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Expirado {0} atrás" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Concessão" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Túnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Não iniciado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Estatísticas do roteador I2P" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Contagem" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transportes" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "País" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Nossas informações" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Informações do Par para" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Informação completa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Escondido" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Atualizado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} atrás" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Endereço(s)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "custo" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Invisível ou iniciando" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU com intermediadores" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP e SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP e SSU com intermediadores" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "Apenas IPv6 com introdutores SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "SSU IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "SSU introdutores com IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "NTCP IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "NTCP e SSU com IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "NTCP e SSU introdutores com IPv6" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "Apenas NTCP e SSU introdutores com IPv6" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Notícias atualizadas {0} atrás." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Notícias verificadas {0} atrás." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Esconder notícias" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Mostrar notícias" @@ -3603,19 +3617,19 @@ msgid "Groups (Caps)" msgstr "Grupos (Caps)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Velocidade" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacidade" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integração" @@ -3638,7 +3652,7 @@ msgid "Failing" msgstr "Falhando" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrado" @@ -3715,71 +3729,71 @@ msgstr "1h taxa de falha" msgid "1d Fail Rate" msgstr "1d taxa de falha" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Limiares" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "pares rápidos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "pares com alta capacidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "pares bem integrados" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "como determinado pelo organizador de perfil" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "capacidades do netDb, não usadas para determinar perfil" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "caps" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "pico transferência (bytes/s) por 1 minuto que o par permaneceu em um túnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "velocidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "capacidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "quantos túneis podemos convidar para participar em uma hora?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "quantos novos pares nos foram apresentados recentemente?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integração" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "o Par está banido, ou não alcançável ou com problemas para o teste de túnel?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "estado" @@ -3907,277 +3921,277 @@ msgstr "Contador de Eventos do Gráfico" msgid "Lifetime average value" msgstr "Valor médio total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Ajuda do Roteador I2P & Perguntas Frequentes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Ajuda & Perguntas Freqüentes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Configurar o inicio de clientes e webapps (serviços); iniciar manualmente os serviços parados" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Serviços I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configurar Roteador I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Detalhes I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Ver túneis estabelecidos e estado da construção de túneis" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Mostrar todas conexões atuais com os pares" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Mostrar perfis de performance recentes dos pares" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Perfis" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Mostrar lista de todos os roteadores I2P conhecidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "Banco de dados da rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Relatório de Saúde" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Registros" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Gráfico de performance do roteador" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Gráficos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Estatísticas textuais de performance do roteador" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Geral" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Tua identidade local é a identificação do roteador I2P, parecido com um endereço IP mas para a rede I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Não reveles isso a ninguém, pois isso pode revelar teu endereço IP externo." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Identidade local" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Seu identificador I2P único é" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "nunca mostre-o para alguém" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "mostrar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Versão do I2P sendo usada agora" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Tempo de duração desta sessão" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Ajuda na configuração do seu firewall e roteador para o melhor desempenho I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configurar atualizações I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Atualizações do I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Pares que estivemos conversando nos últimos minutos ou na última hora" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Ativos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Número de pares disponíveis para construir túneis cliente" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Rápidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Número de pares disponíveis para construir túneis exploradores" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Alta capacidade" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "O número de pares disponíveis para as consultas ao banco de dados da rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Número total de pares em nosso banco de dados da rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Conhecidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configurar limites de velocidade" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Velocidade entr/sai" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Usados" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Usado para criar e testar túneis, e comunicar com pares de floodfill" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Exploradores" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Túneis usados para prover ou acessar serviços na rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Túneis com nossa participação, contribuindo diretamente para a transmissão de dados da rede" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Participantes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "A proporção de Saltos de Túnel que oferecemos para Saltos de Túnel que usamos - um valor acima de 1.00 indica uma contribuição positiva para a rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Razão de compartilhamento" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "O quê está na fila de tarefas do roteador?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Congestionamento" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indica o desempenho do roteador" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Atraso tarefa" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indica quão rapidamente mensagens saindo para outros roteadores I2P são enviadas" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Atraso de mensagem" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Tempo de retorno da mensagem para um teste de túnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Atraso túnel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Pedidos enfileirados vindos de outros roteadores para participar em túneis" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Backlog" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Notícias & Atualizações" @@ -4281,26 +4295,26 @@ msgstr "Construindo túneis" msgid "shared clients" msgstr "clientes compartilhados" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Clique Reiniciar para instalar" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Clique Desligar e reiniciar para instalar" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versão {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Actualização disponível." #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Download {0} Atualização" @@ -4309,7 +4323,7 @@ msgstr "Download {0} Atualização" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4318,69 +4332,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Download Atualização
Não assinada {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Ajuda com a configuração do firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Verificar as conexões de rede e o firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Ressemear" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Ordem" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Topo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Baixo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Baixo" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Selecione uma seção a ser adicionada" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "eventos em {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "média para {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Eventos por período" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "média" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "máximo" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "agora" @@ -4557,175 +4587,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Abrir Painel do Roteador na janela do navegador ao iniciar" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "Proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "Webserver I2P" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "clássico" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "escuro" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "iluminado" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "meia-noite" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Limitador de velocidade" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "ClientMessages" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Criptografia" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Túnel I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "JobQueue" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "NetworkDatabase" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Fluxo" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Limite" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transporte" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "chave" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "porta" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "configurar banda larga" @@ -4894,7 +4876,7 @@ msgid "Share" msgstr "Compartilhar" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTA" @@ -4935,7 +4917,7 @@ msgid "Advanced network configuration page" msgstr "Configuração avançada de rede" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4974,27 +4956,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configuração Avançada do I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Algumas alterações podem precisar de um reinício para fazerem efeito." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_pt_BR.po b/apps/routerconsole/locale/messages_pt_BR.po index 538d2fd21..2e17539c7 100644 --- a/apps/routerconsole/locale/messages_pt_BR.po +++ b/apps/routerconsole/locale/messages_pt_BR.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-20 21:47+0000\n" -"Last-Translator: Guteemebrg Nunes \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,8 +34,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -44,18 +44,18 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" -msgstr[0] "{0} seg" +msgstr[0] "1 seg" msgstr[1] "{0} seg" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -64,37 +64,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0} horas" msgstr[1] "{0} horas" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0} dias" msgstr[1] "{0} dias" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -137,7 +146,7 @@ msgstr "Para" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "nenhum" @@ -276,43 +285,43 @@ msgstr "Rejeitando túneis: desligando" msgid "Rejecting tunnels" msgstr "Rejeitando túneis" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reenviando" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "" msgstr[1] "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reenvio falhou." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Ver {0} para obter ajuda." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -382,7 +391,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "" @@ -397,7 +406,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} é usado somente por conexões de saída" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "" @@ -420,13 +429,13 @@ msgid "" msgstr "Para sobrescrever estes limites, adicione as espeficações i2np.ntcp.maxConnections=nnn e i2np.udp.maxConnections=nnn na página de configurações avançadas." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definições" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -441,7 +450,7 @@ msgstr "Par remoto, identificado pela hash do roteador" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dir" @@ -468,13 +477,13 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Ocioso" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Entrada/Saída" @@ -489,14 +498,14 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Acima" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Defasagem" @@ -545,7 +554,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -555,7 +564,7 @@ msgstr "Número total de pacotes enviados ao par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -564,7 +573,7 @@ msgid "The total number of packets received from the peer" msgstr "O número total de pacotes recebidos do par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -573,7 +582,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "O número total de pacotes retransmitidos ao par" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -612,8 +621,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Ligado a" @@ -708,17 +717,17 @@ msgid "NTCP connections" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Tempo limite" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -731,126 +740,126 @@ msgid "Backlogged?" msgstr "" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Entrante" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Saída" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} nó" msgstr[1] "{0} pares" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Ordenar pela hash do par" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Direção/Introdução" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Ofereceram-se para nos introduzir" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Obstruído" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 falha" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} falhas" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Banido" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -888,66 +897,66 @@ msgstr "" msgid "Dropping tunnel requests: Queue time" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Um nova versão da extensão {0} está disponível" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Não há nenhuma nova versão da extensão {0} disponível" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B transferidos" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Atualização baixada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Reinicializando" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Atualização verificada" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "de {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "A cópia para {0} falhou" @@ -960,7 +969,7 @@ msgstr "A cópia para {0} falhou" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -974,20 +983,20 @@ msgstr "" msgid "Updating" msgstr "Atualizando" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1177,16 +1186,20 @@ msgid "No new version found at {0}" msgstr "Nenhuma nova versão de {0} foi encontrada" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1287,18 +1300,18 @@ msgstr "" msgid "I2P Router Console" msgstr "Painel do roteador I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configuração salva com sucesso" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1506,7 +1519,7 @@ msgid "Add Client" msgstr "Adicionar cliente" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Cliente" @@ -1538,9 +1551,9 @@ msgid "Plugin" msgstr "Extensão" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versão" @@ -1562,7 +1575,8 @@ msgstr "Licença" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Website" @@ -1575,7 +1589,7 @@ msgid "Stop" msgstr "Parar" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Verificar se há atualizações" @@ -1597,7 +1611,7 @@ msgstr "Deletar" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1607,7 +1621,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1626,7 +1640,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1755,8 +1769,8 @@ msgstr "AVISO" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Remover" @@ -1766,7 +1780,7 @@ msgstr "Selecione uma classe para adicionar" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Largura de banda" @@ -1775,7 +1789,7 @@ msgid "Home Page" msgstr "Página Inicial" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Rede" @@ -1831,9 +1845,9 @@ msgid "UI" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Túneis" @@ -1851,15 +1865,15 @@ msgid "Logging" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Pares" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Estatísticas" @@ -1871,8 +1885,8 @@ msgstr "Avançado" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2133,7 +2147,7 @@ msgstr "Reinicializar imediatamente" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Reiniciar" @@ -2604,8 +2618,8 @@ msgid "User Name" msgstr "Nome de Usuário" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Adicionar" @@ -2614,91 +2628,91 @@ msgstr "Adicionar" msgid "Password" msgstr "Senha" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Atualização disponível, tentando baixar agora" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Atualização disponível, clique no botão a esquerda para baixar" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Nenhuma atualização disponível" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nunca" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Sempre" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Informar apenas" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Baixar e verificar apenas" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Baixar, verificar e reinicializar" @@ -2824,7 +2838,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tempo" @@ -2974,12 +2988,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Livro de endereços" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3010,17 +3024,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Cliente de webmail anônimo" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Ajuda do roteador I2P" @@ -3030,17 +3044,17 @@ msgid "Router Console" msgstr "Painel do roteador" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrentes" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3209,97 +3223,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nome" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Processos ativos" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "iniciado {0} atrás" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "finalizado {0} atrás" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Média" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Máx" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Pendente" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Índice" @@ -3317,223 +3331,223 @@ msgid "No log messages" msgstr "Nenhuma mensagem de registro" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Todos Roteadores" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Roteador" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "não encontrado no banco de dados da rede" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Não publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destino" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Expira em {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Expirou a {0} atrás" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Túnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Não inicializado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Contagem" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Trasportes" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "País" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Informação nossa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Entrada completa" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Oculto" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Atualizado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} atrás" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publicado" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Endereço(s)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "custo" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Oculto ou inicializando" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP e SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Ocultar notícias" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Mostrar notícias" @@ -3583,19 +3597,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Velocidade" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacidade" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integração" @@ -3618,7 +3632,7 @@ msgid "Failing" msgstr "Falhando" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrado" @@ -3695,71 +3709,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "pares rápidos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "pares de alta capacidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "pares bem integrados" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupos" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "velocidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "capacidade" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "status" @@ -3887,277 +3901,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Ajuda & Perguntas Frequentes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Serviços I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configurar o roteador I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Perfis" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Mostrar uma lista com todos os roteadores I2P conhecidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Registros" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Túneis Locais" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Informações gerais" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Identidade local" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "O identificador, único, do seu roteador I2P é" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "nunca revele-o para alguém" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "mostrar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Aviso: ECDSA não disponível. Atualize seu Java ou SO" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Ativos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Rápidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Com alta capacidade" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "O número total de pares em nosso banco de dados da rede" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Conhecidos" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Largura de banda: Entrada/Saída" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Usados" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Exploratórios" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Participantes" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Taxa de compartilhamento" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "O que está na fila de tarefas do roteador?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Congestionamento" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Notícias & Atualizações" @@ -4261,26 +4275,26 @@ msgstr "" msgid "shared clients" msgstr "clientes compartilhados" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versão {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Atualização disponível" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4289,7 +4303,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4298,69 +4312,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Ajuda com a configuração do Firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Reenvio" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "eventos em {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Eventos por período" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "média" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "máx" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "agora" @@ -4537,175 +4567,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "Proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "Proxy HTTP" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "proxyIrc" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "clássico" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "escuro" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "luminoso" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "meia-noite" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Criptografia" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Túnel I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transporte" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "chave" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "porta" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "configuração de banda" @@ -4874,7 +4856,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4915,7 +4897,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4954,27 +4936,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" -msgstr "Automático" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "Automático" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Desativar" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configuração avançada da I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_ro.po b/apps/routerconsole/locale/messages_ro.po index c4a6f2389..785559c3b 100644 --- a/apps/routerconsole/locale/messages_ro.po +++ b/apps/routerconsole/locale/messages_ro.po @@ -7,15 +7,17 @@ # CimpianAlin , 2013 # CimpianAlin , 2013 # Predator , 2013 +# Di N., 2015 # Petre Catalin Alexandru , 2014 # Predator , 2013 +# titus , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-19 20:06+0000\n" +"Last-Translator: titus \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,8 +36,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -45,8 +47,8 @@ msgstr[2] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -56,8 +58,8 @@ msgstr[2] "{0} sec" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -67,8 +69,8 @@ msgstr[2] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -76,15 +78,9 @@ msgstr[0] "1 hour" msgstr[1] "{0} hours" msgstr[2] "{0} hours" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -92,7 +88,23 @@ msgstr[0] "1 zi" msgstr[1] "{0} zile" msgstr[2] "{0} zile" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" @@ -100,7 +112,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -144,7 +156,7 @@ msgstr "Pentru" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "nici unul" @@ -157,40 +169,40 @@ msgstr "OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:312 msgid "IPv4: OK; IPv6: Testing" -msgstr "" +msgstr "IPv4: OK; IPv6: În curs de testare" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:313 msgid "IPv4: OK; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: OK; IPv6: Firewall" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:314 msgid "IPv4: Testing; IPv6: OK" -msgstr "" +msgstr "IPv4: În curs de testare; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:315 msgid "IPv4: Firewalled; IPv6: OK" -msgstr "" +msgstr "IPv4: Firewall; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:316 msgid "IPv4: Disabled; IPv6: OK" -msgstr "" +msgstr "IPv4: Dezactivat; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: NAT simetric; IPv6: OK" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 msgid "Symmetric NAT" -msgstr "" +msgstr "NAT simetric" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:320 msgid "IPv4: Symmetric NAT; IPv6: Testing" -msgstr "" +msgstr "IPv4: NAT simetric; IPv6: În curs de testare" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 msgid "IPv4: Firewalled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Firewall; IPv6: În curs de testare" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:323 @@ -200,23 +212,23 @@ msgstr "Firewall" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:324 msgid "IPv4: Testing; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: În curs de testare; IPv6: Firewall" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:325 msgid "IPv4: Disabled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Dezactivat; IPv6: În curs de testare" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:326 msgid "IPv4: Disabled; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Dezactivat; IPv6: Firewall" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:327 msgid "Disconnected" -msgstr "" +msgstr "Deconectat" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:328 msgid "Port Conflict" -msgstr "" +msgstr "Conflict Port" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:329 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 @@ -283,17 +295,17 @@ msgstr "Respingere tuneluri: Oprire" msgid "Rejecting tunnels" msgstr "Refuza tuneluri" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "" +msgstr "Reseeding: preluare informații din router de la fișierul ({0} reuşit, {1} erori)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseeding" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -301,26 +313,26 @@ msgstr[0] "Însământarea a adus doar 1 router." msgstr[1] "Însământarea a preluat doar {0} routere." msgstr[2] "Reseed a preluat doar {0} routere." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed a eșuat." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Vezi {0} pentru ajutor." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "Pagina de configurare pentru reseed" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseeding: preluare a URL-ului de seed." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -356,11 +368,11 @@ msgstr "Colegii rapizi cunoscute" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:41 msgid "Known integrated (floodfill) peers" -msgstr "" +msgstr "Colegi integrați cunoscuți (floodfill)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" -msgstr "" +msgstr "Dimensiune log de tunnel acceptor nesoluționate " #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:502 msgid "NetDb entry" @@ -374,11 +386,11 @@ msgstr "Nici un transport (ascunse sau în pornire?)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 msgid "Unsupported signature type" -msgstr "" +msgstr "Tip semnătură nesuportat" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:618 msgid "No support for our signature type" -msgstr "" +msgstr "Nu există suport pentru tipul nostru de semnătură" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622 msgid "Unreachable on any transport" @@ -390,7 +402,7 @@ msgstr "Inaccesibil pe orice transport" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Stare" @@ -405,7 +417,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} conexiuni de ieșire sunt folosite" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP nu este activat" @@ -428,13 +440,13 @@ msgid "" msgstr "Pentru a trece peste aceste limite, se adaugă i2np.tcp.maxConnections setările = nnn n i2np.udp.maxConnections = nnn pe pagina de configurare avansată." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definiții" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -449,7 +461,7 @@ msgstr "Peer de la distanța, identificat de hash router" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dir" @@ -476,13 +488,13 @@ msgstr "Cât de mult timp a trecut de când un pachet a fost primit / trimis" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Inactiv" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "In/Out" @@ -497,14 +509,14 @@ msgstr "Acum cât de mult timp în urmă a fost stabilită acestă conexiune" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "În sus" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Oblic" @@ -553,7 +565,7 @@ msgstr "Curent maxim trimite dimensiunea pachetului / maxima estimată pentru pr #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -563,7 +575,7 @@ msgstr "Numărul total de pachete trimise la peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -572,7 +584,7 @@ msgid "The total number of packets received from the peer" msgstr "Numărul total de pachete primite de la peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -581,7 +593,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Numărul total de pachete retransmise la peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -620,8 +632,8 @@ msgstr "Conexiune WAN PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Disponibilitate" @@ -660,7 +672,7 @@ msgstr "Stare UPnP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668 msgid "Disabled UPnP Devices" -msgstr "" +msgstr "Dispozitive UPnP dezactivate" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682 msgid "" @@ -716,17 +728,17 @@ msgid "NTCP connections" msgstr "Conexiune NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limită" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -739,19 +751,19 @@ msgid "Backlogged?" msgstr "Conectat înapoi?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "De intrare" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "De ieșire" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -759,107 +771,107 @@ msgstr[0] "{0} utilizator" msgstr[1] "{0} utilizatori" msgstr[2] "{0} utilizatori" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Conexiuni UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sortat după hash-ul peer-ului" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Direcție / Introducere" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sortează după intrare inactivă" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sortează după ieșire inactivă" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sortează după rata de intrare" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sortează după rata de de ieșire" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sortează după timpul de conectare" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sortează după fus orar" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sorteaza dupa fereastra de congestie" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sortează dupa pragul de start lent" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sortează după timpul dus-intors" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sortează după timpul de retransmisie" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sortează după unitățiile maxime de ieșire transmise" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sortează după pachetele trimise" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sortează după pachetele primite" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sortează după pachetele retransmise" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sortează după pachetele primite mai mult decât o dată" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Ne oferim să îi introducem" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Ei sau oferit să ne introducă" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Asfixiat" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 eșuare" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} eșuări" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Banat" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "restante" @@ -869,7 +881,7 @@ msgstr "Arunc cererile tunelului: Prea lent" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:260 msgid "Dropping tunnel requests: High job lag" -msgstr "" +msgstr "Arunc cererile de tunel: Decalaj job-uri ridicat" #. don't even bother, since we are so overloaded locally #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:451 @@ -878,7 +890,7 @@ msgstr "Arunc cererile tunelului: Supraîncărcat" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "" +msgstr "Respingere tuneluri: Mod ascuns" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" @@ -897,66 +909,66 @@ msgstr "Arunc cererile de tunel: Încărcătura mare" msgid "Dropping tunnel requests: Queue time" msgstr "Arunc cererile de tunel: Timp așteptare" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Noua versiune plug-in {0} este disponibil" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Verificarea actualizarii a eșuat pentru plug-inul {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Nici un versiune nouă este disponibilă pentru plugin-ul {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} B transferat" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" -msgstr "" +msgstr "Instalare eșuată din {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Transferul nu a reușit din {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Actualizare descarcata" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "restartare" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Actualizari verificate" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "din {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Fișierul de actualizare nesemnat din {0} este corupt" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Copierea a eșuat {0}" @@ -969,10 +981,10 @@ msgstr "Copierea a eșuat {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" -msgstr "" +msgstr "Tunelul proxy client HTTP trebuie să ruleze" #. set status before thread to ensure UI feedback #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91 @@ -983,20 +995,20 @@ msgstr "" msgid "Updating" msgstr "Actualizare" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." -msgstr "" +msgstr "Actualizările din rețea sunt dezactivate. Verifică managerul de pachete." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." -msgstr "" +msgstr "Nu există permisiune de scriere pentru directorul de instalare I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Trebuie intai sa actualizati la versiunea {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Necesita versiunea Java {0} dar vrersiunea Java instalata este {1}" @@ -1060,7 +1072,7 @@ msgstr "Verificarea semnăturii plugin-ului {0} a esuat" #. don't display signer, we're really checking the key not the signer name #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:280 msgid "Plugin not installed - signer is untrusted" -msgstr "" +msgstr "Plugin-ul nu a fost instalat - semnatarul nu este de încredere" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:345 #, java-format @@ -1186,16 +1198,20 @@ msgid "No new version found at {0}" msgstr "Nu s-a găsit versiune noua {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Interzis permanent" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Interzicerea temporară expiră în {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Banat până la repornire sau în {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "unban acum" @@ -1296,18 +1312,18 @@ msgstr "unban acum" msgid "I2P Router Console" msgstr "Consola de Router I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Eroare la actualizarea de configurare - vă rugăm să consultați jurnalele de eroare" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Configurație salvată cu succes" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1346,7 +1362,7 @@ msgstr "Instalează plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "" +msgstr "Instalează Plugin din FIşier" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 @@ -1377,7 +1393,7 @@ msgstr "Plugin oprit {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:180 #, java-format msgid "Stopped webapp {0}" -msgstr "" +msgstr "Webapp oprit {0}" #. label (IE) #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:209 @@ -1446,11 +1462,11 @@ msgstr "Nici un URL pentru plugin specificat." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" -msgstr "" +msgstr "Trebuie să introduceți un fişier" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "Instalarea din fișier a eşuat" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format @@ -1469,7 +1485,7 @@ msgstr "Actualizarea tuturor plugin-uri" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:528 #, java-format msgid "Installing plugin from {0}" -msgstr "" +msgstr "Se instalează plugin de la {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:549 #, java-format @@ -1515,7 +1531,7 @@ msgid "Add Client" msgstr "Adaugă client" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Client" @@ -1547,9 +1563,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Versiune" @@ -1571,7 +1587,8 @@ msgstr "Licență" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Website" @@ -1584,7 +1601,7 @@ msgid "Stop" msgstr "Stop" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Verificați după actualizări" @@ -1606,7 +1623,7 @@ msgstr "Șterge" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1616,7 +1633,7 @@ msgstr "Șterge pe cel ales" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1635,7 +1652,7 @@ msgstr "Restabileşte implicitele" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1764,8 +1781,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Elimina" @@ -1775,7 +1792,7 @@ msgstr "Selectați o categorie pentru a adăuga" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Lățime de bandă" @@ -1784,7 +1801,7 @@ msgid "Home Page" msgstr "Pagina de pornire" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Rețeaua" @@ -1840,9 +1857,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tuneluri" @@ -1860,15 +1877,15 @@ msgid "Logging" msgstr "Logare" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peers" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistici" @@ -1880,8 +1897,8 @@ msgstr "Avansat" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -1965,11 +1982,11 @@ msgstr "Dezactivează modul pentru laptop" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359 msgid "Disabling inbound IPv4" -msgstr "" +msgstr "Dezactivare intrare IPv4" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 msgid "Enabling inbound IPv4" -msgstr "" +msgstr "Activare intrare IPv4" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369 msgid "Disabling UDP" @@ -2082,37 +2099,37 @@ msgstr "Pornește procesul de reseed" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:32 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491 msgid "Reseed from URL" -msgstr "" +msgstr "Reseed de la URL" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:37 msgid "You must enter a URL" -msgstr "" +msgstr "Trebuie să introduceți un URL" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:66 msgid "Reseed in progress, check summary bar for status" -msgstr "" +msgstr "Reseed în derulare, verifică bara de sumar pentru stadiu" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:68 msgid "Reseed complete, check summary bar for status" -msgstr "" +msgstr "Reseed finalizat, verifică bara de sumar pentru stadiu" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503 msgid "Reseed from file" -msgstr "" +msgstr "Reseed de la fişier" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91 msgid "Reseed from file failed" -msgstr "" +msgstr "Reseed de la fișier eşuat" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86 #, java-format msgid "Reseed successful, loaded {0} router info from file" msgid_plural "Reseed successful, loaded {0} router infos from file" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Reseed încheiat cu succes, s-a încărcat {0} informație router din fișier " +msgstr[1] "Reseed încheiat cu succes, s-au încărcat {0} informații router din fișier " +msgstr[2] "Reseed încheiat cu succes, s-au încărcat {0} informații router din fișier " #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:149 msgid "Configuration saved successfully." @@ -2143,7 +2160,7 @@ msgstr "Reporniți imediat" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Reporniți" @@ -2169,9 +2186,9 @@ msgstr "Oprire in {0}" #, java-format msgid "Please wait for routing commitment to expire for {0} tunnel" msgid_plural "Please wait for routing commitments to expire for {0} tunnels" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Așteaptă ca toate angajamentele de rutare să expire pentru {0} tunel" +msgstr[1] "Așteaptă ca toate angajamentele de rutare să expire pentru {0} tuneluri" +msgstr[2] "Așteaptă ca toate angajamentele de rutare să expire pentru {0} tuneluri" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82 #, java-format @@ -2310,7 +2327,7 @@ msgstr "Statistici complete dezactivata" msgid "" "Graph list updated, may take up to 60s to be reflected on the {0}Graphs " "Page{1}" -msgstr "" +msgstr "Listă grafic actualizată, poate dura până la 60 secunde să se reflecte pe {0}Pagina Graficelor{1}" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:24 msgid "Save order" @@ -2553,11 +2570,11 @@ msgstr "Italiană" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:88 msgid "Japanese" -msgstr "" +msgstr "Japoneză" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Malagasy" -msgstr "" +msgstr "Malgaşă" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:90 msgid "Dutch" @@ -2565,7 +2582,7 @@ msgstr "Olandeză" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:91 msgid "Norwegian Bokmaal" -msgstr "" +msgstr "Norvegiană Bokmål" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:92 msgid "Polish" @@ -2586,7 +2603,7 @@ msgstr "Rusă" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Slovak" -msgstr "" +msgstr "Slovacă" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Swedish" @@ -2617,8 +2634,8 @@ msgid "User Name" msgstr "Nume utilizator" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Adaugă" @@ -2627,209 +2644,209 @@ msgstr "Adaugă" msgid "Password" msgstr "Parolă" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Actualizarea sau verificarea deja în curs de desfășurare" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Actualizare disponibilă, încercarea de a descărca acum" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Actualizare disponibilă, faceți clic pentru a descărca" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Nicio actualizare disponibilă" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Actualizarea URL-ul de noutăți la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "Intern" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Actualizarea proxy la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Actualizarea portului proxy la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Actualizarea frecventei reinnoirii la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Niciodată" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Actualizarea reinnoirii politicii la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Actualizarea URL-uri de actualizare." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Actualizarea cheiei de încredere." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Actualizarea politicii de actualizare la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" -msgstr "" +msgstr "Se actualizează URL-urile de build-uri de dezvoltare semnate la {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Fiecare" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Numai anuntare" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Descarcă și verifică numai" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Descărca, verifică, și repornește" #: ../java/src/net/i2p/router/web/EventLogHelper.java:34 msgid "Aborted startup" -msgstr "" +msgstr "Pornire abandonată" #: ../java/src/net/i2p/router/web/EventLogHelper.java:35 msgid "Enabled floodfill" -msgstr "" +msgstr "Floodfill activat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:36 msgid "Changed IP" -msgstr "" +msgstr "IP schimbat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:37 msgid "Changed port" -msgstr "" +msgstr "Port schimbat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:38 msgid "Clock shifted" -msgstr "" +msgstr "Ora modificată" #: ../java/src/net/i2p/router/web/EventLogHelper.java:39 msgid "Crashed" -msgstr "" +msgstr "Prăbuşit" #: ../java/src/net/i2p/router/web/EventLogHelper.java:40 msgid "Critical error" -msgstr "" +msgstr "Eroare critică" #: ../java/src/net/i2p/router/web/EventLogHelper.java:41 msgid "Installed new version" -msgstr "" +msgstr "Versiunea nouă instalată" #: ../java/src/net/i2p/router/web/EventLogHelper.java:42 msgid "Install failed" -msgstr "" +msgstr "Instalare eşuată" #: ../java/src/net/i2p/router/web/EventLogHelper.java:43 msgid "Network error" -msgstr "" +msgstr "Eroare reţea" #: ../java/src/net/i2p/router/web/EventLogHelper.java:44 #: ../java/src/net/i2p/router/web/EventLogHelper.java:48 msgid "New router identity" -msgstr "" +msgstr "Nouă identitate router" #: ../java/src/net/i2p/router/web/EventLogHelper.java:45 msgid "Disabled floodfill" -msgstr "" +msgstr "Floodfill dezactivat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:46 msgid "Out of memory error" -msgstr "" +msgstr "Eroare memorie epuizată" #: ../java/src/net/i2p/router/web/EventLogHelper.java:47 msgid "Reachability change" -msgstr "" +msgstr "Schimbare accesibilitate" #: ../java/src/net/i2p/router/web/EventLogHelper.java:49 msgid "Reseeded router" -msgstr "" +msgstr "Router reseed" #: ../java/src/net/i2p/router/web/EventLogHelper.java:50 msgid "Soft restart" -msgstr "" +msgstr "Repornire soft" #: ../java/src/net/i2p/router/web/EventLogHelper.java:51 msgid "Started router" -msgstr "" +msgstr "Router pornit" #: ../java/src/net/i2p/router/web/EventLogHelper.java:52 msgid "Stopped router" -msgstr "" +msgstr "Router oprit" #: ../java/src/net/i2p/router/web/EventLogHelper.java:53 msgid "Updated router" -msgstr "" +msgstr "Router actualizat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:54 msgid "Watchdog warning" -msgstr "" +msgstr "Avertisment program watchdog" #: ../java/src/net/i2p/router/web/EventLogHelper.java:102 msgid "Display Events" -msgstr "" +msgstr "Afișează Evenimente" #: ../java/src/net/i2p/router/web/EventLogHelper.java:106 msgid "Events since" -msgstr "" +msgstr "Evenimente din" #: ../java/src/net/i2p/router/web/EventLogHelper.java:111 msgid "Event type" -msgstr "" +msgstr "Tip eveniment" #: ../java/src/net/i2p/router/web/EventLogHelper.java:117 #: ../java/src/net/i2p/router/web/EventLogHelper.java:148 msgid "All events" -msgstr "" +msgstr "Toate evenimentele" #: ../java/src/net/i2p/router/web/EventLogHelper.java:122 msgid "Filter events" -msgstr "" +msgstr "Evenimente filtru" #: ../java/src/net/i2p/router/web/EventLogHelper.java:170 msgid "No events found" -msgstr "" +msgstr "Niciun eveniment găsit" #: ../java/src/net/i2p/router/web/EventLogHelper.java:171 #, java-format msgid "No events found in previous {0}" -msgstr "" +msgstr "Niciun eveniment găsit în {0} anterior" #: ../java/src/net/i2p/router/web/EventLogHelper.java:174 #, java-format msgid "No \"{0}\" events found" -msgstr "" +msgstr "Niciun eveniment \"{0}\" găsit" #: ../java/src/net/i2p/router/web/EventLogHelper.java:175 #, java-format @@ -2837,17 +2854,17 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Timp" #: ../java/src/net/i2p/router/web/EventLogHelper.java:182 msgid "Event" -msgstr "" +msgstr "Eveniment" #: ../java/src/net/i2p/router/web/EventLogHelper.java:184 msgid "Details" -msgstr "" +msgstr "Detalii" #: ../java/src/net/i2p/router/web/FormHandler.java:251 msgid "" @@ -2987,12 +3004,12 @@ msgid "Graph settings saved" msgstr "Setări grafice salvate" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Agendă" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Gestionați fisierul I2P hosts aici (I2P DNS) " @@ -3023,17 +3040,17 @@ msgid "I2P Home Page Configuration" msgstr "Configurarea paginii de pornire I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Client webmail anonim" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P router ajutor " @@ -3043,23 +3060,23 @@ msgid "Router Console" msgstr "consola router" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Construiti clientul BitTorrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torente" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Server web local" #: ../java/src/net/i2p/router/web/HomeHelper.java:41 msgid "The Anoncoin project" -msgstr "" +msgstr "Proiectul Anoncoin" #: ../java/src/net/i2p/router/web/HomeHelper.java:42 msgid "Bug Reports" @@ -3120,7 +3137,7 @@ msgstr "Git hosting anonim " #: ../java/src/net/i2p/router/web/HomeHelper.java:50 msgid "HiddenGate" -msgstr "" +msgstr "HiddenGate" #: ../java/src/net/i2p/router/web/HomeHelper.java:51 msgid "Microblog" @@ -3222,97 +3239,97 @@ msgstr "Proxy HTTP nu este pornit" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Browser-ul dvs. nu este corect configurat să utilizeze proxy HTTP la {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nume" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Joburi active" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "inceput {0} in urma" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Functie tocmai terminata" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "terminat {0} in urma" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" -msgstr "" +msgstr "Sarcini programate" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} va incepe in {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" -msgstr "" +msgstr "Sarcină" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" -msgstr "" +msgstr "În coadă" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" -msgstr "" +msgstr "Aruncat" + +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "medie" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "In asteptare" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Sumar" @@ -3330,223 +3347,223 @@ msgid "No log messages" msgstr "Fără mesaje de jurnalizare" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Router local " #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Router Lookup" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Toate routere" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Toate routerele cu statisticile complete" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSets" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "nu a fost găsit în rețeaua bazei de date" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Local" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Nepublicat" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destinație" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Expiră in {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Expirat în urmă cu {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Nu este inițializat" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Statisticile Router-ului in rețeaua bazei de date" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Număra" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transporturi" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Regiune" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Informațiile noastre" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Informațile despre peer" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Intrare completă" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Ascuns" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Actualizat" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} în urmă" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publicat" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" -msgstr "" +msgstr "Cheie de semnare " -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adresă(se)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "cost" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Ascuns sau pentru pornire" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU cu introducere" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP si SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" -msgstr "" +msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" -msgstr "" +msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" -msgstr "" +msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Ultima actualizarea noutății a fost {0} în urmă." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Ultima verificarea noutății a fost {0} în urmă." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Ascunde noutati" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Afișează noutati" @@ -3600,19 +3617,19 @@ msgid "Groups (Caps)" msgstr "Grupuri (Caps)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Viteză" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Capacitate" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integrare " @@ -3635,7 +3652,7 @@ msgid "Failing" msgstr "Eșuat" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrat" @@ -3712,71 +3729,71 @@ msgstr "1 ora rata nereușita " msgid "1d Fail Rate" msgstr "1 ora rata nereușita" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Limite" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "Utilizatori rapizi" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "colegii de mare capacitate" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "colegii bine integrați" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "determinat de organizator profil" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupuri" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "capacitățile în netDb nu sunt utilizate pentru a determinarea profilurilor" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "majuscule" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "transfer de vârf (bytes pe secundă), pe o perioada de la 1 minut pe care utilizatorul a susținut într-un singur tunel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "Viteză" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "Capacitate" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "cât de multe tunele le putem întreba să se alăture într-o oră?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "Citi utilizatori au povestit despre noi in ultima vreme ?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integrare" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "este oare peer interzis, sau inaccesibil, sau a esuat teste tunelului?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "stare" @@ -3906,277 +3923,277 @@ msgstr "Numar de evenimente grafic" msgid "Lifetime average value" msgstr "Valoarea medie pe durata de pornire" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P router-ajutor &FAQ " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Ajutor & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Configurarea pornirii clienților și aplicațiilor web (servicii); porniti manual servicii latente" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Servicii I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Configurarea I2P Router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P Internals" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Vezi tuneluri existente și statutul construirii tunelului " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Arată toate conexiunile actuale ale utilizatorilor " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Afișare profilului de performanță recent" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiluri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Afișează lista tuturor router-urilor I2P cunoscute" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Health Raport" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Înregistrări" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Grafic performantei router-ului " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Grafice" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Statisticile textuale de performanță router-ului" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" -msgstr "" +msgstr "Administrator servicii ascunse" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "General" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Identitatea locală este identitatea dvs. unica router I2P, similar cu o adresă IP, dar adaptate la I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Nu dezvălui acest lucru pentru oricine, așa cum se poate descoperi IP real." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "identitatea locală" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Identitatea unică a router-ului I2P este" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "nu-l descoperi nimănui" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "Afișează" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Versiunea programului I2p pe care o rulam" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Cât timp am fost porniți pentru această sesiune" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Ajutor cu configurarea firewall-ul și router-ul pentru performanțe optime I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" -msgstr "" +msgstr "Vedeți mai multe informații pe wiki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Configurarea Actualizări I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Actualizare I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Utilizatorii ce au convorbit în ultimele câteva minute / ultima ora" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Activ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Numărul de colegii disponibile pentru construirea de tuneluri client" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Rapid" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Numărul de colegii disponibile pentru construirea de tuneluri de explorare" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "De mare capacitate" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Numărul de utilizatori disponibili pentru anchete de baze de date din rețea" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Numărul total de utilizatori în baza de date rețea" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Cunoscute" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Configurarea alocării benzii de router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Lățime de bandă în / out" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Total" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Utilizat" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Utilizate pentru construirea și testarea tuneluri, și de a comunica cu colegii floodfill" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Explorare" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tuneluri pe care le folosim pentru a furniza sau accesa la serviciile din rețea" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Participare" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Raportul tunelului hamei oferite la tunele hamei folosite - o valoare mai mare de 1.00 indică o contribuție pozitivă la rețea" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Rată partajare:" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "congestie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indicare performantei router-ului" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indică cât de repede se trimit mesaje de ieșire la alte routere I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "întârziere mesajului" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Timpul dus-intors pentru un test de tunel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Intirziere tunelului" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Cereri din coada de așteptare din alte routere pentru a participa în tuneluri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Noutati & Actualizari " @@ -4237,7 +4254,7 @@ msgstr "Adauga / sterge / editeaza & controleaza clientul și tunelurile ser #: ../java/src/net/i2p/router/web/SummaryHelper.java:450 msgid "Hidden Service" -msgstr "" +msgstr "Serviciu ascuns" #: ../java/src/net/i2p/router/web/SummaryHelper.java:454 msgid "Show tunnels" @@ -4280,26 +4297,26 @@ msgstr "Construire tunelelor" msgid "shared clients" msgstr "clientii comune" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Faceți restart pentru a instala" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Faceți clic pe Oprire și reporniți pentru a instala" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Versiune {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "actualizare disponibila" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Descarcă {0} actualizari" @@ -4308,7 +4325,7 @@ msgstr "Descarcă {0} actualizari" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4317,69 +4334,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Descarca actualizare
nesemnata{0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Ajutor cu configurarea firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Verificați conexiunea la rețea și NAT / firewall" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "reseed" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Comandă" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Sus" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Mută în vârf" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Mută în sus" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Jos" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Jos" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Selectați o secțiune pentru adăugare" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "evenimente in {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "medie pentru {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Evenimente în perioada " -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "medie" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "acum" @@ -4556,175 +4589,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Deschideți consola router în browser-ul web in timpul pornirii" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "Proxy HTTP" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "Clasic" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "Întunecat" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "Luminos" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "Miezul nopții" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "BandwidthLimiter" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "Mesaje client " -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Criptare" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Tunelul I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "JobQueue" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "Baza de date rețelei" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Flux" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Regulator" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "gazdă" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "Cheie" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "configurarea traficului" @@ -4893,7 +4878,7 @@ msgid "Share" msgstr "Partajare" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTĂ" @@ -4934,7 +4919,7 @@ msgid "Advanced network configuration page" msgstr "Pagina de configurare avansată a rețelei" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4973,27 +4958,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Configurare avansată I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Unele modificări pot necesita o repornire pentru a avea efect" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_sv.po b/apps/routerconsole/locale/messages_sv.po index 0ca124fc4..1133087fc 100644 --- a/apps/routerconsole/locale/messages_sv.po +++ b/apps/routerconsole/locale/messages_sv.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 17:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-19 09:57+0000\n" "Last-Translator: cacapo \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" @@ -41,8 +41,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -51,8 +51,8 @@ msgstr[1] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -61,8 +61,8 @@ msgstr[1] "{0} sek" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -71,37 +71,46 @@ msgstr[1] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "1 timme" msgstr[1] "{0} timmar" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/a" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "1 dag" msgstr[1] "{0} dagar" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 år" +msgstr[1] "{0} år" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/a" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "1 ns" msgstr[1] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -144,7 +153,7 @@ msgstr "Till" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "ingen" @@ -283,43 +292,43 @@ msgstr "Avvisar tunnlar: Stänger ner" msgid "Rejecting tunnels" msgstr "Avvisar tunnlar" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Reseedar: fick info från fil({0} lyckades, {1} fel)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Reseedar" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Reseed hämtad endast en router." msgstr[1] "Reseed hämtad endast {0} routrar." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Reseed misslyckades." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Se {0} för hjälp" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "sida för konfiguration av omseedning" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Reseed: hämtar seed URL." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -389,7 +398,7 @@ msgstr "Onåbar på varje transport" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Status" @@ -404,7 +413,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} används för utgående anslutningar enbart" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP är inte aktiverat" @@ -427,13 +436,13 @@ msgid "" msgstr "För att åsidosätta dessa gränser, lägg till inställningarna i2np.ntcp.maxConnections = nnn och i2np.udp.maxConnections = nnn på den avancerade inställningarsidan." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definitioner" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -448,7 +457,7 @@ msgstr "Fjärr peeren, identifierad med routerhash" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Mapp" @@ -475,13 +484,13 @@ msgstr "Tiden sedan ett paket har mottagits / sänts" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Stillastående" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "In/Ut" @@ -496,14 +505,14 @@ msgstr "Tiden sedan denna anslutning etablerades" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Uppe" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Tidsförvridning" @@ -552,7 +561,7 @@ msgstr "Nuvarande maximala försändningsstorlek för paket / uppskattad maximal #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -562,7 +571,7 @@ msgstr "Det totala antalet paket som skickats till denna peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -571,7 +580,7 @@ msgid "The total number of packets received from the peer" msgstr "Det totala antalet paket som har mottagits från denna peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "DUP TX" @@ -580,7 +589,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Det totala antalet paket som återutsänds till peer" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "DUP RX" @@ -619,8 +628,8 @@ msgstr "WAN PPP anslutning" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Upptid" @@ -715,17 +724,17 @@ msgid "NTCP connections" msgstr "NTCPanslutningar" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Gräns" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Timeout" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -738,126 +747,126 @@ msgid "Backlogged?" msgstr "Släpar efter?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Inkommande" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Utgående" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} peer" msgstr[1] "{0} peers" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP-anslutningar" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sortera efter peer hash" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Riktning/Inledning" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sortera efter stillastående inkommande" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sortera efter utgående utgående" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sortera efter inkommande hastighet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sortera efter utgående hastighet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sortera efter anslutningsupptid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sortera efter klockanvridning" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sortera efter överbelastningfönster" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sortera efter långsam starttröskel" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sortera efter tur och returtid" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sortera efter omsändningstimeout" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sortera efter utgående maximal överföringsenhet" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sortera efter paket som skickats" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sortera efter paket som mottagits" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sortera efter paket som återutsänds" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sortera efter paket som mottagits fler än en gång" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Vi erbjöd oss att introducera dem" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "De erbjöd sig att introducera oss" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Strypt" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 misslyckande" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} misslyckande" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Förbjudna" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "backlogged" @@ -895,66 +904,66 @@ msgstr "Släpper tunnelförfrågningar: Hög belastning" msgid "Dropping tunnel requests: Queue time" msgstr "Släpper tunnelförfrågningar: Kötid" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Ny version för plugin {0} finns tillgänglig" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Uppdateringskontroll misslyckades för plugin {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Ingen ny version tillgänglig för plugin {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B överfört" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Installation misslyckades från {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Överföring misslyckades från {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Uppdatering hämtad" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Startar om" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Update verifierad" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "från {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Osignerad uppdateringsfil från {0} är korrumperad" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Misslyckades med att kopiera till {0}" @@ -967,7 +976,7 @@ msgstr "Misslyckades med att kopiera till {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "HTTP klientproxytunnel måste köra" @@ -981,20 +990,20 @@ msgstr "HTTP klientproxytunnel måste köra" msgid "Updating" msgstr "Uppdaterar" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Nätverks-uppdateringar inaktiverade. Kontrollera pakethanteraren." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Inga skrivrättigheter för I2P installations-katalogen." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Uppdatera först till version {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Kräver Java version {0} installerad Java version är {1}" @@ -1184,16 +1193,20 @@ msgid "No new version found at {0}" msgstr "Ingen ny version hittad på {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Permanent förbjuden" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Tillfälligt förbud utgår om {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Förbjuden till omstart eller {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "unban nu" @@ -1294,18 +1307,18 @@ msgstr "unban nu" msgid "I2P Router Console" msgstr "I2P Routerkonsol" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Fel vid uppdatering av konfiguration - se felloggar" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Konfigurationen sparades utan problem" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1513,7 +1526,7 @@ msgid "Add Client" msgstr "Lägg till Klient" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Klient" @@ -1545,9 +1558,9 @@ msgid "Plugin" msgstr "Plugin" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Version" @@ -1569,7 +1582,8 @@ msgstr "Licens" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Webbplats" @@ -1582,7 +1596,7 @@ msgid "Stop" msgstr "Stoppa" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Kontrollera efter uppdateringar" @@ -1604,7 +1618,7 @@ msgstr "Ta bort" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1614,7 +1628,7 @@ msgstr "Ta bort valda" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1633,7 +1647,7 @@ msgstr "Återställ standardvärden" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1762,8 +1776,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Ta bort" @@ -1773,7 +1787,7 @@ msgstr "Välj en klass att lägga till" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Bandbredd" @@ -1782,7 +1796,7 @@ msgid "Home Page" msgstr "Startsida " #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Nätverk" @@ -1838,9 +1852,9 @@ msgid "UI" msgstr "Användargränssnitt" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunnlar" @@ -1858,15 +1872,15 @@ msgid "Logging" msgstr "Logging" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Peers" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statistik" @@ -1878,8 +1892,8 @@ msgstr "Avancerad" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2140,7 +2154,7 @@ msgstr "Starta om omedelbart" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Omstart" @@ -2611,8 +2625,8 @@ msgid "User Name" msgstr "Användarnamn" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Lägg till " @@ -2621,91 +2635,91 @@ msgstr "Lägg till " msgid "Password" msgstr "Lösenord" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Uppdatering eller kontroll pågår" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Uppdatering tillgänglig, försöker ladda ner nu" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Uppdatering tillgänglig, klicka på knappen till vänster för att ladda ner" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Ingen uppdatering tillgänglig" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Uppdaterar nyhets URLer till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "intern" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Uppdaterar poxyvärd till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Uppdaterar proxyport yill {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Uppdaterar uppdateringsfrekvensen till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Aldrig" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Uppdaterar uppdaterings policy till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Uppdaterar uppdaterings URL:er." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Uppdaterar nycklar med tillit till." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Uppdaterar osignerad uppdaterings URL till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "Uppdaterar signerad utvecklingsbuild URL till {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Alltid" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Berätta endast" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Ladda ner och kontrollera endast" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Ladda ner, kontrollera och starta om" @@ -2831,7 +2845,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Inga \"{0}\" händelser funna i föregående {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Tid" @@ -2981,12 +2995,12 @@ msgid "Graph settings saved" msgstr "Grafinställningar sparade" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Adressbok" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Hantera din I2P host-fil här (I2P domännamns uppslag)" @@ -3017,17 +3031,17 @@ msgid "I2P Home Page Configuration" msgstr "Konfiguration av I2P startsida" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonym webbmailklient" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "E-post" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Router Hjälp" @@ -3037,17 +3051,17 @@ msgid "Router Console" msgstr "Router Konsol" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Inbyggd anonym Bittorrentklient" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrents" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Lokal webserver" @@ -3216,97 +3230,97 @@ msgstr "HTTP proxyn är inte uppe" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Din webbläsare är inte korrekt konfigurerad för att använda HTTP-proxy på {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Namn" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "I2P arbetskö" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Uppgifts körningar" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Aktiva uppgifter" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "startade {0} sedan" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Nyligen slutförda uppgifter" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "slutförd {0} sedan" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Redo/väntande uppgifter" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Schemalagda uppgifter" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} kommer starta om {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Statistik över alla uppgifter" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Uppgift" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "Köade" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Körningar" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Släppt" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Genomsnitt" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Max" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Min" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Väntande" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Sammanfattning" @@ -3324,223 +3338,223 @@ msgid "No log messages" msgstr "Inga logmeddelande" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Lokal router" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Router uppslag" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Alla routers" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "'Alla routers med fulla stats" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Router" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "hittades inte i nätverksdatabasen" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Lokal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Opubliserad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Destination" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Lägg till lokal adressbok" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Går ut om {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Gick ut {0} sedan" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Gateway" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunnel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Inte intierad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Nätverksdatabas Routerstatistik" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Antal" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transporter" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Land" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Vår information" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Peer information för" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Full post" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Dold" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Uppdaterad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} sedan" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Publicerad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Signeringsnyckel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adress(er)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "kostnad" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Dold eller startande" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU med introducerare" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP och SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP och SSU med introducerare" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "Endast IPv6 SSU, introducerade" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, introducerade" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, introducerade" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "Endast IPv6 NTCP, SSU, introducerade" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Nyheter senast uppdaterade för {0} sedan." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Nyheter senast kontrollerade för {0} sedan." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Dölj nyheter" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Visa nyheter" @@ -3590,19 +3604,19 @@ msgid "Groups (Caps)" msgstr "Grupper (Kap.)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Hastighet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapacitet" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integration" @@ -3625,7 +3639,7 @@ msgid "Failing" msgstr "Misslyckas" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Integrerad" @@ -3702,71 +3716,71 @@ msgstr "1h felfrekvens" msgid "1d Fail Rate" msgstr "1d felfrekvens" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Trösklar" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "snabba peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "högkapacitets peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "väintegrerade peers" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "som bestämd av profilorganiseraren" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupper" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "kapaciteten i netDb, används inte för att fastställa profiler" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "kap." -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "topp genomströmning (bytes per sekund) under en period av1 minut som klienten har upprätthållit i en tunnel" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "hastighet" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "kapacitet" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "hur många tunnlar kan vi be dem att gå med i på en timme?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "hur många nya peers har de berättat för oss om nyligen?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integration" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "är peeren bannad, eller inte kan nås, eller en misslyckas tunnel test?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "status" @@ -3894,277 +3908,277 @@ msgstr "Diagram över antal händelser" msgid "Lifetime average value" msgstr "Livstids medelvärde" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Router Hjälp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Hjälp & FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Konfigurera start av klienter och webbappar (tjänster), starta vilande tjänster manuellt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P tjänster" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Konfigurera I2P Router" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P internt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Visa existerande tunnlar och status för tunnlar som byggs" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Visa alla aktuella peeranslutningar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Visa de senaste peer prestanda profiler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Visa lista över alla kända I2P routrar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Hälsorapport" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Loggar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Diagram över router prestanda" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Grafer" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "resultatstatistik för router i textform" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Lokala Tunnlar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Hanterare för dolda tjänster" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Allmänt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Din lokala identitet är din unika I2P routers identitet, liknande en ip-adress men anpassad för I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "avslöja aldrig den för någon eftersom det kan avslöja din ip-adress " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Lokal identitet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Din unika I2P router identitet är" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "avslöja det aldrig till någon" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "visa" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Den version av I2P vi kör " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Hur länge vi har kört för denna session" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Hjälp med att konfigurera din brandvägg och router för optimal prestanda för I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Se mer information på wikin" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Varning: ECDSA inte tillgänglig. Uppdatera Java eller OS" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Konfigurera I2P uppdateringar " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P uppdatering" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Peers vi har pratat med de senaste minuterna/timmarna" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Aktiv" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Antal peers tillgängliga för att bygga klient tunnlar " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Snabb" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Antal peers tillgängliga för att bygga undersökande tunnlar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Hög kapacitet" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Anta tillgängliga för nätverksdatabasförfrågningar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Totala antalet peers i vår nätverksdatabas" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Kända" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Ställ in routerns bandbreddsallokering" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Bandbredd in/ut" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Totalt" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Använda" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Används för att bygga och testa tunnlar och kommunicera med floodfill peers" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Utforskande" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Tunnlar vi använder för att tillhandahålla eller få tillgång till tjänster i nätverket" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "Tunnlar vi deltar i och direkt bidrar med bandbredd till nätverket" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Deltagande" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Förhållandet mellan tunneln hopp ger vi tillhandahåller och använder - ett värde större än 1,00 indikerar ett positivt bidrag till nätverket" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Delningsratio" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Vad är i routerns arbeteskö" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Trängsel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Indikerar routern prestanda" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Arbetsfördröjning" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Indikerar hur snabbt utåtgåendemeddelanden till andra I2P routers sänds " -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Meddelandefördröjning" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Tur och retur tid för ett tunnel test" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tunnelfördröjning" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Köade förfrågningar från andra routrar att delta i tunnlar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Eftersläpning" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Nyheter & Uppdateringar " @@ -4268,26 +4282,26 @@ msgstr "Bygger tunnlar" msgid "shared clients" msgstr "delade klienter" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Klicka på Omstart för att installera" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Klicka Stäng av och starta om för att installera" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Version {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Uppdateringar tillgängliga" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Hämtat {0} uppdateringar" @@ -4296,7 +4310,7 @@ msgstr "Hämtat {0} uppdateringar" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "Ladda ner signerad
Utvecklingsuppdatering
{0}" @@ -4305,69 +4319,85 @@ msgstr "Ladda ner signerad
Utvecklingsuppdatering
{0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Hämta osignerade
uppdateringar {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Hjälp med brandväggskonfigurationen" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Kontrollera nätverksanslutningen och NAT/brandvägg " -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Reseed" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Ordning" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Top" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Flytta längst upp" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Flytta upp" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Ner" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "Flytta ner" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Botten" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "Flytta längst ner" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Välj ett avsnitt för att lägga till det" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "händelser i {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "genomsnittlig för {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Händelser per period" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "genomsnitt" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "max" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "nu" @@ -4544,175 +4574,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Öppna router konsolen i browser vid start" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "delade klienter (DSA)" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC proxy" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P webbserver" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP-proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klassisk" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "mörk" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "ljus" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "midnatt" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Bandbreddsbegränsare" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "KlientMeddelande" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Kryptering" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTunnel" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "JobbKö" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "NätverksDatabas" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Ström" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Reglera" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "värd" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "nyckel" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "konfigurera bandbredd " @@ -4881,7 +4863,7 @@ msgid "Share" msgstr "Dela" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOTERA" @@ -4922,7 +4904,7 @@ msgid "Advanced network configuration page" msgstr "Sida för avancerade nätverksinställningar " #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4961,27 +4943,35 @@ msgid "" "computer's resources." msgstr "Att delta som floodfill hjälper nätverket, men använder mer av din dators resurser." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "Denna router är för närvarande floodfill." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "Denna router är för närvarande inte floodfill." + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Automatisk" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Tvingande På" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Avaktivera" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Avancerad I2P Konfiguration" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Vissa ändringar kan kräva en omstart för att börja gälla." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "För att göra ändringar, redigera fil {0}" diff --git a/apps/routerconsole/locale/messages_tr.po b/apps/routerconsole/locale/messages_tr.po index 161547db5..6d7aae2fa 100644 --- a/apps/routerconsole/locale/messages_tr.po +++ b/apps/routerconsole/locale/messages_tr.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" @@ -36,8 +36,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -45,8 +45,8 @@ msgstr[0] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -54,8 +54,8 @@ msgstr[0] "{0} sn" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -63,34 +63,42 @@ msgstr[0] "{0} dk" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0} saat" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "kullanılamaz" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0} gün" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "kullanılamaz" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -132,7 +140,7 @@ msgstr "Kime" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "yok" @@ -271,42 +279,42 @@ msgstr "Tünelleme red ediliyor: Kapatılıyor" msgid "Rejecting tunnels" msgstr "Tünelleme red ediliyor" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Tekrar düğümleniyor" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Tekrar düğümleme sadece {0} yönlendirici aldı." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Tekrar düğümleme başarısız oldu." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Yardım için {0}'a bakınız." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "tekrar düğümleme düzenleşim sayfası" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Tekrar düğümleniyor: düğüm URL'sini alıyor." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -376,7 +384,7 @@ msgstr "Hiçbir taşımada erişilebilir değil" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Durum" @@ -391,7 +399,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} yalnızca giden bağlantılar içindir." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnp etkin değil" @@ -414,13 +422,13 @@ msgid "" msgstr "Bu sınırları geçersiz kılmak için i2np.ntcp.maxConnections=nnn ve i2np.udp.maxConnections=nnn ayarlarını gelişmiş ayarlar sayfasında ekleyin." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Tanımlar" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -435,7 +443,7 @@ msgstr "Uzak eş, yönlendirici hash'i tarafından tespit edilmiş" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Dizin" @@ -462,13 +470,13 @@ msgstr "Bir paketin alınması / gönderilmesi üzerinden geçen zaman" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Boşta" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Girdi/Çıktı" @@ -483,14 +491,14 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Yukarı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Kayma" @@ -539,7 +547,7 @@ msgstr "Mevcut azami gönderilen paket boyu / tahmini azami alınan paket boyu ( #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -549,7 +557,7 @@ msgstr "Eşe gönderilen toplam paket sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -558,7 +566,7 @@ msgid "The total number of packets received from the peer" msgstr "Eşten alınan toplam paket sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -567,7 +575,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Eşe yeniden iletilen paket sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -606,8 +614,8 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Çalışma süresi" @@ -702,17 +710,17 @@ msgid "NTCP connections" msgstr "NTCP bağlantıları" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Sınır" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Zaman aşımı" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -725,125 +733,125 @@ msgid "Backlogged?" msgstr "Biriken?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Gelen" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Giden" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP bağlantılari" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Eş hash'lerine göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Yönerge/Giriş" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Boşta gelenlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Boşta gidenlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Gelen oranına göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Giden oranına göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Bağlantı süresine göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Saat kaymasına göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Yavaş başlangıç eşiğine göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Gidiş-dönüş süresine göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Yeniden iletim zaman aşımına göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Giden azami iletim birimine göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Gönderilen paketlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Alınan paketlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Yeniden iletilen paketlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Bir kereden çok alınan paketlere göre sırala" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Onlara tanıştırma önerdik" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Bize tanıştırma önerildi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Tıkalı" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 başarısızlık" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} başarısızlık" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Yasaklı" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "" @@ -881,66 +889,66 @@ msgstr "Tünel istekleri atılıyor: Yüksek yük" msgid "Dropping tunnel requests: Queue time" msgstr "Tünel talepleri atılıyor: Kuyruk süresi" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Yeni eklenti sürümü {0} mevcut" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "{0} eklentisi için güncelleme denetimi başarısız" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "{0} eklentisi için yeni sürüm mevcut değil" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B iletildi" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "{0} üzerinden aktarılamadı" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Güncelleme indirildi" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Yeniden başlatılıyor" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Güncelleme doğrulandı" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "{0}'dan" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "{0} üzerinden alınan imzasız dosya bozuk" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "{0} üzerine kopyalanamadı" @@ -953,7 +961,7 @@ msgstr "{0} üzerine kopyalanamadı" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -967,20 +975,20 @@ msgstr "" msgid "Updating" msgstr "Güncelleniyor" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1170,16 +1178,20 @@ msgid "No new version found at {0}" msgstr "{0} üzerinde yeni bir sürüm bulunamadı" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Geçici yasaklama {0} içinde kaldırılacak" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Yeniden başlatılana ya da {0} yapılana kadar yasaklı" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "yasağı kaldırın" @@ -1280,18 +1292,18 @@ msgstr "yasağı kaldırın" msgid "I2P Router Console" msgstr "I2P Yönlendirici Sergeni" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Düzenleşimi güncellerken hata - lütfen hata kütüklerine bakınız" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Düzenleşim başarıyla saklandı" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1499,7 +1511,7 @@ msgid "Add Client" msgstr "İstemci Ekle" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "İstemci" @@ -1531,9 +1543,9 @@ msgid "Plugin" msgstr "Eklenti" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Sürüm" @@ -1555,7 +1567,8 @@ msgstr "Lisans" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Web sitesi" @@ -1568,7 +1581,7 @@ msgid "Stop" msgstr "Durdur" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Güncellemeleri denetle" @@ -1590,7 +1603,7 @@ msgstr "Sil" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1600,7 +1613,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1619,7 +1632,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1748,8 +1761,8 @@ msgstr "UYAR" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Sil" @@ -1759,7 +1772,7 @@ msgstr "Eklemek için sınıf seçin" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Bant genişliği" @@ -1768,7 +1781,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Ağ" @@ -1824,9 +1837,9 @@ msgid "UI" msgstr "Arayüz" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tüneller" @@ -1844,15 +1857,15 @@ msgid "Logging" msgstr "Kütük" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Eşler" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "İstatistikler" @@ -1864,8 +1877,8 @@ msgstr "Gelişmiş" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2125,7 +2138,7 @@ msgstr "Derhal yeniden başlat" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Yeniden başlat" @@ -2593,8 +2606,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2603,91 +2616,91 @@ msgstr "" msgid "Password" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Güncelleme mevcut, şimdi indirmeye çalışılıyor" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Güncelleme mevcut, indirmek için soldaki düğmeye tıklayın" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Güncelleme mevcut değil" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Asla" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Güncelleme URLleri güncelleniyor." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Güvenilen anahtarlar güncelleniyor." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Hep" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Yalnızca bildir" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Yalnızca indir ve onayla" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "İndir, onayla ve yeniden başlat" @@ -2813,7 +2826,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2963,12 +2976,12 @@ msgid "Graph settings saved" msgstr "Grafik ayarları kaydedildi" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Adres defteri" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "I2P hosts dosyasını buradan yönetin (I2P etki alanı çözümlemesi)" @@ -2999,17 +3012,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonim webposta istemcisi" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P Yöneltici Yardımı" @@ -3019,17 +3032,17 @@ msgid "Router Console" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "İçsel Anonim BitTorrent İstemcisi" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrentler" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3198,97 +3211,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3306,223 +3319,223 @@ msgid "No log messages" msgstr "Kütük iletisi yok" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Yönlendirici" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "ağ veritabanında bulunamadı" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Yerel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Yayınlanmamış" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Hedef" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "{0} içinde bitecek" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "{0} önce bitti" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Geçit" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tünel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Başlatılmadı" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Ağ Veritabanı Yönlendirici İstatistikleri" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Sayım" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Taşımalar" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Ülke" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Bilgimiz" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Tam girdi" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Gizli" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Güncellenme" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} önce" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Yayınlanmış" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adres(ler)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "tutar" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Gizli veya yeniden başlıyor" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "Tanıştırıcı destekli SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP ve SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "Tanıştırıcı destekli NTCP ve SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Haberler en son {0} önce güncellendi." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Haberler en son {0} önce denetlendi." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3568,19 +3581,19 @@ msgid "Groups (Caps)" msgstr "Gruplar (Kapasiteler)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Hız" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Kapasite" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Tümleştirme" @@ -3603,7 +3616,7 @@ msgid "Failing" msgstr "Başasırız" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Tümleştirilmiş" @@ -3680,71 +3693,71 @@ msgstr "1s Kayıp Oranı" msgid "1d Fail Rate" msgstr "1g Kayıp Oranı" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Eşikler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "hızlı eşler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "yüksek kapasiteli eşler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "iyi tümleştirilmiş eşler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "profil yöneticisi tarafından belirlenen" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "gruplar" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "netDb yetenekleri, profillerin belirlenmesinde kullanılmaz" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "kapasiteler" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" msgstr "eş tek bir tünele bağlandığında, bir dakikalık aralıkta en yüksek akışı (saniyedeki bayt)" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "hız" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "kapasite" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "bir saat içinde bağlanmak istenebilecek tünel sayısı" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "yakın zamanda kendileri hakkında bilgi veren eş sayısı" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "tümleştirme" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "eş yasaklı mı, erişilemiyor mu ya da tünel sınamasından geçemedi mi" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "durum" @@ -3870,277 +3883,277 @@ msgstr "Grafik Etkinliği Sayısı" msgid "Lifetime average value" msgstr "Ömür boyu ortalama değeri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P Yöneltici Yardımı ve SSS" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Yardım ve SSS" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "İstemcilerin ve webapp (hizmetlerin) başlatılmasını ayarlayın. Çalışmayan hizmetleri el ile başlatın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P Hizmetleri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "I2P Yöneltici Ayarları" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P Bilgileri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Varolan tünel ve tünel yapım durumlarına bakın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Tüm geçerli eş bağlantılarına bakın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Geçenlerdeki eş başarım profillerine bakın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profiller" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Tüm bilinen I2P yönelticilerinin listesi görüntülensin" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Sağlık Durumu" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Günlükler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Yöneltici başarım çizelgesi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Çizelgeler" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Metin bazlı yöneltici başarım istatistikleri" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Genel" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Yerel Kimlik" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Eşsiz I2P yöneltici kimliğiniz" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "asla kimseye söyelemeyin" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "bakın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Bu oturumun çalışma süresi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "En iyi I2P başarımı için güvenlik duvarı ve yönelticinizi nasıl ayarlayacağınız hakkında yardım" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Etkin" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Hızlı" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Yüksek kapasiteli" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Bilinen" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Yöneltici bant genişliği kullanımını ayarlayın" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Bant genişliği gelen/giden" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Toplam" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Kullanılan" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Keşif" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Katılınan" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Paylaşım oranı" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Yönelticinin iş kuyruğunda bulunanlar" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Sıkışıklık" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "İş gecikmesi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "İleti gecikmesi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Tünel gecikmesi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Arka günlük" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4244,26 +4257,26 @@ msgstr "Tüneller yapılıyor" msgid "shared clients" msgstr "paylaşılmış istemciler" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Yüklemek için yeniden başlatın" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Kapatın düğmesine tıklayıp yüklemek için yeniden başlatın" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Sürüm {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4272,7 +4285,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4281,69 +4294,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Güvenlik duvarı ayarlama yardımı" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Tekrar düğümleme" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "{0} etkinlikleri" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "{0} ortalamaları" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Aralık başına etkinlik" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "ort" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "en fazla" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "şimdi" @@ -4520,175 +4549,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Yöneltici paneli başlangıçta web tarayıcı içinde açılsın" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC vekil sunucusu" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsitesi" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P web sunucusu" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Vekil Sunucusu" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eep Vekil Sunucusu" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "irc Vekil Sunucusu" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klasik" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "koyu" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "açık" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "gece yarısı" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Bant Genişliği Sınırlayıcı" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "İstemci İletileri" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Şifreleme" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2PTüneli" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNet Havuzu" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "İş Kuyruğu" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "Ağ Veritabanı" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Akış" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Tetik" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Aktarım" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "sunucu" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "anahtar" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "kapı" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4857,7 +4838,7 @@ msgid "Share" msgstr "Paylaşım" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "NOT" @@ -4898,7 +4879,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4937,27 +4918,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_uk.po b/apps/routerconsole/locale/messages_uk.po index fbe5a9f98..226aa0a94 100644 --- a/apps/routerconsole/locale/messages_uk.po +++ b/apps/routerconsole/locale/messages_uk.po @@ -14,16 +14,18 @@ # LinuxChata, 2014 # LinuxChata, 2014 # madjong , 2015 +# madjong , 2015 # naeto , 2012 # puxud , 2014 # puxud , 2014 +# Maus , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-15 16:59+0000\n" -"Last-Translator: madjong \n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" +"Last-Translator: kytv \n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,8 +44,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -53,8 +55,8 @@ msgstr[2] "{0,number,####} мс" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -64,8 +66,8 @@ msgstr[2] "{0} с." #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -75,8 +77,8 @@ msgstr[2] "{0} хв." #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -84,15 +86,9 @@ msgstr[0] "{0} година" msgstr[1] "{0} години" msgstr[2] "{0} годин" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "немає даних" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -100,7 +96,23 @@ msgstr[0] "{0} день" msgstr[1] "{0} днів" msgstr[2] "{0} днів" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "немає даних" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" @@ -108,7 +120,7 @@ msgstr[0] "{0,number,###} нс" msgstr[1] "{0,number,###} нс" msgstr[2] "{0,number,###} нс" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -152,7 +164,7 @@ msgstr "Кому" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "немає" @@ -185,7 +197,7 @@ msgstr "IPv4: Вимкнено; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: Симетричний NAT; IPv6: ОК" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 @@ -291,17 +303,17 @@ msgstr "Не приймаємо тунелі: Маршрутизатор зав msgid "Rejecting tunnels" msgstr "Не приймаємо тунелі" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "" +msgstr "Проводиться початкове завантаження: отримуємо список маршрутизаторів з каталогів URL ({0} успішно, {1} помилок)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Початкове завантаження" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -309,26 +321,26 @@ msgstr[0] "При початковому завантаженні отриман msgstr[1] "При початковому завантаженні отримано дані лише про {0} маршрутизатори." msgstr[2] "При початковому завантаженні отримано дані лише про {0} маршрутизаторів." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Спроба початкового запуску провалилась." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Дивіться {0} для допомоги." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "Сторінка конфігурації початкового завантаження" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Проводиться початкове завантаження: Завантажуються URL каталогів маршрутизаторів" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -368,7 +380,7 @@ msgstr "Відомі інтегровані (floodfill) піри" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" -msgstr "" +msgstr "Розмір тунелю черги завдань одержувача" #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:502 msgid "NetDb entry" @@ -398,7 +410,7 @@ msgstr "Недосяжний через жодний транспортний п #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Статус" @@ -413,7 +425,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} використовується тільки для вихідних з'єднань" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP не ввімкнено" @@ -436,13 +448,13 @@ msgid "" msgstr "Для перевизначення цих лімітів додайте параметри i2np.ntcp.maxConnections=nnn і i2np.udp.maxConnections=nnn на сторінці розширених налаштувань." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Умовні позначення" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -457,7 +469,7 @@ msgstr "Віддалений пір, ідентифікований хешем #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Напрямок" @@ -484,13 +496,13 @@ msgstr "Час який пройшов після отримання / відп #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Неактивний" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Прийом/Передача" @@ -505,14 +517,14 @@ msgstr "Час який пройшов після встановлення з'є #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Підключений" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Нахил" @@ -561,7 +573,7 @@ msgstr "Поточний максимальний розмір відправл #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "Передано" @@ -571,7 +583,7 @@ msgstr "Загальна кількість пакетів, відправлен #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "Прийнято" @@ -580,7 +592,7 @@ msgid "The total number of packets received from the peer" msgstr "Загальна кількість пакетів, отриманих від вузла" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Повт. передано" @@ -589,7 +601,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Загальна кількість пакетів, повторно відправлених до вузла" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Повт. прийнято" @@ -628,8 +640,8 @@ msgstr "WAN PPP-з'єднання" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Аптайм" @@ -674,11 +686,11 @@ msgstr "Вимкнені UPnP пристрої" msgid "" "UPnP has been disabled; Do you have more than one UPnP Internet Gateway " "Device on your LAN ?" -msgstr "" +msgstr "UPnP був відключений; Чи є у вас більше ніж один UPnP Інтернет- шлюз у вашій локальній мережі?" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN." -msgstr "" +msgstr "В вашій локальній мережі не знайдено жодного пристрою сумісного з UPnP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:693 #, java-format @@ -724,17 +736,17 @@ msgid "NTCP connections" msgstr "NTCP підключення" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Обмеження" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Упущення часу бездіяльности" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -747,19 +759,19 @@ msgid "Backlogged?" msgstr "Перевантажено?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "вхідно" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "вихідно" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -767,107 +779,107 @@ msgstr[0] "{0} пір" msgstr[1] "{0} пірів" msgstr[2] "{0} пірів" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "зв'язки UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Сортування по хешу вузла" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Порядком за вхідню бездіяльність" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Порядком за вихідню бездіяльність" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Порядком за вхідну ставку" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Порядком за вихідну ставку" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Порядком за тривалість зв'язку" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Порядком за нахилом такту" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Ми пропонуємо представити їх" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Вони пропонують представити нас" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 збій" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} збоїв" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Забороненo" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "перевантажений" @@ -905,66 +917,66 @@ msgstr "Відхиляю запити на тунелі: високе наван msgid "Dropping tunnel requests: Queue time" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Доступна нова версія плагіна {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Неможливо перевірити оновлення для плагіна {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Немає нової версії плагіна {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B передано" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Неможливо встановити з {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Невдала передача з {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Оновлення завантажено" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Перезапуск..." -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Оновлення перевірено" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "з {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Неможливо скопіювати до {0}" @@ -977,7 +989,7 @@ msgstr "Неможливо скопіювати до {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "Тунель для HTTP проксі повинен працювати" @@ -991,20 +1003,20 @@ msgstr "Тунель для HTTP проксі повинен працювати" msgid "Updating" msgstr "Оновлення" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Стандартні оновлення відключено. Перевірте пакетний менеджер." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Немає прав на запис для директорії, де встановлено I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Спосатку потрібно оновити до версії {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Необхідна Java версії {0} але встановлено Java версії {1}" @@ -1194,16 +1206,20 @@ msgid "No new version found at {0}" msgstr "Нової версії на {0} не знайдено" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Тимчасовий бан завершується через {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "розбанити" @@ -1304,18 +1320,18 @@ msgstr "розбанити" msgid "I2P Router Console" msgstr "Консоль роутера I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Помилка при оновленні конфігурації. Будь ласка, подивіться журнали помилок." -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Налаштування збережено успішно" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1523,7 +1539,7 @@ msgid "Add Client" msgstr "Додати клієнт" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Клієнт" @@ -1555,9 +1571,9 @@ msgid "Plugin" msgstr "Модуль" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Версія" @@ -1579,7 +1595,8 @@ msgstr "Ліцензія" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Веб-сайт" @@ -1592,7 +1609,7 @@ msgid "Stop" msgstr "Зупинити" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Перевірити оновлення" @@ -1614,7 +1631,7 @@ msgstr "Видалити" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1624,7 +1641,7 @@ msgstr "Видалити обране" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1643,7 +1660,7 @@ msgstr "Відновити за замовчування" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1772,8 +1789,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Видалити" @@ -1783,7 +1800,7 @@ msgstr "Оберіть клас для додавання" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Пропускна здатність" @@ -1792,7 +1809,7 @@ msgid "Home Page" msgstr "Домашня сторінка" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Мережа" @@ -1848,9 +1865,9 @@ msgid "UI" msgstr "Інтерфейс" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Тунелі" @@ -1868,15 +1885,15 @@ msgid "Logging" msgstr "Логування" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Піри" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Статистика" @@ -1888,8 +1905,8 @@ msgstr "Розширені" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2151,7 +2168,7 @@ msgstr "Перезапустити негайно" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Перезапустити" @@ -2625,8 +2642,8 @@ msgid "User Name" msgstr "Ім'я користувача" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Додати" @@ -2635,91 +2652,91 @@ msgstr "Додати" msgid "Password" msgstr "Пароль" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Немає оновлень" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Оновлення URL-адреси новин на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "внутрішній" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Оновлення хосту проксі на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Оновлення порта проксі на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Оновлення частоти оновлення на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Ніколи" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Оновлення URL-адрес оновлення." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Оновлення довірених ключів." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Оновлення URL-адреси непідписаних оновлень на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Кожний" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Лише сповістити" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Лише завантажити і перевірити" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Завантажити, перевірити і перезапустити" @@ -2845,7 +2862,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Подій \"{0}\" не знайдено в попередньому {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Час" @@ -2995,12 +3012,12 @@ msgid "Graph settings saved" msgstr "Налагтування графікі збережено" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Адресна книга" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -3031,17 +3048,17 @@ msgid "I2P Home Page Configuration" msgstr "Налаштування домашньої сторінки I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Анонімний поштовий клієнт" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Пошта" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Допомога по I2P-роутеру" @@ -3051,17 +3068,17 @@ msgid "Router Console" msgstr "Консоль роутера" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Вбудований анонімник клієнт BitTorrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Торренти" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Локальний веб-сервер" @@ -3230,97 +3247,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Назва" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "У черзі" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Середнє" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Максимальне" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Мінімальне" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Загалом" @@ -3338,223 +3355,223 @@ msgid "No log messages" msgstr "" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Локальний роутер" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Всі роутери" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Всі роутери з повною статистикою" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU з посередниками" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP і SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP і SSU з посередниками" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 тільки SSU, посередники" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, посередники" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, посередники" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 тільки NTCP, SSU, посередники" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3608,19 +3625,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "" @@ -3643,7 +3660,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "" @@ -3720,71 +3737,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3914,277 +3931,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Відомі" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Загалом" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Використано" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Затримка повідомлення" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Новини & оновлення" @@ -4288,26 +4305,26 @@ msgstr "Побудова тунелів" msgid "shared clients" msgstr "колективні клієнти" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Версія {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Оновлення доступно" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Завантажити оновлення {0}" @@ -4316,7 +4333,7 @@ msgstr "Завантажити оновлення {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4325,69 +4342,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Завантажити підписане
оновлення {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" +msgid "avg" msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "" @@ -4564,175 +4597,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC проксі" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP проксі" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "класична" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "темна" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "світла" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Шифрування" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Поток" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Регуляція" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Транспорт" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "key" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4901,7 +4886,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4942,7 +4927,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4981,27 +4966,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_vi.po b/apps/routerconsole/locale/messages_vi.po index cefb28f18..cc53c69c4 100644 --- a/apps/routerconsole/locale/messages_vi.po +++ b/apps/routerconsole/locale/messages_vi.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 01:31+0000\n" "Last-Translator: kytv \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/I2P/language/vi/)\n" "MIME-Version: 1.0\n" @@ -34,8 +34,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -43,8 +43,8 @@ msgstr[0] "{0,number,####} phần nghìn giây" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -52,8 +52,8 @@ msgstr[0] "{0} giây" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -61,34 +61,42 @@ msgstr[0] "{0} phút" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0} giờ" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "chưa rõ" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0} ngày" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "chưa rõ" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -130,7 +138,7 @@ msgstr "Đến" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "không có" @@ -269,42 +277,42 @@ msgstr "Từ chối đường ống riêng: Đang tắt" msgid "Rejecting tunnels" msgstr "Chấp nhận đường ống riêng" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Giữ chỗ tải trở lại" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "Giữ chỗ tải lại chỉ có {0} định tuyến." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Giữ chỗ tải trở lại thất bại." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Xem {0} để được giúp đỡ." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "trang cấu hình giữ chỗ tải trở lại" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Giữ chỗ tải trở lại: đang lấy phần đường dẫn giữ chỗ tải." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -374,7 +382,7 @@ msgstr "Không thể kết bằng bất kỳ phương thức truyền tải nào #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Trạng thái" @@ -389,7 +397,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} đã được dùng cho các kết nối với bên ngoài" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP hiện bị vô hiệu hóa" @@ -412,13 +420,13 @@ msgid "" msgstr "Để ghi đè thông tin lên các giới hạn này, thêm vào phần thiết lập i2np.ntcp.maxConnections=nnn và i2np.udp.maxConnections=nnn trong trang thiết lập nâng cao." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Định nghĩa" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -433,7 +441,7 @@ msgstr "Mạng ngang hàng từ xa, được xác định bởi phần hash củ #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Thư mục" @@ -460,13 +468,13 @@ msgstr "Khoảng thời gian kể từ khi một gói tin được nhận / gử #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Trạng thái nghỉ" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Vào/Ra" @@ -481,14 +489,14 @@ msgstr "Đường nối này được bao lâu" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Lên" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Lệch" @@ -537,7 +545,7 @@ msgstr "Kích thước tối đa của gói tin gửi đi hiện tại / kích t #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -547,7 +555,7 @@ msgstr "Tổng số gói tin được gửi đến mạng ngang hàng" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -556,7 +564,7 @@ msgid "The total number of packets received from the peer" msgstr "Tổng số gói tin nhận được từ mạng ngang hàng" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "TX Trùng" @@ -565,7 +573,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Tổng số gói tin được truyền tải lại đến mạng ngang hàng" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "RX Trùng" @@ -604,8 +612,8 @@ msgstr "Kết nối WAN PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "" @@ -700,17 +708,17 @@ msgid "NTCP connections" msgstr "Kết nối NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Giới hạn" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Hết thời hạn" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -723,125 +731,125 @@ msgid "Backlogged?" msgstr "Đăng nhập trở lại?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Luồng dữ liệu vào" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Luồng dữ liệu ra" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} mạng ngang hàng" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Kết nối UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sắp xếp theo mã hash của mạng ngang hàng" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Hướng/Giới thiệu" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sắp xếp theo trạng thái nhàn rỗi của luồng tín hiệu vào" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sắp xếp theo trạng thái nhàn rỗi của luồng tín hiệu ra" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sắp xếp theo tỷ lệ của luồng tín hiệu vào" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sắp xếp theo tỷ lệ của luồng tín hiệu ra" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sắp xếp theo thời gian hoạt động kết nối" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sắp xếp theo đồng hồ nghiêng" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sắp xếp theo cửa sổ nghẽn" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sắp xếp theo ngưỡng giới hạn chậm" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sắp xếp theo thời gian hành trình vòng" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sắp xếp theo thời gian giới hạn truyền tải trở lại" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sắp xếp theo đơn vị truyền tải tối đa của luồng tín hiệu ra" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sắp xếp theo gói tin đã gửi" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sắp xếp theo gói tin đã nhận" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sắp xếp theo gói tin bị truyền tải trở lại" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sắp xếp theo gói tin nhận được nhiều hơn một lần" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Chúng tôi cung cấp phần giới thiệu" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Họ cung cấp phần giới thiệu với chúng ta" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 thất bại" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} thất bại" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Bị Cấm" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "đăng nhập trở lại" @@ -879,66 +887,66 @@ msgstr "Bỏ yêu cầu đường ống riêng: Độ tải quá cao" msgid "Dropping tunnel requests: Queue time" msgstr "Bỏ yêu cầu đường ống riêng: Hàng đợi thời gian" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Hiện đã phát hành tiện ích mới phiên bản {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Cập nhật không thành công đối với tiện ích {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Không có phiên bản mới dành cho tiện ích {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0}B đã truyền" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Truyền thất bại từ phía {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Đã tải về bản cập nhật" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Đang khởi động lại" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Đã xác nhận phần cập nhật" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "từ {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Chưa xác nhận tập tin cập nhật từ {0} bị lỗi" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Xảy ra lỗi khi sao chép sang {0}" @@ -951,7 +959,7 @@ msgstr "Xảy ra lỗi khi sao chép sang {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -965,20 +973,20 @@ msgstr "" msgid "Updating" msgstr "Đang cập nhật" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "" @@ -1168,16 +1176,20 @@ msgid "No new version found at {0}" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 -#, java-format -msgid "Temporary ban expiring in {0}" +msgid "Permanently banned" msgstr "" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format +msgid "Temporary ban expiring in {0}" +msgstr "" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 +#, java-format msgid "Banned until restart or in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "" @@ -1278,18 +1290,18 @@ msgstr "" msgid "I2P Router Console" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1497,7 +1509,7 @@ msgid "Add Client" msgstr "Add Client" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "" @@ -1529,9 +1541,9 @@ msgid "Plugin" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "" @@ -1553,7 +1565,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "" @@ -1566,7 +1579,7 @@ msgid "Stop" msgstr "" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "" @@ -1588,7 +1601,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1598,7 +1611,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1617,7 +1630,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1746,8 +1759,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "" @@ -1757,7 +1770,7 @@ msgstr "" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "" @@ -1766,7 +1779,7 @@ msgid "Home Page" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "" @@ -1822,9 +1835,9 @@ msgid "UI" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "" @@ -1842,15 +1855,15 @@ msgid "Logging" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "" @@ -1862,8 +1875,8 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2123,7 +2136,7 @@ msgstr "" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "" @@ -2591,8 +2604,8 @@ msgid "User Name" msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "" @@ -2601,91 +2614,91 @@ msgstr "" msgid "Password" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "" @@ -2811,7 +2824,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "" @@ -2961,12 +2974,12 @@ msgid "Graph settings saved" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "" @@ -2997,17 +3010,17 @@ msgid "I2P Home Page Configuration" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "" @@ -3017,17 +3030,17 @@ msgid "Router Console" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "" @@ -3196,97 +3209,97 @@ msgstr "" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 +msgid "Avg" +msgstr "" + #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 -msgid "Avg" -msgstr "" - -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 msgid "Max" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "" @@ -3304,223 +3317,223 @@ msgid "No log messages" msgstr "" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "" @@ -3566,19 +3579,19 @@ msgid "Groups (Caps)" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "" @@ -3601,7 +3614,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "" @@ -3678,71 +3691,71 @@ msgstr "" msgid "1d Fail Rate" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "" @@ -3868,277 +3881,277 @@ msgstr "" msgid "Lifetime average value" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "" @@ -4242,26 +4255,26 @@ msgstr "" msgid "shared clients" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "" @@ -4270,7 +4283,7 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4279,69 +4292,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 -msgid "avg" -msgstr "" - #: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 -msgid "max" +msgid "avg" msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +msgid "max" +msgstr "" + +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "" @@ -4518,175 +4547,127 @@ msgid "Open Router Console in web browser at startup" msgstr "" #: ../java/strings/Strings.java:37 -msgid "IRC proxy" +msgid "shared clients (DSA)" msgstr "" #: ../java/strings/Strings.java:38 -msgid "eepsite" +msgid "IRC proxy" msgstr "" #: ../java/strings/Strings.java:39 -msgid "I2P webserver" +msgid "eepsite" msgstr "" #: ../java/strings/Strings.java:40 +msgid "I2P webserver" +msgstr "" + +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "" @@ -4855,7 +4836,7 @@ msgid "Share" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "" @@ -4896,7 +4877,7 @@ msgid "Advanced network configuration page" msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4935,27 +4916,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +msgid "Automatic" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "" diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index 606b1b325..6176116fc 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 13:50+0000\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-17 02:49+0000\n" "Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -42,8 +42,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -51,8 +51,8 @@ msgstr[0] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -60,43 +60,51 @@ msgstr[0] "{0} 秒" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" -msgstr[0] "{0} 分钟" +msgstr[0] "{0} 分" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" msgstr[0] "{0} 小时" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "不可用" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" msgstr[0] "{0} 天" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "{0} 年" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "不可用" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" msgstr[0] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -138,7 +146,7 @@ msgstr "至" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "无" @@ -277,42 +285,42 @@ msgstr "拒绝共享：准备退出" msgid "Rejecting tunnels" msgstr "拒绝参与共享隧道" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "补种：从文件获得路由信息（{0} 个路由信息，{1} 个错误）。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "网络引导" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." msgstr[0] "网络引导只发现了 {0} 个节点。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "网络引导失败。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "帮助参见 {0}。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "网络引导设置页面" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "正在补种：从网址补种。" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -348,7 +356,7 @@ msgstr "已知快速节点" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:41 msgid "Known integrated (floodfill) peers" -msgstr "已知集成的 (floodfill) 节点" +msgstr "已知整合的 (floodfill) 节点" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" @@ -382,7 +390,7 @@ msgstr "各传输方式均不可达" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "状态" @@ -397,7 +405,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} 仅被用作出站连接" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP 未启用" @@ -411,7 +419,7 @@ msgstr "帮助" msgid "" "Your transport connection limits are automatically set based on your " "configured bandwidth." -msgstr "最大传输连接数会根据您的带宽设置自动调整。" +msgstr "您的传输连接数限制会根据您的带宽设置自动调整。" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:723 msgid "" @@ -420,13 +428,13 @@ msgid "" msgstr "要自定义连接数限制，您可以在高级配置页面中添加参数 i2np.ntcp.maxConnections=nnn 及 i2np.udp.maxConnections=nnn 。" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "定义" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -441,7 +449,7 @@ msgstr "以路由Hash区分的远程节点" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "类别" @@ -468,20 +476,20 @@ msgstr "最近一次数据传输距现在的时间" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "空闲" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "入/出" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)" -msgstr "进/出站平滑传输率(Kbyte/s)" +msgstr "进/出站平滑传输率(KByte/s)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 msgid "How long ago this connection was established" @@ -489,14 +497,14 @@ msgstr "此连接已建立多久" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "寿命" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "时滞" @@ -545,7 +553,7 @@ msgstr "当前发送数据包的最大大小/预计接收数据包的最大大 #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "发包" @@ -555,7 +563,7 @@ msgstr "向节点发送的数据包总量" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "接包" @@ -564,7 +572,7 @@ msgid "The total number of packets received from the peer" msgstr "从节点接收到数据包总量" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "重发包" @@ -573,7 +581,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "向节点重发送的数据包总量" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "重接包" @@ -612,8 +620,8 @@ msgstr "WAN PPP连接" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "运行时间" @@ -676,7 +684,7 @@ msgstr "无法获取当前的外部IP地址。" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699 #, java-format msgid "UPnP reports the maximum downstream bit rate is {0}bits/sec" -msgstr "UPnP 报告的最大下行比特率为 {0}bit/s" +msgstr "UPnP 报告的最大下行比特率为 {0}bit/秒" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:701 #, java-format @@ -708,17 +716,17 @@ msgid "NTCP connections" msgstr "NTCP连接" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "限制" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "超时" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -731,125 +739,125 @@ msgid "Backlogged?" msgstr "积压？" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "入站" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "出站" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" msgstr[0] "{0} 个节点" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP连接" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "按节点Hash" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "按方向" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "按出站空闲" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "按入站空闲" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "按入站速度" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "按出站速度" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "按连接时间" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "按时滞" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "按拥塞窗口" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "按慢启动门槛" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "按往返时间" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "按重传输超时时间" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "按出站最大传输单元" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "按已发送数据包" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "按已接收数据包" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "按重传数据包" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "按重复数据包" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "我们提供给它们" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "它们提供给我们" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "阻塞" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "失败 1 次" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "失败 {0} 次" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "已封锁" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "积压" @@ -887,66 +895,66 @@ msgstr "忽略共享请求：高负载" msgid "Dropping tunnel requests: Queue time" msgstr "忽略共享请求：队列积压" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "新插件版本 {0} 可用" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "{0} 插件更新检查失败" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "插件 {0} 没有更新可用" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "已传输 {0}B" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "从 {0} 安装失败" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "传输 {0} 的数据失败" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "更新已下载" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "正在重启" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "更新已验证" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "自 {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "来自 {0} 的未签名更新包已损坏" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "无法复制到 {0}" @@ -959,7 +967,7 @@ msgstr "无法复制到 {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "HTTP 客户端代理隧道必须运行" @@ -973,20 +981,20 @@ msgstr "HTTP 客户端代理隧道必须运行" msgid "Updating" msgstr "正在更新" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "网络更新被禁用。请检查软件包管理。" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "没有对I2P安装目录的写权限。" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "你必须先更新到版本{0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "需要版本为 {0} 的 Java，但你安装的版本是 {1}" @@ -1176,16 +1184,20 @@ msgid "No new version found at {0}" msgstr " {0} 上未发现新版本" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "已永久封禁" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "临时封锁{0}后解除" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "封锁直到重启或{0}后" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "立即解封" @@ -1286,18 +1298,18 @@ msgstr "立即解封" msgid "I2P Router Console" msgstr "I2P 路由控制台" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "更新配置出错 - 请查看错误日志" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "设置保存成功" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1505,7 +1517,7 @@ msgid "Add Client" msgstr "添加客户端" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "客户" @@ -1537,9 +1549,9 @@ msgid "Plugin" msgstr "插件" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "版本" @@ -1561,7 +1573,8 @@ msgstr "许可证" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "网站" @@ -1574,7 +1587,7 @@ msgid "Stop" msgstr "停止" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "检查更新" @@ -1596,7 +1609,7 @@ msgstr "删除" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1606,7 +1619,7 @@ msgstr "删除选中项目" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1625,7 +1638,7 @@ msgstr "恢复默认值" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1754,8 +1767,8 @@ msgstr "警告" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "删除" @@ -1765,7 +1778,7 @@ msgstr "选择要添加的类" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "带宽" @@ -1774,7 +1787,7 @@ msgid "Home Page" msgstr "主页" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "网络" @@ -1830,9 +1843,9 @@ msgid "UI" msgstr "界面" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "隧道" @@ -1850,15 +1863,15 @@ msgid "Logging" msgstr "日志" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "节点" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "统计" @@ -1870,8 +1883,8 @@ msgstr "高级" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2131,7 +2144,7 @@ msgstr "立刻重启" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "重　启" @@ -2599,8 +2612,8 @@ msgid "User Name" msgstr "用户名" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "添加" @@ -2609,91 +2622,91 @@ msgstr "添加" msgid "Password" msgstr "密码" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "更新或检查已在进行" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "有更新可用，正在尝试下载" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "有更新可用，点左侧按钮下载" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "无更新可用" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "正在更新新闻链接至 {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "内部" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "正在更新代理主机至{0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "正在更新代理端口至{0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "正在更新刷新频率至{0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "从不" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "正在更新策略至{0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "正在更新更新链接。" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "正在更新可信公钥。" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "正在更新未签名更新链接至{0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "正在更新到已签名的开发版，URL {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "每" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "只提示" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "仅下载和验证" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "仅下载、验证并重启" @@ -2819,7 +2832,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "没有找到在 {1} 前的“{0}”的事件" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "时间" @@ -2969,12 +2982,12 @@ msgid "Graph settings saved" msgstr "图表设置已保存" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "地址簿" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "管理您的 I2P hosts 文件（I2P域名解析表）" @@ -3005,17 +3018,17 @@ msgid "I2P Home Page Configuration" msgstr "I2P 主页设置" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "匿名Web邮件客户端" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "匿名邮箱" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "I2P路由帮助" @@ -3025,17 +3038,17 @@ msgid "Router Console" msgstr "路由控制台" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "内置的匿名BT客户端" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "匿名BT" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "本地Web服务器" @@ -3204,97 +3217,97 @@ msgstr "HTTP代理未启动" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "您的浏览器尚未配置使用HTTP代理{0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "名称" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "I2P作业队列" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "作业任务" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "活跃任务" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "{0}前开始" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "刚刚完成的任务" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "{0}前完成" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "已就绪/等待中的任务" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "预定的任务" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} 将在 {1} 启动" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "总的任务统计" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "任务" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "排队" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "运行" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "忽略" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "平均" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "最大" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "最小" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "挂起" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "摘要" @@ -3312,223 +3325,223 @@ msgid "No log messages" msgstr "无日志消息" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "本地路由" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "路由查询" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "全部路由" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "全部路由及完整统计" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "赁集" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "路由器" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "在网络数据库中未找到" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "赁集" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "本地" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "未发布" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "目标" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "添加到本地地址簿" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "{0} 后过期" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "{0} 前过期" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "网关" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "租赁" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "隧道" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "未初始化" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "网络数据库路由统计" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "计数" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "传输" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "国家" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "我方信息" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "节点信息" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "完整项" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "隐身" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "已更新" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} 前" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "发布" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "签名密钥" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "地址" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "开销" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "隐身或正在启动" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "使用中介的SSU连接" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP 与 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "使用中介的 NTCP 和 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 仅 SSU, 中介" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, 中介" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, 中介" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 仅 NTCP, SSU, 中介" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "新闻更新于 {0}前。" -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "最近一次查收新闻在 {0}前。" -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "隐藏新闻" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "显示新闻" @@ -3574,19 +3587,19 @@ msgid "Groups (Caps)" msgstr "分组(容量)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "速度" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "容量" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "整合" @@ -3609,7 +3622,7 @@ msgid "Failing" msgstr "失败" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "已整合" @@ -3686,71 +3699,71 @@ msgstr "1h失败率" msgid "1d Fail Rate" msgstr "1d失败率" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "临界值" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "快速节点" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "高容节点" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "整合节点" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "由节点描述信息管理器决定" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "分组" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "网络库中的容量与描述信息无关" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "容量" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "" "peak throughput (bytes per second) over a 1 minute period that the peer has " "sustained in a single tunnel" -msgstr "该节点一分钟由单一隧道通过的数据峰值(byte/s)。" +msgstr "该节点一分钟内从单个隧道通过的数据量峰值（字节/秒)。" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "速度" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "容量" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "一小时内路由可以邀请加入的隧道总量" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "最近获知了多少新节点？" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "整合" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "是否节点被封禁，不可达，或在隧道测试中失败？" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "状态" @@ -3876,277 +3889,277 @@ msgstr "图表事件计数" msgid "Lifetime average value" msgstr "全程均值" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "I2P 使用帮助与常见问答" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "帮助与常见问答" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "设置客户端及Web应用（服务）的启动；手动启动重要服务" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "I2P 服务" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "设置 I2P 路由器" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "I2P内部设置" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "查看现存隧道及隧道的建立状态" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "显示当前所有的节点连接" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "显示当前节点的性能记录" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "摘要" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "包含所有已知I2P路由器的列表" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "网络库" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "路由器健康状况报告" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "日志" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "路由性能统计图" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "图表" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "路由性能文字统计" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "本地隧道" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" -msgstr "隐藏服务管理器" +msgstr "隐身服务管理器" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "功能概况" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "您的本地身份即您的I2P路由唯一身份，相当于您在I2P网络中的IP地址。" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "不要将其透露给他人，因为它可能被用来探测和确定您的真实IP。" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "本地身份" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "您的I2P路由的唯一身份为" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "切勿将其告诉任何人" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "显示" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "当前运行的I2P软件版本" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "本次路由运行时间" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "如何正确配置您的防火墙和物理路由器以优化 I2P 工作性能的帮助" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "在 wiki 查看更多信息" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "警告：ECDSA 不可用。请更新您的 Java 或操作系统" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "设置I2P更新" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "I2P更新" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "过去数分钟/小时中路由连接过的节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "活动节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "可用来建立客户端隧道的节点数量" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "快速节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "可用来建立探测隧道的节点数量" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "高容量节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "可用来查询网络数据库的节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "我方网络数据库中记录的节点总数量" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "已知节点" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "设置路由的带宽配额" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "带宽（进/出站）" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "总计" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "已用" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "用来建立或测试隧道，与 FloodFill 节点通信" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "探测" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "用来提供服务或访问他人服务的隧道。" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "我方参与的隧道，直接为I2P网络贡献带宽。" +msgstr "我方参与的隧道，直接为网络贡献带宽" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "共享" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "我方提供与使用的隧道比例 - 大于 1.00 表示对网络作出了积极贡献" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" -msgstr "共享/占用比率" +msgstr "共享比率" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "查看路由的作业队列" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "拥堵" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "表示路由器性能" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "作业延迟" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "表示出站消息发往其他I2P路由的速度" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "消息延迟" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "隧道测试的往返时间" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "隧道延迟" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "请求队列中来自其他路由的加入隧道请求" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "积压" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "新闻和更新" @@ -4207,7 +4220,7 @@ msgstr "添加、删除、编辑或控制客户端隧道和服务器隧道" #: ../java/src/net/i2p/router/web/SummaryHelper.java:450 msgid "Hidden Service" -msgstr "隐藏服务" +msgstr "隐身服务" #: ../java/src/net/i2p/router/web/SummaryHelper.java:454 msgid "Show tunnels" @@ -4250,26 +4263,26 @@ msgstr "隧道创建中" msgid "shared clients" msgstr "共享客户端" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "点击【重启】完成安装" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "点击【关闭】并重新启动I2P即可完成安装。" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "版本 {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "有可用更新" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "下载 {0} 更新" @@ -4278,7 +4291,7 @@ msgstr "下载 {0} 更新" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "下载已签名的
开发版更新
{0}" @@ -4287,69 +4300,85 @@ msgstr "下载已签名的
开发版更新
{0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "下载未签名
更新{0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "如何配置防火墙" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "检查网络连接和NAT/防火墙" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "补种" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "顺序" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "顶部" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "移动到顶部" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "上移" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "向下" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "下移" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "底部" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "移动到底部" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "选择要添加的部分" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "事件/{0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "{0} 平均值" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "事件/周期" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "平均" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "最大" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "当前" @@ -4526,175 +4555,127 @@ msgid "Open Router Console in web browser at startup" msgstr "路由启动时打开网页版路由控制台" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "共享客户端（DSA）" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC代理" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "匿名网站" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P网页服务器" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP 代理" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "经典" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "暗色调" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "亮色调" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "午夜" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "带宽限制" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "客户消息" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "加密" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "I2P隧道" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "InNetPool" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "作业队列" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "网络数据库" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "NTCP" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "流" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "门槛" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "传输" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "UDP" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "主机" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "密钥" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "端口" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "配置带宽" @@ -4852,18 +4833,18 @@ msgstr "与联网环境相符的速度能使I2P以最佳的状态工作。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:443 msgid "KBps In" -msgstr "KBps 入站" +msgstr "KB/s 入站" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:457 msgid "KBps Out" -msgstr "KBps 出站" +msgstr "KB/s 出站" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:472 msgid "Share" msgstr "共享" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "注意" @@ -4871,11 +4852,11 @@ msgstr "注意" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:481 #, java-format msgid "You have configured I2P to share only {0} KBps." -msgstr "您设置的 I2P 仅共享 {0} KBps。" +msgstr "您已设置 I2P 仅共享 {0} KB/s。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:484 msgid "I2P requires at least 12KBps to enable sharing. " -msgstr "I2P 需要至少 12KBps 才能进行共享。" +msgstr "I2P 需要至少 12KB/s 才能进行共享。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:485 msgid "" @@ -4891,7 +4872,7 @@ msgstr "制造混淆流量共享能增强您的匿名性，并帮助网络成长 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:488 #, java-format msgid "You have configured I2P to share {0} KBps." -msgstr "您已设置 I2P 共享 {0} KBps。" +msgstr "您已设置 I2P 共享 {0} KB/s。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:491 msgid "" @@ -4904,7 +4885,7 @@ msgid "Advanced network configuration page" msgstr "高级网络配置页面" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4943,27 +4924,35 @@ msgid "" "computer's resources." msgstr "参与播种有助于帮助网络，但会在您的计算机上占用更多资源。" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "这个路由器目前参与播种。" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "这个路由器目前不参与播种。" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "自动" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "强制开启" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "禁用" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "I2P 高级设置" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "某些设置需要程序重启后生效。" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "要进行更改，编辑 {0} 文件。" @@ -5021,7 +5010,7 @@ msgstr "启用强制 SSL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:530 msgid "Disabled - Clients outside this Java process may not connect" -msgstr "禁用 - 如果客户端与I2P不运行与同一Java虚拟机中则禁止其连接" +msgstr "禁用 - 这个 Java 进程之外的客户端可能无法连接" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:532 msgid "I2CP Interface" @@ -5037,7 +5026,7 @@ msgstr "认证" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:558 msgid "Require username and password" -msgstr "需要用户名密码登陆" +msgstr "需要用户名和密码登录" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:560 msgid "Username" @@ -5069,7 +5058,7 @@ msgid "" "(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 Web 程序随客户端“web控制台”一同启动，并与路由运行于同一JVM中。这些Web程序通常可以通过路由器界面直接访问。他们可能是完整的程序 (例如 i2psnark/BT客户端),其他客户端程序的前端或必须单独启动的程序(例如. susidns, i2ptunnel),甚至根本没有Web界面(例如 addressbook)。" +msgstr "下面列出的Java Web 程序随“Web控制台”客户端一同启动，并与路由运行于同一JVM中。这些Web程序通常可以通过路由器界面直接访问。它们可能是完整的程序，例如 i2psnark（BT客户端），部分前端的客户端或程序必须单独启动（例如：susidns、i2ptunnel），或者甚至根本没有Web界面（例如 addressbook，即地址簿）。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:582 msgid "" @@ -5135,7 +5124,7 @@ msgstr "搜索引擎" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:508 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:412 msgid "Hidden Services of Interest" -msgstr "互联网隐藏服务" +msgstr "互联网隐身服务" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:524 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/home_jsp.java:416 @@ -5622,14 +5611,14 @@ msgstr "警告 - 快速节点，受防火墙限制" msgid "" "You have configured I2P to share more than 128KBps of bandwidth, but you are" " firewalled." -msgstr "您已设置I2P共享超过128KBps的带宽，但您的连接受到防火墙限制。" +msgstr "您已设置 I2P 共享超过 128KB/s 的带宽，但您的连接受到防火墙限制。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:736 msgid "" "While I2P will work fine in this configuration, if you really have over " "128KBps of bandwidth to share, it will be much more helpful to the network " "if you open your firewall." -msgstr "尽管在此种配置情况下I2P可以正常工作，但如果您的确能够分享超过128KBps的带宽，打开防火墙端口能让它更好工作，帮助网络中其他的人。" +msgstr "尽管在这种配置情况下 I2P 可以正常工作，但如果您的确能够分享超过 128KB/s 的带宽，打开防火墙端口能让它更好工作，帮助网络中的其他人。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:738 msgid "WARN - Firewalled and Floodfill" @@ -6121,7 +6110,7 @@ msgstr "路由器启动时启动浏览器？" 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 "此Web控制台是I2P的主要设置界面，所以如果您您觉得有必要I2P可以在路由启动时调用浏览器打开" +msgstr "此Web控制台是I2P的主要设置界面，所以如果您觉得有必要，I2P可以在路由启动时调用浏览器打开" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:150 msgid "config summary bar" @@ -6210,7 +6199,7 @@ 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跳点)，或大量常规+大量备用,可能降低性能和稳定性。" +msgstr "长于3个跳点的隧道(例如 2跳点 + 0-2跳点，3跳点 + 0-1跳点, 3跳点 + 0-2跳点)，或高数量的常规+备用，可能会严重降低性能或可靠性。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:487 msgid "High CPU and/or high outbound bandwidth usage may result." @@ -6421,7 +6410,7 @@ msgstr "Bug报告请到 {0} 或 {1}。" msgid "" "You may use the username \"guest\" and password \"guest\" if you do not wish" " to register." -msgstr "如果您不想注册可以用“guest”作为用户名和密码登陆。" +msgstr "如果您不想注册，可以用“guest”作为用户名和密码登录。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:183 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:356 @@ -6448,7 +6437,7 @@ msgid "" "Note that system information, log timestamps, and log messages may provide " "clues to your location; please review everything you include in a bug " "report." -msgstr "注意，系统信息、日志时间戳和日志中的部分信息中可能泄露您真实位置；提交前请仔细检查。" +msgstr "注意，系统信息、日志时间戳和日志中的部分信息可能泄露有关您的位置的线索。提交 Bug 报告前请仔细检查您提交的所有信息。" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error_jsp.java:161 msgid "Page Not Found" diff --git a/apps/susidns/locale/messages_hu.po b/apps/susidns/locale/messages_hu.po index db07c5772..48827fbd4 100644 --- a/apps/susidns/locale/messages_hu.po +++ b/apps/susidns/locale/messages_hu.po @@ -4,13 +4,14 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# benewfy , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-29 12:27+0000\n" +"Last-Translator: benewfy \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Aláírt" #: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Key" -msgstr "" +msgstr "Kulcs" #: ../src/java/src/i2p/susi/dns/AddressBean.java:235 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260 @@ -222,7 +223,7 @@ msgstr "HIBA: Nem sikerült a címjegyzék-fálj írása." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -231,14 +232,14 @@ msgstr "Úrlap küldése sikertelen, valószínűleg a \"vissza\" vagy az \"újr #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." -msgstr "" +msgstr "Ha a probléma fennáll, ellenőrizd, hogy a sütik engedélyezve vannak-e a böngésződben." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -249,7 +250,7 @@ msgid "Configuration saved." msgstr "Beállítás elmentve." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -278,16 +279,16 @@ msgstr "{0} Célállomás hozzáadása sikertelen a {1} névszolgáltatóhoz" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "{0} Célállomás törlése sikertelen a {1} névszolgáltatóból" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Feliratkozás elmentve, címjegyzék a feliratkozási források használatával frissítés alatt." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Feliratkozások elmentve." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Feliratkozások újratöltve." @@ -435,7 +436,7 @@ msgstr "Mégse" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Exportálás hosts.txt formátumba" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -549,7 +550,7 @@ msgstr "Fájl, ami a működést naplózza (megváltoztathatod /dev/null -ra, ha #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200 msgid "Name of the theme to use (defaults to 'light')" -msgstr "" +msgstr "Használni kívánt téma neve (alapértelmezett 'light')" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112 msgid "addressbook" @@ -629,7 +630,7 @@ msgstr "Elosztott források vagy \"feliratkozások\" használata a hosts.txt fá #, java-format msgid "" "In the default configuration, the address book is only subscribed to {0}." -msgstr "" +msgstr "Az alapértelmezett konfigurációban a címjegyzék csak ehhez van feliratkozva: {0}." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 msgid "" @@ -641,7 +642,7 @@ msgstr "További oldalakra való feliratkozás egyszerű, pusztán add hozzá a msgid "" "For more information on naming in I2P, see the overview." -msgstr "" +msgstr "További információkért az I2P-ben történő névadásról nézd meg az áttekintést." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 msgid "How does the addressbook application work?" @@ -706,7 +707,7 @@ msgstr "Azok az URL-ek közzétett hosts.txt fájlokra hivatkoznak." msgid "" "The default subscription is the hosts.txt from {0}, which is updated " "infrequently." -msgstr "" +msgstr "Az alapértelmezett feliratkozás a hosts.txt tőle: {0}, ami ritkán volt frissítve." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 msgid "" diff --git a/apps/susidns/locale/messages_pl.po b/apps/susidns/locale/messages_pl.po index 3302d8258..94307af66 100644 --- a/apps/susidns/locale/messages_pl.po +++ b/apps/susidns/locale/messages_pl.po @@ -5,16 +5,16 @@ # # Translators: # PolishAnon , 2011, 2012 -# seb, 2014 +# seb, 2014-2015 # Smert i2p , 2013 # Tracerneo , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-09 20:53+0000\n" +"Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,7 +70,7 @@ msgstr "Podpisano" #: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Key" -msgstr "" +msgstr "Klucz" #: ../src/java/src/i2p/susi/dns/AddressBean.java:235 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260 @@ -231,7 +231,7 @@ msgstr "BŁĄD: Nie można zapisać pliku książki adresowej." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -240,14 +240,14 @@ msgstr "Nieprawidłowy formularz, prawdopodobnie dlatego, że użyto przycisku \ #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Jeśli problem będzie się powtarzał, sprawdź, czy masz włączoną obsługę plików cookie w przeglądarce." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -258,7 +258,7 @@ msgid "Configuration saved." msgstr "Konfiguracja zapisana." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -287,16 +287,16 @@ msgstr "Nie udało się dodać Miejsca Przeznaczenia dla {0} do serwisu nazewnic msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "Nie udało się usunąć Miejsca Przeznaczenia dla {0} z serwisu nazewnictwa {1}" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Subskrypcje zapisane, trwa teraz aktualizowanie książki adresowej ze źródeł subskrypcji." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Subskrypcje zapisane." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Subskrypcje przeładowane." @@ -444,7 +444,7 @@ msgstr "Anuluj" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Eksportuj w formacie hosts.txt" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -638,7 +638,7 @@ msgstr "Regularnie aktualizuje twoj plik hosts.txt z rozproszonych źródeł lub #, java-format msgid "" "In the default configuration, the address book is only subscribed to {0}." -msgstr "" +msgstr "W domyślnej konfiguracji, książka adresowa jest subskrybowana tylko do {0}." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 msgid "" @@ -715,7 +715,7 @@ msgstr "Te URL odnoszą się do opublikowanych plików hosts.txt." msgid "" "The default subscription is the hosts.txt from {0}, which is updated " "infrequently." -msgstr "" +msgstr "Domyślna subskrypcja to hosts.txt z {0}, która jest rzadko aktualizowana." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 msgid "" diff --git a/apps/susidns/locale/messages_pt.po b/apps/susidns/locale/messages_pt.po index 9cc75333e..25e64bd5e 100644 --- a/apps/susidns/locale/messages_pt.po +++ b/apps/susidns/locale/messages_pt.po @@ -4,6 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# wtfisthis , 2015 # Rafael Ferrari, 2013 # Rafael Ferrari, 2013 # Ruthein Alex , 2012 @@ -11,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-08 21:12+0000\n" +"Last-Translator: wtfisthis \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,7 +70,7 @@ msgstr "Assinado" #: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Key" -msgstr "" +msgstr "Chave" #: ../src/java/src/i2p/susi/dns/AddressBean.java:235 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260 @@ -225,7 +226,7 @@ msgstr "ERRO: Não foi possível gravar no arquivo do livro de endereços." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -234,14 +235,14 @@ msgstr "Requisição inválida, por favor tentar novamente." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Se o problema persistir, verificar se o seu navegador está aceitando cookies." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -252,7 +253,7 @@ msgid "Configuration saved." msgstr "Configuração salva." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -281,16 +282,16 @@ msgstr "Falha ao adicionar o Destino para {0} ao serviço de nomes {1}" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "Falha ao remover o Destino para {0} do serviço de nomes {1}" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Inscrições salvas, atualizando o livro de endereços agora." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Inscrições salvas." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Inscrições recarregadas." @@ -438,7 +439,7 @@ msgstr "Cancelar" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Exportar em formato host.txt" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -632,7 +633,7 @@ msgstr "Ele atualiza o seu arquivo hosts.txt regularmente de fontes distribuída #, java-format msgid "" "In the default configuration, the address book is only subscribed to {0}." -msgstr "" +msgstr "Na configuração padrão, o livro de endereços está inscrito apenas no {0}." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 msgid "" diff --git a/apps/susidns/locale/messages_pt_BR.po b/apps/susidns/locale/messages_pt_BR.po index 9dd306ac7..0ed73cf87 100644 --- a/apps/susidns/locale/messages_pt_BR.po +++ b/apps/susidns/locale/messages_pt_BR.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-19 12:59+0000\n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-09 20:07+0000\n" "Last-Translator: blueboy\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -65,7 +65,7 @@ msgstr "Oculto" #: ../src/java/src/i2p/susi/dns/AddressBean.java:231 msgid "Signed" -msgstr "" +msgstr "Assinado" #: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Key" @@ -114,7 +114,7 @@ msgstr[1] "O livro de endereços contém {0} entradas." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222 #, java-format msgid "Showing {0} of {1}" -msgstr "" +msgstr "Exibindo {0} de {1}" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:232 @@ -134,7 +134,7 @@ msgstr "Substituir" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:243 #, java-format msgid "Host name {0} is already in address book, unchanged." -msgstr "" +msgstr "O nome de host {0} já consta no livro de endereços, não modificado." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:245 @@ -225,7 +225,7 @@ msgstr "ERRO: não foi possível escrever no arquivo do livro de endereços." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -234,14 +234,14 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Se o problema persistir, verifique se o seu navegador está configurado para permitir cookies." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -252,7 +252,7 @@ msgid "Configuration saved." msgstr "Configuração salva." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -281,16 +281,16 @@ msgstr "" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Subscrições salvas" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Subscrições recarregadas." @@ -369,7 +369,7 @@ msgstr "Configuração" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:136 msgid "Address book" -msgstr "" +msgstr "Livro de endereços" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:156 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141 @@ -438,7 +438,7 @@ msgstr "Cancelar" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Exportar no formato hosts.txt" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -459,7 +459,7 @@ msgstr "configuração" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:162 msgid "Hints" -msgstr "" +msgstr "Dicas" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:164 msgid "" @@ -524,7 +524,7 @@ msgstr "O seu livro de endereços privado nunca é publicado" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:188 msgid "Port for your eepProxy (no need to change)" -msgstr "" +msgstr "Porta do seu eepProxy (não precisa ser mudada)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190 msgid "Hostname for your eepProxy (no need to change)" diff --git a/apps/susidns/locale/messages_ro.po b/apps/susidns/locale/messages_ro.po index 9d458e94a..7f5792acd 100644 --- a/apps/susidns/locale/messages_ro.po +++ b/apps/susidns/locale/messages_ro.po @@ -7,14 +7,15 @@ # CimpianAlin , 2013 # Petre Catalin Alexandru , 2014 # pol polearnik , 2013 +# ROXANA MOHAN , 2015 # titus , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-25 10:44+0000\n" +"Last-Translator: ROXANA MOHAN \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -231,7 +232,7 @@ msgstr "EROARE: Nu sa putut scrie fișierul agendă." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -240,14 +241,14 @@ msgstr "Trimiterea formularului este invalidă, probabil pentru că ați folosit #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Dacă problema persistă, verificați dacă aveți activate cookie-urile în browser-ul dumneavoastră." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -258,7 +259,7 @@ msgid "Configuration saved." msgstr "Configurare salvată." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -287,16 +288,16 @@ msgstr "Adăugarea destinație pentru {0} la serviciul-nume {1} e eșuat" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "Ștergerea destinației pentru {0} la serviciul-nume {1} a eșuat" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Subscrierile salvate, actualizare la adresa de carte de la sursele de subscriere salvată acum." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Subscrieri salvate." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Subscrieri reîncărcate." @@ -444,7 +445,7 @@ msgstr "Anulează" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Exportare în format hosts.txt" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." diff --git a/apps/susidns/locale/messages_zh.po b/apps/susidns/locale/messages_zh.po index 51367c7eb..429591c45 100644 --- a/apps/susidns/locale/messages_zh.po +++ b/apps/susidns/locale/messages_zh.po @@ -9,14 +9,14 @@ # walking , 2011 # walking , 2013 # walking , 2011 -# YF , 2014 +# YF , 2014-2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-06-08 10:13+0000\n" +"Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +64,7 @@ msgstr "Hashcash" #: ../src/java/src/i2p/susi/dns/AddressBean.java:229 msgid "Hidden" -msgstr "隐藏" +msgstr "隐身" #: ../src/java/src/i2p/susi/dns/AddressBean.java:231 msgid "Signed" @@ -223,7 +223,7 @@ msgstr "错误:无法写入地址簿文件" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -232,14 +232,14 @@ msgstr "提交数据无效，可能的原因是您使用了浏览器中的“前 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "如果问题持续出现，请检查您的浏览器是否已启用cookie。" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -250,7 +250,7 @@ msgid "Configuration saved." msgstr "配置已保存" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -279,16 +279,16 @@ msgstr "域名服务{1}中的目标{0}添加失败。" msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "域名服务{1}中的目标{0}删除失败。" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "订阅已保存，正在通过订阅地址更新地址簿。" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "订阅已保存。" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "订阅设置已重新载入。" @@ -372,7 +372,7 @@ msgstr "地址簿" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:156 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141 msgid "Storage" -msgstr "储存" +msgstr "存储" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:174 msgid "Filter" @@ -436,7 +436,7 @@ msgstr "取消" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "导出 hosts.txt 格式" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -506,11 +506,11 @@ msgstr "更新周期(小时)" msgid "" "Your public hosts.txt file (choose a path within your webserver document " "root)" -msgstr "您发布的公开地址簿 hosts.txt (请指定为您Web服务器目录中的某个路径以便发布。)" +msgstr "您公开发布的地址簿 hosts.txt 文件 (请在您的Web服务器目录中选择一个位置以便发布。)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:182 msgid "Your hosts.txt (don't change)" -msgstr "您的 host.txt (无需修改)" +msgstr "您的 hosts.txt (不要修改)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:184 msgid "Your personal addressbook, these hosts will be published" @@ -586,7 +586,7 @@ msgstr "ElGamal 2048位" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:226 msgid "Signing Key" -msgstr "签名钥匙" +msgstr "签名密钥" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:232 msgid "Certificate" @@ -594,7 +594,7 @@ msgstr "证书" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:238 msgid "Added Date" -msgstr "加入日期" +msgstr "添加时间" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:244 msgid "Source" @@ -624,7 +624,7 @@ msgstr "地址簿程序是I2P软件的一部分。" msgid "" "It regularly updates your hosts.txt file from distributed sources or " "\"subscriptions\"." -msgstr "他通过分散的来源或称地址簿“订阅”(概念类似RSS)更新您的地址簿文件 host.txt。" +msgstr "它定期从分散的来源或称地址簿“订阅”(概念类似RSS)更新您的地址簿文件 hosts.txt。" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:143 #, java-format @@ -700,14 +700,14 @@ msgstr "地址簿程序定期通过这些链接检查是否有新的I2P匿名网 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:157 msgid "Those URLs refer to published hosts.txt files." -msgstr "这些URL指向公开发布的hosts.txt文件。" +msgstr "这些URL指向公开发布的 hosts.txt 文件。" #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:159 #, java-format msgid "" "The default subscription is the hosts.txt from {0}, which is updated " "infrequently." -msgstr "默认订阅是来自 {0} 的 hosts.txt，这很少更新。" +msgstr "默认订阅是来自 {0} 的 hosts.txt，它很少更新。" #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 msgid "" diff --git a/core/java/src/gnu/getopt/MessagesBundle_fi.properties b/core/java/src/gnu/getopt/MessagesBundle_fi.properties new file mode 100644 index 000000000..1b253d1cd --- /dev/null +++ b/core/java/src/gnu/getopt/MessagesBundle_fi.properties @@ -0,0 +1,31 @@ +#************************************************************************** +#* MessagesBundle.properties -- English language error messages +#* +#* Copyright (c) 1998 by William King (wrking@eng.sun.com) and +#* Aaron M. Renn (arenn@urbanophile.com) +#* +#* This program is free software; you can redistribute it and/or modify +#* it under the terms of the GNU Library General Public License as published +#* by the Free Software Foundation; either version 2 of the License or +#* (at your option) any later version. +#* +#* This program is distributed in the hope that it will be useful, but +#* WITHOUT ANY WARRANTY; without even the implied warranty of +#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#* GNU Library General Public License for more details. +#* +#* You should have received a copy of the GNU Library General Public License +#* along with this program; see the file COPYING.LIB. If not, write to +#* the Free Software Foundation Inc., 59 Temple Place - Suite 330, +#* Boston, MA 02111-1307 USA +#**************************************************************************/ +getopt.ambigious={0}\: valitsin \u201d{1}\u201d ei ole yksiselitteinen +getopt.arguments1={0}\: valitsin ''--{1}'' ei salli argumenttia +getopt.arguments2={0}\: valitsin ''{1}{2}'' ei salli argumenttia +getopt.requires={0}\: valitsin ''{1}'' vaatii argumentin +getopt.unrecognized={0}\: tunnistamaton valitsin ''--{1}'' +getopt.unrecognized2={0}\: tunnistamaton valitsin ''{1}{2}'' +getopt.illegal={0}\: virheellinen valitsin -- {1} +getopt.invalid={0}\: virheellinen valitsin -- {1} +getopt.requires2={0}\: valitsin vaatii argumentin -- {1} +getopt.invalidValue=Virheellinen arvo {0} parametrille 'has_arg' diff --git a/debian/po/hu.po b/debian/po/hu.po index d83e99973..2d0e183c5 100644 --- a/debian/po/hu.po +++ b/debian/po/hu.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# benewfy , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2015-02-18 22:14+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2015-06-29 12:34+0000\n" +"Last-Translator: benewfy \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/I2P/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -79,7 +80,7 @@ msgstr "Lehetséges, hogy nagy szávszélességű routerek, úgyis mint sok akt #. Description #: ../i2p.templates:5001 msgid "Run I2P daemon confined with AppArmor" -msgstr "" +msgstr "I2P kiszolgáló futtatása korlátozva az AppArmor-ral" #. Type: boolean #. Description @@ -87,4 +88,4 @@ msgstr "" msgid "" "With this option enabled I2P will be sandboxed with AppArmor, restricting " "which files and directories may be accessed by I2P." -msgstr "" +msgstr "Ezzel az opcióval engedélyezed, hogy az I2P sandboxolva legyen az AppArmor-ral, korlátozva, hogy melyik fájlokat és könyvtárakat érheti el az I2P." diff --git a/debian/po/id.po b/debian/po/id.po index 842c7c029..cf65db986 100644 --- a/debian/po/id.po +++ b/debian/po/id.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Khairul Agasta , 2014 +# Khairul Agasta , 2014-2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2015-02-18 22:14+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2015-06-02 04:22+0000\n" +"Last-Translator: Khairul Agasta \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #. Description #: ../i2p.templates:2001 msgid "Should the I2P router be started at boot?" -msgstr "Apakah router I2P perlu dimuali saat boot?" +msgstr "Apakah router I2P perlu memulai saat boot?" #. Type: boolean #. Description @@ -30,7 +30,7 @@ msgstr "Apakah router I2P perlu dimuali saat boot?" msgid "" "The I2P router can be run as a daemon that starts automatically when your " "computer boots up. This is the recommended configuration." -msgstr "Router I2P dapat dijalankan sebagai daemon yang memulai secara otomatis ketika komputer Anda booting. Ini adalah konfigurasi yang direkomendasikan." +msgstr "Router I2P dapat dijalankan sebagai daemon yang memulai secara otomatis ketika komputer anda booting. Ini adalah konfigurasi yang direkomendasikan." #. Type: string #. Description @@ -80,7 +80,7 @@ msgstr "Router bandwidth tinggi, seperti halnya router dengan banyak torrent / p #. Description #: ../i2p.templates:5001 msgid "Run I2P daemon confined with AppArmor" -msgstr "" +msgstr "Jalankan daemon I2P yang dibatasi dengan AppArmor" #. Type: boolean #. Description @@ -88,4 +88,4 @@ msgstr "" msgid "" "With this option enabled I2P will be sandboxed with AppArmor, restricting " "which files and directories may be accessed by I2P." -msgstr "" +msgstr "Dengan mengaktifkan opsi ini I2P akan di sandboxkan dengan AppArmor, membatasi file dan direktori mana yang dapat diakses oleh I2P." diff --git a/debian/po/pl.po b/debian/po/pl.po index 64484263a..08cac081d 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -4,13 +4,14 @@ # # Translators: # PolishAnon , 2011, 2012 +# seb, 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2015-02-18 22:14+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2015-06-09 20:57+0000\n" +"Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -80,7 +81,7 @@ msgstr "Rutery z wysoka przepustowościa oraz rutery z wieloma aktywnymi torrent #. Description #: ../i2p.templates:5001 msgid "Run I2P daemon confined with AppArmor" -msgstr "" +msgstr "Uruchom I2P deamon ograniczony przez AppArmor" #. Type: boolean #. Description @@ -88,4 +89,4 @@ msgstr "" msgid "" "With this option enabled I2P will be sandboxed with AppArmor, restricting " "which files and directories may be accessed by I2P." -msgstr "" +msgstr "Z tą opcją I2P będzie w sandboxie z AppArmor, broniąc plików i folderów do których I2P mogłoby mieć dostęp." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 067db03f3..4898209fd 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# blueboy, 2014 +# blueboy, 2014-2015 # Victor Maximiliano , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2015-02-18 22:14+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" +"PO-Revision-Date: 2015-06-10 17:27+0000\n" +"Last-Translator: blueboy\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "O roteador I2P pode rodar como um daemon que inicia automaticamente quan #. Description #: ../i2p.templates:3001 msgid "I2P daemon user:" -msgstr "Usuário I2P daemon:" +msgstr "Usuário daemon I2P:" #. Type: string #. Description @@ -75,13 +75,13 @@ msgstr "Por omissão, será permitido ao roteador I2P usar apenas até 128 MB de msgid "" "High bandwidth routers, as well as routers with a lot of active torrents / " "plugins, may need to have this value increased." -msgstr "Roteadores de alta velocidade, assim como roteadores com uma porção de torrents / plugins ativos, talvez precisem que esse valor seja aumentado." +msgstr "Roteadores de alta velocidade, assim como roteadores com uma porção de torrents / extensões ativas, talvez precisem ter esse valor aumentado." #. Type: boolean #. Description #: ../i2p.templates:5001 msgid "Run I2P daemon confined with AppArmor" -msgstr "" +msgstr "Confinar a execução do daemon I2P com AppArmor" #. Type: boolean #. Description @@ -89,4 +89,4 @@ msgstr "" msgid "" "With this option enabled I2P will be sandboxed with AppArmor, restricting " "which files and directories may be accessed by I2P." -msgstr "" +msgstr "Com essa opção selecionada, o roteador I2P funcionará confinado pelo AppArmor, sendo restritos os arquivos e diretórios passíveis de acesso." diff --git a/debian/po/zh.po b/debian/po/zh.po index cd6466b54..9d2492837 100644 --- a/debian/po/zh.po +++ b/debian/po/zh.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" "POT-Creation-Date: 2015-02-18 22:14+0000\n" -"PO-Revision-Date: 2015-03-29 15:00+0000\n" +"PO-Revision-Date: 2015-06-07 16:29+0000\n" "Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ msgid "" " a daemon. To use an **existing** I2P profile you may enter a different " "account name here. For example, if your previous I2P installation is at " "/home/user/i2p, you may enter 'user' here." -msgstr "I2P后台服务默认以i2psvc账户运行。要使用*已有*的I2P配置文件，您可以输入不同的账户名。例如，如果您之前的I2P安装在 /home/user/i2p，此处可输入'user'。" +msgstr "I2P后台服务默认以 i2psvc 账户运行。要使用*已有*的I2P配置文件，您可以输入不同的账户名。例如，如果您之前的I2P安装在 /home/user/i2p，此处可输入 'user'。" #. Type: string #. Description @@ -55,19 +55,19 @@ msgstr "I2P后台服务默认以i2psvc账户运行。要使用*已有*的I2P配 msgid "" "Very important: If a user other than the default of 'i2psvc' is entered " "here, the chosen username *MUST* already exist." -msgstr "重要：如果您输入默认'i2psvc'以外的账户，此账户务必已经存在。" +msgstr "重要：如果您输入默认的 'i2psvc' 以外的账户，此账户必须已经存在。" #. Type: string #. Description #: ../i2p.templates:4001 msgid "Memory that can be allocated to I2P:" -msgstr "I2P 可用最大内存：" +msgstr "I2P 最多可占用内存：" #. Type: string #. Description #: ../i2p.templates:4001 msgid "By default, I2P will only be allowed to use up to 128MB of RAM." -msgstr "I2P 默认最大内存128M。" +msgstr "默认情况下，I2P 最多只允许使用 128MB 系统内存。" #. Type: string #. Description diff --git a/installer/resources/locale/po/messages_pt_BR.po b/installer/resources/locale/po/messages_pt_BR.po index 150a70c83..4c4f03836 100644 --- a/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po @@ -4,14 +4,16 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# testsubject67 , 2014 # blueboy, 2013 +# blueboy, 2015 # blueboy, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" -"PO-Revision-Date: 2014-01-31 16:45+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" +"PO-Revision-Date: 2015-05-07 03:44+0000\n" "Last-Translator: blueboy\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -20,180 +22,180 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" -msgstr "Falha ao carregar o empacotador." +msgstr "Falha ao carregar o encapsulador." -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME já está sendo executado." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Executando $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Esperando por $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "AVISO: $APP_LONG_NAME talvez tenha falhado ao inicializar." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Esta ação exige previlégios de root para ser realizada." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Inicializando $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Interrompendo $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME não estava sendo executado." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Impossibilitado de interromper $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Aguardando $APP_LONG_NAME terminar" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Falha ao interromper $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." -msgstr "" +msgstr "$APP_LONG_NAME parado." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" -msgstr "" +msgstr "Graciosamente parando $APP_LONG_NAME" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." -msgstr "" +msgstr "$APP_LONG_NAME não está sendo executado" -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" -msgstr "" +msgstr "$APP_LONG_NAME está sendo executado: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -msgstr "" +msgstr "$APP_LONG_NAME está sendo executado: PID:$pid, Envoltório:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." -msgstr "" +msgstr "O daemon $APP_LONG_NAME já está instalado" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" -msgstr "" +msgstr "Instalando o daemon $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "A instalação não possui atualmente suporte para $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" -msgstr "" +msgstr "Removendo daemon $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." -msgstr "" +msgstr "O daemon $APP_LONG_NAME não está instalado." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" -msgstr "" +msgstr "Remoção não suportada por $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Comandos:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." -msgstr "" +msgstr "Lançar em atual console." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Inicializar executando ao fundo, como um processo daemon." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Pare se estiver sendo executado como um daemon ou em um outro console." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." -msgstr "" +msgstr "Graciosamente pare, poderá demorar até 11 minutos." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Pare, se estiver sendo executado, e então inicialize." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Reinicialize apenas se já estiver sendo executado." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." -msgstr "" +msgstr "Duvide do status atual." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." -msgstr "" +msgstr "Instalar para automaticamente começar com o sistema." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Desinstalar." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." -msgstr "" +msgstr "Solicitar um despejo de thread se está sendo executado." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Por favor, edite i2prouter e especifique a variável RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Executar o roteador I2P como usuário root *não* é recomendado." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true." diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 987fc2f75..78754ef28 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 = 19; + public final static long BUILD = 20; /** for example "-test" */ public final static String EXTRA = "-rc"; From 9efe60d7a88bdcbfe2aad5415da70271c631b445 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 27 Jul 2015 18:10:01 +0000 Subject: [PATCH 120/258] Fix processing of translated news --- .../java/src/net/i2p/router/update/NewsFetcher.java | 4 +++- history.txt | 6 ++++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index aa2782e68..d6876383c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -406,7 +406,9 @@ class NewsFetcher extends UpdateRunner { if (_tempFile.exists() && _tempFile.length() > 0) { File from; - if (url.endsWith(".su3")) { + // TODO check magic number instead? + // But then a corrupt file would be displayed as-is... + if (url.endsWith(".su3") || url.contains(".su3?")) { try { from = processSU3(); } catch (IOException ioe) { diff --git a/history.txt b/history.txt index 53111fedb..61a02c768 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2015-07-27 zzz + * Update: Fix processing of translated news su3 files + +2015-07-26 zzz + * Update translations + 2015-07-25 zzz * i2psnark: Fix total_size in metadata message (ticket #1618) * NetDB: Fix NPE (ticket #1619) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 78754ef28..601535dbe 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 = "-rc"; From 0bf9cb3bf2a68712d89616e9dbef88715b9ae676 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 28 Jul 2015 13:55:10 +0000 Subject: [PATCH 121/258] add news cert --- .../news/ampernand_at_gmail.com.crt | 32 +++++++++++++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 installer/resources/certificates/news/ampernand_at_gmail.com.crt diff --git a/installer/resources/certificates/news/ampernand_at_gmail.com.crt b/installer/resources/certificates/news/ampernand_at_gmail.com.crt new file mode 100644 index 000000000..70956369b --- /dev/null +++ b/installer/resources/certificates/news/ampernand_at_gmail.com.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFhTCCA22gAwIBAgIEGdD2PTANBgkqhkiG9w0BAQ0FADBzMQswCQYDVQQGEwJY +WDELMAkGA1UECBMCWFgxCzAJBgNVBAcTAlhYMR4wHAYDVQQKExVJMlAgQW5vbnlt +b3VzIE5ldHdvcmsxDDAKBgNVBAsTA0kyUDEcMBoGA1UEAwwTYW1wZXJuYW5kQGdt +YWlsLmNvbTAeFw0xNTA3MjIxMjMxMTBaFw0yNTA3MjExMjMxMTBaMHMxCzAJBgNV +BAYTAlhYMQswCQYDVQQIEwJYWDELMAkGA1UEBxMCWFgxHjAcBgNVBAoTFUkyUCBB +bm9ueW1vdXMgTmV0d29yazEMMAoGA1UECxMDSTJQMRwwGgYDVQQDDBNhbXBlcm5h +bmRAZ21haWwuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjpTU +nBYHsqpQbAodtOQlEaRTMMI4YUi+JBMNEmlU2/9MozW13xxFr6brfgYTje0dTTgN +eGe/pvDM7H/a5ppSIEFCGDnn9mwrciIjHMaXeb7Z4cvxwFVwOxMclsFiw/+3sHQj +GyoR6TQQfsIupdtKwedmBQgVmHU+UKg3WKCyaE6J7DNHa0/nD4vtW+vaXFpv8o1w +PqEOar1Y34glxq6NTiivgGFtckBWkFLTQNjOAh/uSsdhnSDKiNHKFa3mNzjm2glf +B0ETP3yOMkEbVf9tTanlJbYsMEpfeajymGd5+P1S/2Eo0c2MlJOvLkLXAvXMdHzK +kmOTsSn/65bm5Rc2X+GQflLJlC0kuBoIyTXqFiAY7CN5y4F9llbjQ91CE2WgRv5U +dGcEilAjE36ZenQvHlKfHEs0SLAfb86GA0R5cBPQeTZq3AEqAJ9NaFgFzGvKzlJ/ +8c3JeOMyc/1YwodoWwhuNICGijAA5X7MUrJVZAh4Z18ZoOd3ITkUz/ugkHhmFU3Z +vV8LrHUoIiZxTsjSxhxYz7JHQa3eZQty4/66j+FXZThzwBm419RlXLnHVURwwQaX +znC7qYUE0YeiHDw4NaGwM8qlayPYMyD8sggZfXDH+SoeJBCji6zfgbdpF/aEsQhi +++/SWDNJfy6V1TQL5AXpmJEZmUTnZKm7paJfgyUCAwEAAaMhMB8wHQYDVR0OBBYE +FIBx9Nz6oPIgX8pKgmL04wxFkVWuMA0GCSqGSIb3DQEBDQUAA4ICAQAMsHfnEB/q +p8ToRmythRTiDjgSEc0VDOzKdizieJtFcFgK0WEzpuTeTXo012bTCv+qE5wWf32d +Lgv49PDJw+j8spkkdZzO6GIRhbI1C/4sCPe6p6ev/a3SZIbUi4NGIW48DeEIArjt +AwF94b3v4t067oZ1rNIHgdiKvqIMdztPiyqOjcx1/iuFDkrOnByqvWXVmOxHGskZ +F7CqId1/WVRCdzVYK6Ln5HwDHfZr8EYWTZE6zUd5osHJMYeitRYBtk7tylrDk3uP +88BD/fHRxc5+hBKEhVHua7Arm9R2CPvgK352dyxIpoiGuOUr98A8tM08pU6gNnuO +OZ7LU+5+Oc8FqPuUyhogwgDuBFA7s0fx464F1jofVPWOlarNZq7Mc0AwlA6jwLRY +1HExOlKkMbhALSOOAnSypozxFg1t8bkb0QUaUuz7Rck3gKvHX99mqzl7Ql6ZS4rm +umJNDEsGh0F6dxEQJ+b2I7NbSpGEf8PaUM5jASZeQncjPCMfBjPC8QwzYySLad5Y +n9e9sZN92zPYetdiQfpHwRY4N8itb4rb6TpwiSG6vVVvQJdFt77Y+4MtgFm9ofqA +ZDOBxt0r2AOT4Jrj92ifCKLDjevTaZjCSS2lPMMZbxoL+TXvNu12IKCm9rKn/+oP +WX+lDNy2nNJXrnKSvcyrBWxAi8+t0ZzGug== +-----END CERTIFICATE----- diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 601535dbe..a85b0c8aa 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 = "-rc"; From 9b466f3261145cc439fef3c25793002a715de6d9 Mon Sep 17 00:00:00 2001 From: kytv Date: Thu, 30 Jul 2015 06:52:18 +0000 Subject: [PATCH 122/258] refresh debian patch so my automated update builds will run again --- debian/patches/0001-path-substitution.patch | 141 +++++++++++--------- 1 file changed, 76 insertions(+), 65 deletions(-) diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index e4cb1fcac..f7d9c5b28 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -345,17 +345,17 @@ Debian wrapper.config to try to prevent confusion. @@ -195,15 +195,15 @@ msgstr "Falls gestartet, fordere einen Java Thread dump an" - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -367,16 +367,16 @@ Debian wrapper.config to try to prevent confusion. @@ -185,7 +185,7 @@ msgstr "" - #: ../i2prouter:1825 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" msgstr "" - #: ../i2prouter:1830 + #: ../i2prouter:1869 @@ -193,5 +193,5 @@ msgstr "" - #: ../i2prouter:1833 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -385,16 +385,16 @@ Debian wrapper.config to try to prevent confusion. @@ -187,7 +187,7 @@ msgstr "" - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" msgstr "" - #: ../i2prouter:1812 + #: ../i2prouter:1869 @@ -195,5 +195,5 @@ msgstr "" - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -403,57 +403,59 @@ Debian wrapper.config to try to prevent confusion. @@ -187,13 +187,13 @@ msgstr "请求Java转储(如果在运行)。" - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "请编辑 /etc/default/i2p 设置 RUN_AS_USER 变量" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "推荐 *不要* 以 root 身份运行 I2P 。" - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。" +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgstr "要以root运行，请编辑 /etc/default/i2p 并设置 ALLOW_ROOT=true。" --- a/installer/resources/locale/po/messages_tr.po +++ b/installer/resources/locale/po/messages_tr.po -@@ -186,13 +186,13 @@ +@@ -188,15 +188,15 @@ msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin." - #: ../i2prouter:1796 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "/etc/default/i2p dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" - #: ../i2prouter:1801 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*." - #: ../i2prouter:1804 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." --msgstr "Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın." -+msgid "To run as root anyway, edit /etc/defalt/i2p and set ALLOW_ROOT=true." -+msgstr "Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın." ++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." + msgstr "" +-"Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve " ++"Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve " + "ALLOW_ROOT=true ayarını yapın." --- a/installer/resources/locale/po/messages_es.po +++ b/installer/resources/locale/po/messages_es.po @@ -193,15 +193,15 @@ msgstr "Solicitar un volcado del hilo JAVA si se está ejecutando." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Por favor edite i2prouter e introduzca la variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Por favor edite /etc/default/i2p e introduzca la variable RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "\"No\" se recomienda ejecutar I2P como root." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -465,17 +467,17 @@ Debian wrapper.config to try to prevent confusion. @@ -189,15 +189,15 @@ msgstr "Requisitar o histórico Java se iniciado." - #: ../i2prouter:1796 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Favor editar o arquivo i2prouter e configurar a variável RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Favor editar o arquivo /etc/default/i2p e configurar a variável RUN_AS_USER" - #: ../i2prouter:1801 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Iniciar I2P como permissões root *não* é recomendado." - #: ../i2prouter:1804 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -487,18 +489,18 @@ Debian wrapper.config to try to prevent confusion. @@ -190,8 +190,8 @@ msgstr "Request a Java thread dump if running." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Veuillez éditer i2prouter et paramétrer la variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Veuillez éditer /etc/default/i2p et paramétrer la variable RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." @@ -199,7 +199,7 @@ "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -507,40 +509,43 @@ Debian wrapper.config to try to prevent confusion. "ALLOW_ROOT=true." --- a/installer/resources/locale/po/messages_ru.po +++ b/installer/resources/locale/po/messages_ru.po -@@ -191,13 +191,13 @@ +@@ -193,16 +193,16 @@ msgstr "Запросить дамп нитей Java, если запущено." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" --msgstr "Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" -+msgstr "Пожалуйста, отредактируйте /etc/default/i2p и установите переменную RUN_AS_USER" + msgstr "" +-"Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER" ++"Пожалуйста, отредактируйте /etc/default/i2p и установите переменную RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Запускать I2P от имени root'а *НЕ* рекомендуется." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." --msgstr "Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." -+msgstr "Чтобы всё равно запустить под root'ом, отредактируйте /etc/default/i2p и установите ALLOW_ROOT=true." + msgstr "" +-"Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите " ++"Чтобы всё равно запустить под root'ом, отредактируйте /etc/default/i2p и установите " + "ALLOW_ROOT=true." --- a/installer/resources/locale/po/messages_sv.po +++ b/installer/resources/locale/po/messages_sv.po @@ -187,14 +187,14 @@ msgstr "Fråga efter en Java thread dump vid drift." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Var god ändra i2prouter och set variabeln RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Var god ändra /etc/default/i2p och set variabeln RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Att köra I2P som användare root är *inte* rekommenderat." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -551,17 +556,17 @@ Debian wrapper.config to try to prevent confusion. @@ -187,15 +187,15 @@ msgstr "Solicitarea dump-ului firului Java daca este pornit" - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Vă rugăm să editați i2prouter și setați variabila RUN_AS_USER " +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Vă rugăm să editați /etc/default/i2p și setați variabila RUN_AS_USER " - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Rularea I2P ca root *nu* este recomandată." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." msgstr "" @@ -570,81 +575,87 @@ Debian wrapper.config to try to prevent confusion. "true." --- a/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po -@@ -187,13 +187,13 @@ - msgstr "" +@@ -190,15 +190,15 @@ + msgstr "Solicitar um despejo de thread se está sendo executado." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Por favor, edite i2prouter e especifique a variável RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Por favor, edite /etc/default/i2p e especifique a variável RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Executar o roteador I2P como usuário root *não* é recomendado." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." --msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." -+msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite /etc/default/i2p e ponha ALLOW_ROOT=true." + msgstr "" + "De qualquer forma, se quiser mesmo executar o roteador como root, edite " +-"i2prouter e ponha ALLOW_ROOT=true." ++"/etc/default/i2p e ponha ALLOW_ROOT=true." --- a/installer/resources/locale/po/messages_pl.po +++ b/installer/resources/locale/po/messages_pl.po -@@ -186,13 +186,13 @@ +@@ -191,13 +191,13 @@ msgstr "Zażądaj zrzutu wątków Java jeśli jest uruchomiona." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Proszę edytuj i2prouter i ustaw zmienną RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Proszę edytuj /etc/default/i2p i ustaw zmienną RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Nie jest polecane uruchamianie I2P jako root." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Aby uruchomić jako root, edytuj i2prouter i ustaw ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgstr "Aby uruchomić jako root, edytuj /etc/default/i2p i ustaw ALLOW_ROOT=true." --- a/installer/resources/locale/po/messages_ja.po +++ b/installer/resources/locale/po/messages_ja.po -@@ -186,13 +186,13 @@ +@@ -189,15 +189,15 @@ msgstr "起動中の場合、 Java スレッドダンプを要求" - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "i2prouter を編集して、変数 RUN_AS_USER を設定してください" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "/etc/default/i2p を編集して、変数 RUN_AS_USER を設定してください" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "root ユーザーとしての I2P の起動は推奨され*ません*。" - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." --msgstr "とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定する。" +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." -+msgstr "とにかく root として起動し、/etc/default/i2p を編集して、ALLOW_ROOT=true と設定する。" + msgstr "" +-"とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定す" ++"とにかく root として起動し、 /etc/default/i2p を編集して、ALLOW_ROOT=true と設定す" + "る。" --- a/installer/resources/locale/po/messages_sk.po +++ b/installer/resources/locale/po/messages_sk.po -@@ -187,13 +187,13 @@ +@@ -189,15 +189,15 @@ msgstr "Vyžiadať zrušenie vlákna Javy, ak je spustený." - #: ../i2prouter:1807 + #: ../i2prouter:1864 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Prosím upravte i2prouter a nastavte premennú RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Prosím upravte /etc/default/i2p a nastavte premennú RUN_AS_USER" - #: ../i2prouter:1812 + #: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Spúšťať I2P ako root *nie* je odporúčané." - #: ../i2prouter:1815 + #: ../i2prouter:1872 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." --msgstr "Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." -+msgstr "Ak ho chcete spustiť ako root aj tak, upravte /etc/default/i2p a nastavte ALLOW_ROOT=true." + msgstr "" +-"Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte " ++"Ak ho chcete spustiť ako root aj tak, upravte /etc/default/i2p a nastavte " + "ALLOW_ROOT=true." From b4993d42b32dd037f11201815948ef2489b4341d Mon Sep 17 00:00:00 2001 From: kytv Date: Thu, 30 Jul 2015 07:11:45 +0000 Subject: [PATCH 123/258] updated i2prouter po files (deb related) --- installer/resources/locale/po/messages_de.po | 94 +++++++-------- installer/resources/locale/po/messages_es.po | 94 +++++++-------- installer/resources/locale/po/messages_fr.po | 94 +++++++-------- installer/resources/locale/po/messages_id.po | 111 +++++++++--------- installer/resources/locale/po/messages_it.po | 94 +++++++-------- installer/resources/locale/po/messages_ja.po | 109 +++++++++-------- installer/resources/locale/po/messages_nl.po | 106 +++++++++-------- installer/resources/locale/po/messages_pl.po | 111 +++++++++--------- installer/resources/locale/po/messages_pt.po | 94 +++++++-------- .../resources/locale/po/messages_pt_BR.po | 11 +- installer/resources/locale/po/messages_ro.po | 94 +++++++-------- installer/resources/locale/po/messages_ru.po | 111 +++++++++--------- installer/resources/locale/po/messages_sk.po | 108 +++++++++-------- installer/resources/locale/po/messages_sv.po | 94 +++++++-------- installer/resources/locale/po/messages_tr.po | 110 ++++++++--------- installer/resources/locale/po/messages_zh.po | 94 +++++++-------- 16 files changed, 780 insertions(+), 749 deletions(-) diff --git a/installer/resources/locale/po/messages_de.po b/installer/resources/locale/po/messages_de.po index 465ada251..c8c499a4c 100644 --- a/installer/resources/locale/po/messages_de.po +++ b/installer/resources/locale/po/messages_de.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-09 18:07+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-12-04 18:54+0000\n" "Last-Translator: kytv \n" "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/" @@ -24,185 +24,185 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Wrapper konnte nicht geladen werden." -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME läuft bereits." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Führe $APP_LONG_NAME aus" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Warte auf $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "WARNUNG: Das Starten von $APP_LONG_NAME könnte fehlgeschlagen sein" -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Nur root kann diese Aktion durchführen." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Starte $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Stoppe $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME wurde nicht ausgeführt." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Konnte $APP_LONG_NAME nicht beenden." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Warte auf die Beendigung von $APP_LONG_NAME." -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Beenden von $APP_LONG_NAME fehlgeschlagen." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME wurde beendet." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Beende $APP_LONG_NAME ordnungsgemäß." -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME wird nicht ausgeführt." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME wird ausgeführt: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" "$APP_LONG_NAME wird ausgeführt: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "Der $APP_LONG_NAME Dämon ist bereits installiert." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Installiere den $APP_LONG_NAME Dämon" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Die Installation für $DIST_OS wird momentan nicht unterstützt" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Entferne $APP_LONG_NAME Dämon" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "Der $APP_LONG_NAME Dämon ist momentan nicht installiert." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Entfernen wird momentan unter $DIST_OS nicht unterstützt." -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Befehle:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Start in dieser Konsole." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Im Hintergrund als Dämon starten." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "" "Beende den Router, falls er als Dämon oder in einer anderen Konsole " "ausgeführt wird." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Ordnungsgemäßes Beenden kann bis zu 11 Minuten dauern." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "" "Beende den Router, falls er ausgeführt wird und dann starte ihn erneut." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Starte den Router neu, falls er momentan ausgeführt wird." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Aktuellen Status abfragen." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Installiere für automatischen Start wenn das System hochfährt." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Deinstallieren." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Falls gestartet, fordere einen Java Thread dump an" -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze " diff --git a/installer/resources/locale/po/messages_es.po b/installer/resources/locale/po/messages_es.po index 7b8d3fa30..fd12737dc 100644 --- a/installer/resources/locale/po/messages_es.po +++ b/installer/resources/locale/po/messages_es.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 19:59+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-08-11 14:15+0000\n" "Last-Translator: kytv \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/I2P/language/" @@ -24,183 +24,183 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Falló al cargar el " -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME está aún ejecutándose" -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Ejecutando $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Esperando a $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "CUIDADO: puede que $APP_LONG_NAME haya fallado al iniciarse." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Debe ser root para realizar esta acción" -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Iniciando $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Deteniendo $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME no estaba en ejecución." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "No se pudo detener $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Esperando a que salga de $APP_LONG_NAME" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "No se pudo detener $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Se detuvo $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Deteniendo $APP_LONG_NAME elegantemente" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME no está en ejecución." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME está en ejecución: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" "$APP_LONG_NAME ejecutándose: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "$APP_LONG_NAME está aún instalado" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Instalando el demonio $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "La instalación no está aún soportada por $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Eliminando el demonio $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "El demonio $APP_LONG_NAME no está instalado actualmente." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Eliminar no está actualmente soportado por $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Órdenes:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Ejecutar en la consola actual." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Iniciar en segundo plano como un proceso de demonio." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "" "Parar en caso de que esté ejecutándose como un demonio o en otra consola." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Parada segura, puede tardar hasta 11 minutos." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Parar si está ejecutándose y entonces iniciar." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Reiniciar sólo si ya se está ejecutando." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Consultar el estado actual." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Instalar para que se inicie automáticamente con el sistema." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Desinstalar." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Solicitar un volcado del hilo JAVA si se está ejecutando." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Por favor edite i2prouter e introduzca la variable RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "\"No\" se recomienda ejecutar I2P como root." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "Para ejecutar como root de todos modos, edite i2prouter y ponga la variable " diff --git a/installer/resources/locale/po/messages_fr.po b/installer/resources/locale/po/messages_fr.po index 8b2cb92a3..240be5675 100644 --- a/installer/resources/locale/po/messages_fr.po +++ b/installer/resources/locale/po/messages_fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:01+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-08-11 15:53+0000\n" "Last-Translator: kytv \n" "Language-Team: French (http://www.transifex.com/projects/p/I2P/language/" @@ -21,184 +21,184 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Echec de chargement du wrapper" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME fonctionne déjà." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Lancement de $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Attente de $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "AVERTISSEMENT : $APP_LONG_NAME peut avoir échoué à démarrer." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Vous devez être root pour accomplir cette action." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Démarrage de $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Arrêt de $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME ne fonctionnait pas." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Incapable de stopper $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "En attente que $APP_LONG_NAME existe" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Echec à stopper $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Stoppé $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Arrête $APP_LONG_NAME gracieusement" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME ne tourne pas." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME fait tourner: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" "$APP_LONG_NAME fait tourner: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "Le démon de $APP_LONG_NAME est déjà installé." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Installing le démon de $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Installation actuellement pas prise en charge pour $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Supprime le démon $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "Le démon $APP_LONG_NAME n'est actuellement pas installé." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Suppression actuellement pas prise en charge pour $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Commandes :" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Lancer dans la console actuelle." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Démarre en tâche de fond comme un processus démon." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Stopper s'il fonctionne comme un démon ou dans une autre console." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Stopper gracieusement, peut prendre jusqu'à 11 minutes." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Stopper si il marche et ensuite démarrer." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Redémarrer seulement si il est déjà en cours d'exécution." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Interroger l'état actuel." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "" "Installer pour lancer automatiquement quand le système système démarre." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Désinstalle." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Request a Java thread dump if running." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Veuillez éditer i2prouter et paramétrer la variable RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "" "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "Pour exécuter en tant que root de toute façon, éditer i2prouter et mettre " diff --git a/installer/resources/locale/po/messages_id.po b/installer/resources/locale/po/messages_id.po index 877ee8d66..e755c2369 100644 --- a/installer/resources/locale/po/messages_id.po +++ b/installer/resources/locale/po/messages_id.po @@ -2,197 +2,200 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # Khairul Agasta , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 18:28+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2014-08-29 06:04+0000\n" "Last-Translator: Khairul Agasta \n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/id/)\n" +"Language-Team: Indonesian (http://www.transifex.com/projects/p/I2P/language/" +"id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Gagal memuat wrapper" -#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069 -#: ../i2prouter:1090 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME sudah berjalan." -#: ../i2prouter:954 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Menjalankan $APP_LONG_NAME" -#: ../i2prouter:974 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Menunggu $APP_LONG_NAME" -#: ../i2prouter:1021 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "PERINGATAN: $APP_LONG_NAME mungkin gagal memulai." -#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Harus sudah root untuk melaksanakan tindakan ini." -#: ../i2prouter:1079 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Memulai $APP_LONG_NAME" -#: ../i2prouter:1101 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Menghentikan $APP_LONG_NAME" -#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME tidak berjalan." -#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Tidak dapat menghentikan $APP_LONG_NAME." -#: ../i2prouter:1144 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Menunggu $APP_LONG_NAME untuk mengakhiri" -#: ../i2prouter:1158 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Gagal menghentikan $APP_LONG_NAME." -#: ../i2prouter:1161 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME dihentikan." -#: ../i2prouter:1169 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Menghentikan $APP_LONG_NAME dengan halus" -#: ../i2prouter:1215 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME tidak berjalan." -#: ../i2prouter:1220 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME sedang berjalan: PID:$pid" -#: ../i2prouter:1223 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -msgstr "$APP_LONG_NAME sudah berjalan: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" +msgstr "" +"$APP_LONG_NAME sudah berjalan: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324 -#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439 -#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "Daemon $APP_LONG_NAME sudah terpasang." -#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428 -#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508 -#: ../i2prouter:1543 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Memasang daemon $APP_LONG_NAME" -#: ../i2prouter:1550 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Memasang saat ini tidak didukung untuk $DIST_OS" -#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602 -#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661 -#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Menghapus daemon $APP_LONG_NAME" -#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606 -#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655 -#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "Daemon $APP_LONG_NAME saat ini belum dipasang" -#: ../i2prouter:1715 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Menghapus saat ini tidak didukung untuk $DIST_OS" -#: ../i2prouter:1802 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Perintah:" -#: ../i2prouter:1803 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Luncurkan dalam konsol saat ini." -#: ../i2prouter:1804 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Mulai di latar sebagai proses daemon." -#: ../i2prouter:1805 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Hentikan jika berjalan sebagai daemon atau pada konsol lain." -#: ../i2prouter:1806 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Menghentikan dengan halus, bisa memakan waktu hingga 11 menit." -#: ../i2prouter:1807 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Hentikan jika berjalan dan kemudian memulainya." -#: ../i2prouter:1808 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Memulai ulang hanya jika sudah berjalan." -#: ../i2prouter:1809 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Menanyakan status saat ini." -#: ../i2prouter:1810 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Pasang untuk memulai secara otomatis ketika sistem boot." -#: ../i2prouter:1811 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Copot." -#: ../i2prouter:1812 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Meminta thread buangan Java jika berjalan." -#: ../i2prouter:1825 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Silahkan mengedit i2prouter dan setel variabel RUN_AS_USER" +#: ../i2prouter:1864 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "Silahkan mengedit /etc/default/i2p dan setel variabel RUN_AS_USER" -#: ../i2prouter:1830 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Menjalankan I2P sebagai pengguna root adalah *tidak* direkomendasikan." -#: ../i2prouter:1833 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Untuk menjalankan sebagai root, edit i2prouter dan setel ALLOW_ROOT=true." +#: ../i2prouter:1872 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgstr "" +"Untuk menjalankan sebagai root, edit /etc/default/i2p dan setel ALLOW_ROOT=true." diff --git a/installer/resources/locale/po/messages_it.po b/installer/resources/locale/po/messages_it.po index 1375c3407..8fb4ed3c2 100644 --- a/installer/resources/locale/po/messages_it.po +++ b/installer/resources/locale/po/messages_it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:02+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-01-10 21:29+0000\n" "Last-Translator: BadCluster \n" "Language-Team: Italian (http://www.transifex.com/projects/p/I2P/language/" @@ -20,180 +20,180 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "" -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "" -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "" -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "" -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "" -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "" -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Istallazione non ancora supportata per $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "" -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Comandi:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "" -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "" -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "" -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "" -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "" -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "" -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "" -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "" -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "" -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "" -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "" -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" diff --git a/installer/resources/locale/po/messages_ja.po b/installer/resources/locale/po/messages_ja.po index 47260ffc2..294c82c74 100644 --- a/installer/resources/locale/po/messages_ja.po +++ b/installer/resources/locale/po/messages_ja.po @@ -2,197 +2,202 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # plazmism , 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2014-02-13 11:19+0000\n" "Last-Translator: plazmism \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/" +"ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "ラッパーの読み込みに失敗" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME がすでに起動中です。" -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "$APP_LONG_NAME を起動中" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "$APP_LONG_NAME を待機中" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "警告: $APP_LONG_NAME は開始に失敗したかもしれません。" -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "このアクションを実行するには、rootである必要があります。" -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "$APP_LONG_NAME を起動中" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "$APP_LONG_NAME を停止中" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME は起動していませんでした。" -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "$APP_LONG_NAME を停止できません。" -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "$APP_LONG_NAME が終了するのを待っています" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "$APP_LONG_NAME の停止に失敗しました。" -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME が停止しました。" -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "$APP_LONG_NAME を適切に停止中" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME は起動していません。" -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME は起動しています: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -msgstr "$APP_LONG_NAME は起動しています: PID:$pid、 ラッパー:$STATUS、 Java:$JAVASTATUS" +msgstr "" +"$APP_LONG_NAME は起動しています: PID:$pid、 ラッパー:$STATUS、 Java:" +"$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "$APP_LONG_NAME デーモンはすでにインストールされています。" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "$APP_LONG_NAME のデーモンをインストール中" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "$DIST_OS に現在サポートされていないインストール" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "$APP_LONG_NAME デーモンを削除中" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "$APP_LONG_NAME daemon は現在インストールされていません。" -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "$DIST_OS に現在サポートされていない削除" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "コマンド:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "現在のコンソールで起動。" -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "デーモンプロセスとしてバックグラウンドで開始" -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "デーモンとして、あるいは他のコンソールで起動中の場合停止" -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "適切に停、最大11分掛かる恐れがあります。" -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "起動中の場合、停止してから起動" -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "すでに起動中の場合のみ再起動。" -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "現在の状態を問い合わせ" -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "インストールして、システムのブート時に自動的に起動する。" -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "アンインストール。" -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "起動中の場合、 Java スレッドダンプを要求" -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "i2prouter を編集して、変数 RUN_AS_USER を設定してください" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "root ユーザーとしての I2P の起動は推奨され*ません*。" -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定する。" +msgstr "" +"とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定す" +"る。" diff --git a/installer/resources/locale/po/messages_nl.po b/installer/resources/locale/po/messages_nl.po index 1b56d3ff6..210467672 100644 --- a/installer/resources/locale/po/messages_nl.po +++ b/installer/resources/locale/po/messages_nl.po @@ -2,197 +2,199 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # Nathan Follens, 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-06 18:28+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2015-01-18 10:33+0000\n" "Last-Translator: Nathan Follens\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/I2P/language/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Laden van wrapper mislukt" -#: ../i2prouter:943 ../i2prouter:967 ../i2prouter:1041 ../i2prouter:1069 -#: ../i2prouter:1090 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME draait al." -#: ../i2prouter:954 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "$APP_LONG_NAME draaien" -#: ../i2prouter:974 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Wachten op $APP_LONG_NAME" -#: ../i2prouter:1021 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "WAARSCHUWING: $APP_LONG_NAME is misschien niet gestart." -#: ../i2prouter:1035 ../i2prouter:1063 ../i2prouter:1269 ../i2prouter:1558 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Root vereist om deze handeling uit te voeren." -#: ../i2prouter:1079 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "$APP_LONG_NAME starten" -#: ../i2prouter:1101 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "$APP_LONG_NAME stoppen" -#: ../i2prouter:1105 ../i2prouter:1173 ../i2prouter:1726 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME draaide niet." -#: ../i2prouter:1118 ../i2prouter:1126 ../i2prouter:1188 ../i2prouter:1196 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Kon $APP_LONG_NAME niet stoppen." -#: ../i2prouter:1144 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Wachten op $APP_LONG_NAME om af te sluiten" -#: ../i2prouter:1158 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Stoppen van $APP_LONG_NAME mislukt." -#: ../i2prouter:1161 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME gestopt." -#: ../i2prouter:1169 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "$APP_LONG_NAME sierlijk stoppen" -#: ../i2prouter:1215 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME draait niet." -#: ../i2prouter:1220 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME draait: PID:$pid" -#: ../i2prouter:1223 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME draait: PID:$pid, Wrapper: $STATUS, Jave: $JAVASTATUS" -#: ../i2prouter:1276 ../i2prouter:1288 ../i2prouter:1307 ../i2prouter:1324 -#: ../i2prouter:1391 ../i2prouter:1411 ../i2prouter:1425 ../i2prouter:1439 -#: ../i2prouter:1467 ../i2prouter:1505 ../i2prouter:1540 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "De $APP_LONG_NAME daemon is al geïnstalleerd." -#: ../i2prouter:1279 ../i2prouter:1294 ../i2prouter:1396 ../i2prouter:1428 -#: ../i2prouter:1442 ../i2prouter:1456 ../i2prouter:1470 ../i2prouter:1508 -#: ../i2prouter:1543 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Bezig met installeren van de $APP_LONG_NAME daemon" -#: ../i2prouter:1550 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Installeren wordt momenteel niet ondersteund voor $DIST_OS" -#: ../i2prouter:1566 ../i2prouter:1579 ../i2prouter:1593 ../i2prouter:1602 -#: ../i2prouter:1612 ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1661 -#: ../i2prouter:1679 ../i2prouter:1692 ../i2prouter:1706 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Bezig met verwijderen van $APP_LONG_NAME daemon" -#: ../i2prouter:1572 ../i2prouter:1587 ../i2prouter:1596 ../i2prouter:1606 -#: ../i2prouter:1617 ../i2prouter:1630 ../i2prouter:1642 ../i2prouter:1655 -#: ../i2prouter:1673 ../i2prouter:1686 ../i2prouter:1700 ../i2prouter:1711 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "De $APP_LONG_NAME daemon is momenteel niet geïnstalleerd." -#: ../i2prouter:1715 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Verwijderen wordt momenteel niet ondersteund voor $DIST_OS" -#: ../i2prouter:1802 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Commando's:" -#: ../i2prouter:1803 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Starten in de huidige console." -#: ../i2prouter:1804 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Starten in de achtergrond als een daemon-proces." -#: ../i2prouter:1805 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Stop indien draaiende als een daemon of in een andere console." -#: ../i2prouter:1806 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Sierlijk stoppen, kan tot 11 minuten duren." -#: ../i2prouter:1807 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Indien draaiende, stop en start opnieuw." -#: ../i2prouter:1808 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Herstart enkel indien al draaiend." -#: ../i2prouter:1809 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "De huidige status opvragen." -#: ../i2prouter:1810 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Installeren om automatisch te starten wanneer het systeem opstart." -#: ../i2prouter:1811 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Verwijderen." -#: ../i2prouter:1812 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Vraag een Java thread dump indien draaiende." -#: ../i2prouter:1825 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Gelieve i2prouter te wijzigen en de variabele RUN_AS_USER in te stellen" +#: ../i2prouter:1864 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgstr "" +"Gelieve /etc/default/i2p te wijzigen en de variabele RUN_AS_USER in te stellen" -#: ../i2prouter:1830 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "I2P uitvoeren als root is *niet* aanbevolen." -#: ../i2prouter:1833 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Om toch als root uit te voeren, wijzig i2prouter en stel ALLOW_ROOT=true in." +#: ../i2prouter:1872 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgstr "" +"Om toch als root uit te voeren, wijzig /etc/default/i2p en stel ALLOW_ROOT=true in." diff --git a/installer/resources/locale/po/messages_pl.po b/installer/resources/locale/po/messages_pl.po index f345ede4f..9f691a9d4 100644 --- a/installer/resources/locale/po/messages_pl.po +++ b/installer/resources/locale/po/messages_pl.po @@ -2,197 +2,202 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # sebx, 2014 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2014-02-05 22:18+0000\n" "Last-Translator: sebx\n" -"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" +"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/" +"pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Nie udało uruchomić się osłony" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME jest już uruchomione." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Uruchomione $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Czeka na $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "UWAGA: $APP_LONG_NAME mogło się nie uruchomić." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Musisz mieć prawa roota, aby wykonać daną czynność." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Trwa uruchamianie $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Zatrzymywanie $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME nie było uruchomione." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Nie można zatrzymać $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Trwa czekanie na wyłączenie $APP_LONG_NAME" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Nie udało się wyłączyć $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Zatrzymano $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Zatrzymywanie $APP_LONG_NAME" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr " $APP_LONG_NAME nie jest włączone." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME jest uruchomione: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -msgstr "$APP_LONG_NAME jest uruchomione: PID:$pid, Osłona:$STATUS, Java:$JAVASTATUS" +msgstr "" +"$APP_LONG_NAME jest uruchomione: PID:$pid, Osłona:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "The $APP_LONG_NAME daemon jest już zainstalowany." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Instalacja deamona $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Instalacja nie jest obecnie obsługiwana dla $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Usuwanie deamona $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "Deamon $APP_LONG_NAME nie jest obecnie zainstalowany." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Usunięcie obecnie jest jest obsługiwane dla $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Polecenia:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Odpal w obecnej konsoli." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Uruchom w tle jako proces deamon." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." -msgstr "Zatrzymaj jeśli jest uruchomione jako deamon lub jest uruchomione w innej konsoli." +msgstr "" +"Zatrzymaj jeśli jest uruchomione jako deamon lub jest uruchomione w innej " +"konsoli." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Wdzięczne zatrzymanie może potrwać nawet 11 minut." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Zatrzymaj jeśli działa i uruchom ponownie." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Zrestartuj tylko wtedy jeśli jest już uruchomione." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Zbadaj aktualny stan." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Zainstaluj aby uruchomić automatycznie przy starcie systemu." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Odinstaluj." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Zażądaj zrzutu wątków Java jeśli jest uruchomiona." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Proszę edytuj i2prouter i ustaw zmienną RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Nie jest polecane uruchamianie I2P jako root." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "Aby uruchomić jako root, edytuj i2prouter i ustaw ALLOW_ROOT=true." diff --git a/installer/resources/locale/po/messages_pt.po b/installer/resources/locale/po/messages_pt.po index ba0907e40..5a6f715fb 100644 --- a/installer/resources/locale/po/messages_pt.po +++ b/installer/resources/locale/po/messages_pt.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-11 15:44+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-06-17 20:59+0000\n" "Last-Translator: rafaelbf\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/" @@ -21,182 +21,182 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Falha ao iniciar wrapper" -#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037 -#: ../i2prouter:1061 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME já se encontra em funcionamento." -#: ../i2prouter:919 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "$APP_LONG_NAME Iniciado" -#: ../i2prouter:942 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "À espera de $APP_LONG_NAME" -#: ../i2prouter:989 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "Aviso: $APP_LONG_NAME pode ter falhado a ser iniciado." -#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Tem de ser root para realizar esta ação." -#: ../i2prouter:1047 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "A Iniciar $APP_LONG_NAME" -#: ../i2prouter:1072 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "A encerrar $APP_LONG_NAME" -#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME não foi iniciado." -#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Incapaz de encerrar $APP_LONG_NAME." -#: ../i2prouter:1115 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "À espera de $APP_LONG_NAME para encerrar." -#: ../i2prouter:1129 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Falhou o encerramento de $APP_LONG_NAME." -#: ../i2prouter:1132 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME Encerrado." -#: ../i2prouter:1140 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "A parar $APP_LONG_NAME graciosamente" -#: ../i2prouter:1186 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME não foi iniciado." -#: ../i2prouter:1191 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME foi iniciado: PID:$pid" -#: ../i2prouter:1194 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "" "$APP_LONG_NAME foi iniciado: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295 -#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410 -#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "O daemon $APP_LONG_NAME já foi instalado." -#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399 -#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479 -#: ../i2prouter:1514 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "A instalar daemon $APP_LONG_NAME" -#: ../i2prouter:1521 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "A instalação neste momento não é suportada para $DIST_OS" -#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573 -#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632 -#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "A remover daemon $APP_LONG_NAME" -#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577 -#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626 -#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "O daemon $APP_LONG_NAME não se encontra instalado neste momento." -#: ../i2prouter:1686 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "A remoção neste momento não é suportada para $DIST_OS" -#: ../i2prouter:1773 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Comandos: " -#: ../i2prouter:1774 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Inicie na consola atual." -#: ../i2prouter:1775 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "A iniciar no background como processo daemon." -#: ../i2prouter:1776 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Pare se iniciado como daemon ou noutra consola." -#: ../i2prouter:1777 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Pare graciosamente, pode demorar ate 11 minutos." -#: ../i2prouter:1778 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Pare se iniciado e depois inicie." -#: ../i2prouter:1779 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Reinicie apenas se já estiver iniciado." -#: ../i2prouter:1780 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Consultar o status atual." -#: ../i2prouter:1781 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Instale para iniciar automaticamente quando o sistema iniciar." -#: ../i2prouter:1782 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Desinstalar." -#: ../i2prouter:1783 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Requisitar o histórico Java se iniciado." -#: ../i2prouter:1796 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Favor editar o arquivo i2prouter e configurar a variável RUN_AS_USER" -#: ../i2prouter:1801 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Iniciar I2P como permissões root *não* é recomendado." -#: ../i2prouter:1804 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "Para executar como root mesmo assim, editar o i2prouter e configurar a " diff --git a/installer/resources/locale/po/messages_pt_BR.po b/installer/resources/locale/po/messages_pt_BR.po index 4c4f03836..21cdba79e 100644 --- a/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po @@ -2,7 +2,7 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # testsubject67 , 2014 # blueboy, 2013 @@ -15,11 +15,12 @@ msgstr "" "POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2015-05-07 03:44+0000\n" "Last-Translator: blueboy\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/I2P/" +"language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: ../i2prouter:221 @@ -198,4 +199,6 @@ msgstr "Executar o roteador I2P como usuário root *não* é recomendado." #: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true." +msgstr "" +"De qualquer forma, se quiser mesmo executar o roteador como root, edite " +"i2prouter e ponha ALLOW_ROOT=true." diff --git a/installer/resources/locale/po/messages_ro.po b/installer/resources/locale/po/messages_ro.po index 453785f61..56a3a73c9 100644 --- a/installer/resources/locale/po/messages_ro.po +++ b/installer/resources/locale/po/messages_ro.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:03+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-11-11 13:00+0000\n" "Last-Translator: polearnik \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/" @@ -20,181 +20,181 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1));\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Încărcarea învelișului a eșuat" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME este deja pornit." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Pornirea $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Asteptarea $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "AVERTIZARE: $APP_LONG_NAME posibil nu au reușit să porneasca." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Trebuie să fie root pentru a efectua această acțiune." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Pornirea $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Oprirea $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME nu este pornit." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Imposibil de a opri $APP_LONG_NAME" -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Asteptarea opririi $APP_LONG_NAME" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Oprirea $APP_LONG_NAME a esuat" -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME este oprit" -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Oprirea corecta a $APP_LONG_NAME" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME nu este pornit." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME este pornit: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME este pornit: PID:$pid,invelis:$STATUS Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "Demonul $APP_LONG_NAME este deja instalat" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Instalarea demonului $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Instalarea nu este suportata în prezent pentru $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Stergerea demonului $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "Demonul $APP_LONG_NAME nu este instalat" -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Ștergerea nu este suportata în prezent pentru $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Comenzi:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Pornirea in consola curenta" -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Începe în fundal ca un proces daemon." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Oprirea dacă rulează ca un demon sau într-o altă consolă." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Oprirea corecta poate ocupa peste 11 minute" -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Oprirea dacă rulează și apoi pornește." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Repornirea numai dacă deja rulează." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Interogarea stării curentă." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Instalare pentru pornirea automata la startul sistemului." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Dezinstalează" -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Solicitarea dump-ului firului Java daca este pornit" -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Vă rugăm să editați i2prouter și setați variabila RUN_AS_USER " -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Rularea I2P ca root *nu* este recomandată." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "Pentru a rula ca root, oricum, editati i2prouter și setați ALLOW_ROOT = " diff --git a/installer/resources/locale/po/messages_ru.po b/installer/resources/locale/po/messages_ru.po index 90e4e8cb1..a46424585 100644 --- a/installer/resources/locale/po/messages_ru.po +++ b/installer/resources/locale/po/messages_ru.po @@ -2,7 +2,7 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # varnav, 2013 # nefelim4ag , 2012 @@ -14,190 +14,195 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2014-01-11 08:32+0000\n" "Last-Translator: sr4d \n" -"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" +"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/" +"language/ru_RU/)\n" +"Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Не удалось загрузить оболочку" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "Приложение \"$APP_LONG_NAME\" уже запущено." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Приложение \"$APP_LONG_NAME\" запущено" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Ожидание приложения \"$APP_LONG_NAME\"" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "Внимание: возможно, не удалось запустить $APP_LONG_NAME." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Для выполнения этого действия необходимо быть root-пользователем." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Запуск приложения \"$APP_LONG_NAME\"" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Остановка приложения \"$APP_LONG_NAME\"" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "Приложение \"$APP_LONG_NAME\" не было запущено." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Невозможно остановить приложение \"$APP_LONG_NAME\"." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Ожидание завершения работы приложения \"$APP_LONG_NAME\"" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Ошибка остановки $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Остановленно $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "$APP_LONG_NAME мягко останавливается" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME не запущен." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME запущено: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME запущено: PID:$pid, Оболочка:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "Демон $APP_LONG_NAME уже установлен." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Установка демона $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "В данный момент установка на $DIST_OS не поддерживается" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Удаляется демон: $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "$APP_LONG_NAME демон сейчас не установлен." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Установка не поддерживается для $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Команды:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Запустить в текущей консоли." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Запустить в фоне как демона." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Остановить если демон запущен в другой консоли." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Остановить медленно, может отнять до 11 минут." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Остановить если запущен и запустить." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Перезапустить только если уже запущен." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Текущий статус очереди." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Установка запустится автоматически, во время запуска системы." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Удаление." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Запросить дамп нитей Java, если запущено." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgstr "Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER" +msgstr "" +"Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Запускать I2P от имени root'а *НЕ* рекомендуется." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите ALLOW_ROOT=true." +msgstr "" +"Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите " +"ALLOW_ROOT=true." diff --git a/installer/resources/locale/po/messages_sk.po b/installer/resources/locale/po/messages_sk.po index 53d6303f1..4a40f3f54 100644 --- a/installer/resources/locale/po/messages_sk.po +++ b/installer/resources/locale/po/messages_sk.po @@ -2,7 +2,7 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # Krantišek , 2014 # Svistwarrior273 , 2014 @@ -10,190 +10,194 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 23:51+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2014-04-15 15:38+0000\n" "Last-Translator: Svistwarrior273 \n" -"Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/sk/)\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/I2P/language/" +"sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Nepodarilo sa načítať wrapper" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME je už spustená." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Spúšťa sa $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Čaká sa na $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "UPOZORNENIE: $APP_LONG_NAME môže pri štarte zlyhať." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Pre vykonanie tejto akcie musíš byť root." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Spúšťa sa $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Zastavuje sa $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME nebola sputená." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Nemožno zastaviť $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Čakám na $APP_LONG_NAME pre ukončenie" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Nepodarilo sa zastaviť $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Zastavené $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Zastavuje sa $APP_LONG_NAME elegantne" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME nie je spustená." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME je spustená: PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -msgstr "$APP_LONG_NAME je spustená: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" +msgstr "" +"$APP_LONG_NAME je spustená: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "$APP_LONG_NAME daemon je už nainštalovaný." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Inštaluje sa $APP_LONG_NAME daemon" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Inštalácia momentálne nie je podporovaná pre $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Odstraňuje sa $APP_LONG_NAME daemon" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "$APP_LONG_NAME daemon momentálne nie je nainštalovaný." -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Odstránenie momentálne nie je podporované pre $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Príkazy:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Spustiť v aktuálnej konzole." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Spustiť na pozadí ako daemon proces." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Zastaviť, ak je spustený ako daemon alebo v inej konzoli." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Zastaviť jemným spôsobom, môže to zabrať až 11 minút." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Zastaviť, ak je spustený a potom znova spustiť." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Reštartovať, iba ak je už spustený." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Poslať požiadavku na zistenie súčasného stavu." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Nainštalovať tak, aby sa spustil automaticky pri boote systému." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Odinštalovať." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Vyžiadať zrušenie vlákna Javy, ak je spustený." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Prosím upravte i2prouter a nastavte premennú RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Spúšťať I2P ako root *nie* je odporúčané." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte ALLOW_ROOT=true." +msgstr "" +"Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte " +"ALLOW_ROOT=true." diff --git a/installer/resources/locale/po/messages_sv.po b/installer/resources/locale/po/messages_sv.po index e1bd95f65..bfbfad9e8 100644 --- a/installer/resources/locale/po/messages_sv.po +++ b/installer/resources/locale/po/messages_sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:05+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-09-11 22:20+0000\n" "Last-Translator: hottuna \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/" @@ -20,181 +20,181 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Misslyckades vid laddning av wrapper" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME körs redan." -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "Kör $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "Väntar på $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "VARNING: $APP_LONG_NAME kan ha misslyckats att starta." -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Handlingen måste göras av root." -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "Startar $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "Stannar $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME kördes inte." -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "Kan inte stoppa $APP_LONG_NAME." -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "Väntar på att $APP_LONG_NAME ska avslutas" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "Misslyckades med att stanna $APP_LONG_NAME." -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "Stannad $APP_LONG_NAME." -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "Stannar $APP_LONG_NAME graciöst" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME körs inte." -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME kör: PID$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME kör: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "$APP_LONG_NAME demonen är redan installerad." -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "Installerar $APP_LONG_NAME demon" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "Installation stöds inte för $DIST_OS" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "Tar bort $APP_LONG_NAME demon" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "$APP_LONG_NAME demonen är inte installerad" -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "Borttagning stöds inte för $DIST_OS" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Kommandon:" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Kör in nuvarande konsoll." -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Starta i bakgrunden som en demon-process." -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "Stanna om demon körs i annan konsoll." -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Stanna graciöst, kan ta upp till 11 minuter." -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Stanna vid drift och starta sedan." -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Starta om vid drift." -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Fråga efter nuvarande status." -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Installera så att programmet startar vid systemstart." -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Avinstallera." -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Fråga efter en Java thread dump vid drift." -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "Var god ändra i2prouter och set variabeln RUN_AS_USER" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "Att köra I2P som användare root är *inte* rekommenderat." -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "" "För att köra som root oavsett, ändra i2prouter och sätt ALLOW_ROOT=true" diff --git a/installer/resources/locale/po/messages_tr.po b/installer/resources/locale/po/messages_tr.po index 38515ae82..1e1ec48a7 100644 --- a/installer/resources/locale/po/messages_tr.po +++ b/installer/resources/locale/po/messages_tr.po @@ -2,197 +2,201 @@ # Copyright (C) 2012 The I2P Project # This file is distributed under the same license as the routerconsole package. # To contribute translations, see http://www.i2p2.de/newdevelopers -# +# # Translators: # Kaya Zeren , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" -"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n" -"POT-Creation-Date: 2013-07-04 16:43+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-07-11 20:20+0000\n" "Last-Translator: Kaya Zeren \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/" +"language/tr_TR/)\n" +"Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr_TR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "Sarıcı yüklenemedi" -#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037 -#: ../i2prouter:1061 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME zaten çalışıyor." -#: ../i2prouter:919 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "$APP_LONG_NAME çalışıyor" -#: ../i2prouter:942 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "$APP_LONG_NAME bekleniyor" -#: ../i2prouter:989 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "DİKKAT: $APP_LONG_NAME başlatılamamış olabilir." -#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "Bu işlemi ancak root yapabilir." -#: ../i2prouter:1047 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "$APP_LONG_NAME başlatılıyor" -#: ../i2prouter:1072 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "$APP_LONG_NAME durduruluyor" -#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME çalışmıyordu." -#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "$APP_LONG_NAME durdurulamıyor." -#: ../i2prouter:1115 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "$APP_LONG_NAME kapanması bekleniyor" -#: ../i2prouter:1129 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "$APP_LONG_NAME durdurulamadı." -#: ../i2prouter:1132 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME durduruldu." -#: ../i2prouter:1140 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "$APP_LONG_NAME düzgün şekilde kapatıldı" -#: ../i2prouter:1186 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME çalışmıyor." -#: ../i2prouter:1191 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME çalışıyor: PID:$pid" -#: ../i2prouter:1194 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME çalışıyor: PID:$pid, Sarıcı:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295 -#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410 -#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "$APP_LONG_NAME arka plan hizmeti zaten yüklenmiş." -#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399 -#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479 -#: ../i2prouter:1514 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "$APP_LONG_NAME arka plan hizmeti yükleniyor" -#: ../i2prouter:1521 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "$DIST_OS üzerine yükleme desteklenmiyor" -#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573 -#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632 -#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "$APP_LONG_NAME arka plan hizmeti kaldırılıyor" -#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577 -#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626 -#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "$APP_LONG_NAME arka plan hizmeti yüklü değil." -#: ../i2prouter:1686 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "$DIST_OS üzerinden kaldırma desteklenmiyor" -#: ../i2prouter:1773 +#: ../i2prouter:1841 msgid "Commands:" msgstr "Komutlar:" -#: ../i2prouter:1774 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "Geçerli konsolda başlatın." -#: ../i2prouter:1775 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "Arka plan hizmeti olarak başlatın." -#: ../i2prouter:1776 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." -msgstr "Arka plan hizmeti olarak ya da başka bir konsolda çalışıyorsa durdurun." +msgstr "" +"Arka plan hizmeti olarak ya da başka bir konsolda çalışıyorsa durdurun." -#: ../i2prouter:1777 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "Uygun şekilde kapatın. 11 dakika sürebilir." -#: ../i2prouter:1778 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "Çalışıyorsa durdurun ve başlatın." -#: ../i2prouter:1779 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "Yalnız zaten çalışıyorsa yeniden başlatın." -#: ../i2prouter:1780 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "Geçerli durumu öğrenin." -#: ../i2prouter:1781 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "Sistem açılırken kendiliğinden yüklensin." -#: ../i2prouter:1782 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "Kaldırın." -#: ../i2prouter:1783 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin." -#: ../i2prouter:1796 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" -#: ../i2prouter:1801 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*." -#: ../i2prouter:1804 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgstr "Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın." +msgstr "" +"Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve " +"ALLOW_ROOT=true ayarını yapın." diff --git a/installer/resources/locale/po/messages_zh.po b/installer/resources/locale/po/messages_zh.po index aeb3ce859..902cec7a7 100644 --- a/installer/resources/locale/po/messages_zh.po +++ b/installer/resources/locale/po/messages_zh.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 19:57+0000\n" +"POT-Creation-Date: 2015-07-17 01:16+0000\n" "PO-Revision-Date: 2013-07-11 07:19+0000\n" "Last-Translator: xtoaster \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/I2P/" @@ -20,180 +20,180 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../i2prouter:203 +#: ../i2prouter:221 msgid "Failed to load the wrapper" msgstr "封装程序载入失败" -#: ../i2prouter:925 ../i2prouter:949 ../i2prouter:1023 ../i2prouter:1051 -#: ../i2prouter:1072 +#: ../i2prouter:978 ../i2prouter:1006 ../i2prouter:1080 ../i2prouter:1108 +#: ../i2prouter:1129 #, sh-format msgid "$APP_LONG_NAME is already running." msgstr "$APP_LONG_NAME 已运行。" -#: ../i2prouter:936 +#: ../i2prouter:989 #, sh-format msgid "Running $APP_LONG_NAME" msgstr "正在运行 $APP_LONG_NAME" -#: ../i2prouter:956 +#: ../i2prouter:1013 #, sh-format msgid "Waiting for $APP_LONG_NAME" msgstr "正在等待 $APP_LONG_NAME" -#: ../i2prouter:1003 +#: ../i2prouter:1060 #, sh-format msgid "WARNING: $APP_LONG_NAME may have failed to start." msgstr "警告：$APP_LONG_NAME 可能启动失败。" -#: ../i2prouter:1017 ../i2prouter:1045 ../i2prouter:1251 ../i2prouter:1540 +#: ../i2prouter:1074 ../i2prouter:1102 ../i2prouter:1308 ../i2prouter:1597 msgid "Must be root to perform this action." msgstr "root 才能执行此操作。" -#: ../i2prouter:1061 +#: ../i2prouter:1118 #, sh-format msgid "Starting $APP_LONG_NAME" msgstr "正在启动 $APP_LONG_NAME" -#: ../i2prouter:1083 +#: ../i2prouter:1140 #, sh-format msgid "Stopping $APP_LONG_NAME" msgstr "正在停止 $APP_LONG_NAME" -#: ../i2prouter:1087 ../i2prouter:1155 ../i2prouter:1708 +#: ../i2prouter:1144 ../i2prouter:1212 ../i2prouter:1765 #, sh-format msgid "$APP_LONG_NAME was not running." msgstr "$APP_LONG_NAME 未运行" -#: ../i2prouter:1100 ../i2prouter:1108 ../i2prouter:1170 ../i2prouter:1178 +#: ../i2prouter:1157 ../i2prouter:1165 ../i2prouter:1227 ../i2prouter:1235 #, sh-format msgid "Unable to stop $APP_LONG_NAME." msgstr "无法停止 $APP_LONG_NAME" -#: ../i2prouter:1126 +#: ../i2prouter:1183 #, sh-format msgid "Waiting for $APP_LONG_NAME to exit" msgstr "正在等待 $APP_LONG_NAME 退出" -#: ../i2prouter:1140 +#: ../i2prouter:1197 #, sh-format msgid "Failed to stop $APP_LONG_NAME." msgstr "无法停止 $APP_LONG_NAME。" -#: ../i2prouter:1143 +#: ../i2prouter:1200 #, sh-format msgid "Stopped $APP_LONG_NAME." msgstr "$APP_LONG_NAME 已停止。" -#: ../i2prouter:1151 +#: ../i2prouter:1208 #, sh-format msgid "Stopping $APP_LONG_NAME gracefully" msgstr "正在等待 $APP_LONG_NAME 自然关闭" -#: ../i2prouter:1197 +#: ../i2prouter:1254 #, sh-format msgid "$APP_LONG_NAME is not running." msgstr "$APP_LONG_NAME 未运行" -#: ../i2prouter:1202 +#: ../i2prouter:1259 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid" msgstr "$APP_LONG_NAME 已运行：PID:$pid" -#: ../i2prouter:1205 +#: ../i2prouter:1262 #, sh-format msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS" msgstr "$APP_LONG_NAME 已运行：PID:$pid, 封装:$STATUS, Java:$JAVASTATUS" -#: ../i2prouter:1258 ../i2prouter:1270 ../i2prouter:1289 ../i2prouter:1306 -#: ../i2prouter:1373 ../i2prouter:1393 ../i2prouter:1407 ../i2prouter:1421 -#: ../i2prouter:1449 ../i2prouter:1487 ../i2prouter:1522 +#: ../i2prouter:1315 ../i2prouter:1327 ../i2prouter:1346 ../i2prouter:1363 +#: ../i2prouter:1430 ../i2prouter:1450 ../i2prouter:1464 ../i2prouter:1478 +#: ../i2prouter:1506 ../i2prouter:1544 ../i2prouter:1579 #, sh-format msgid "The $APP_LONG_NAME daemon is already installed." msgstr "后台服务 $APP_LONG_NAME 已运行。" -#: ../i2prouter:1261 ../i2prouter:1276 ../i2prouter:1378 ../i2prouter:1410 -#: ../i2prouter:1424 ../i2prouter:1438 ../i2prouter:1452 ../i2prouter:1490 -#: ../i2prouter:1525 +#: ../i2prouter:1318 ../i2prouter:1333 ../i2prouter:1435 ../i2prouter:1467 +#: ../i2prouter:1481 ../i2prouter:1495 ../i2prouter:1509 ../i2prouter:1547 +#: ../i2prouter:1582 #, sh-format msgid "Installing the $APP_LONG_NAME daemon" msgstr "正在安装后台服务 $APP_LONG_NAME" -#: ../i2prouter:1532 +#: ../i2prouter:1589 #, sh-format msgid "Install not currently supported for $DIST_OS" msgstr "暂不支持 $DIST_OS 平台上的安装" -#: ../i2prouter:1548 ../i2prouter:1561 ../i2prouter:1575 ../i2prouter:1584 -#: ../i2prouter:1594 ../i2prouter:1618 ../i2prouter:1631 ../i2prouter:1643 -#: ../i2prouter:1661 ../i2prouter:1674 ../i2prouter:1688 +#: ../i2prouter:1605 ../i2prouter:1618 ../i2prouter:1632 ../i2prouter:1641 +#: ../i2prouter:1651 ../i2prouter:1675 ../i2prouter:1688 ../i2prouter:1700 +#: ../i2prouter:1718 ../i2prouter:1731 ../i2prouter:1745 #, sh-format msgid "Removing $APP_LONG_NAME daemon" msgstr "正在删除后台服务 $APP_LONG_NAME" -#: ../i2prouter:1554 ../i2prouter:1569 ../i2prouter:1578 ../i2prouter:1588 -#: ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624 ../i2prouter:1637 -#: ../i2prouter:1655 ../i2prouter:1668 ../i2prouter:1682 ../i2prouter:1693 +#: ../i2prouter:1611 ../i2prouter:1626 ../i2prouter:1635 ../i2prouter:1645 +#: ../i2prouter:1656 ../i2prouter:1669 ../i2prouter:1681 ../i2prouter:1694 +#: ../i2prouter:1712 ../i2prouter:1725 ../i2prouter:1739 ../i2prouter:1750 #, sh-format msgid "The $APP_LONG_NAME daemon is not currently installed." msgstr "后台服务 $APP_LONG_NAME 未安装。" -#: ../i2prouter:1697 +#: ../i2prouter:1754 #, sh-format msgid "Remove not currently supported for $DIST_OS" msgstr "暂不支持 $DIST_OS 平台上的删除" -#: ../i2prouter:1784 +#: ../i2prouter:1841 msgid "Commands:" msgstr "命令：" -#: ../i2prouter:1785 +#: ../i2prouter:1842 msgid "Launch in the current console." msgstr "从当前控制台中启动。" -#: ../i2prouter:1786 +#: ../i2prouter:1843 msgid "Start in the background as a daemon process." msgstr "作为服务进程从后台启动。" -#: ../i2prouter:1787 +#: ../i2prouter:1844 msgid "Stop if running as a daemon or in another console." msgstr "关闭作为服务进程或从其他控制台启动的I2P。" -#: ../i2prouter:1788 +#: ../i2prouter:1845 msgid "Stop gracefully, may take up to 11 minutes." msgstr "自然关闭，可以需要最多11分钟。" -#: ../i2prouter:1789 +#: ../i2prouter:1846 msgid "Stop if running and then start." msgstr "先终止（如果运行）再启动。" -#: ../i2prouter:1790 +#: ../i2prouter:1847 msgid "Restart only if already running." msgstr "重启(仅在已运行时)。" -#: ../i2prouter:1791 +#: ../i2prouter:1848 msgid "Query the current status." msgstr "查询当前状态。" -#: ../i2prouter:1792 +#: ../i2prouter:1849 msgid "Install to start automatically when system boots." msgstr "安装为随系统启动。" -#: ../i2prouter:1793 +#: ../i2prouter:1850 msgid "Uninstall." msgstr "卸载。" -#: ../i2prouter:1794 +#: ../i2prouter:1851 msgid "Request a Java thread dump if running." msgstr "请求Java转储(如果在运行)。" -#: ../i2prouter:1807 +#: ../i2prouter:1864 msgid "Please edit i2prouter and set the variable RUN_AS_USER" msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量" -#: ../i2prouter:1812 +#: ../i2prouter:1869 msgid "Running I2P as the root user is *not* recommended." msgstr "推荐 *不要* 以 root 身份运行 I2P 。" -#: ../i2prouter:1815 +#: ../i2prouter:1872 msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。" From 20cb284f9dac9666866c6f90e297d7cfd7019d96 Mon Sep 17 00:00:00 2001 From: kytv Date: Thu, 30 Jul 2015 17:03:46 +0000 Subject: [PATCH 124/258] update geoip, bump to -23-rc --- installer/resources/geoip.txt | 7019 ++++++++++++----- .../src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 4828 insertions(+), 2193 deletions(-) diff --git a/installer/resources/geoip.txt b/installer/resources/geoip.txt index e4b3efdf4..e52eb5ac1 100644 --- a/installer/resources/geoip.txt +++ b/installer/resources/geoip.txt @@ -1,5 +1,5 @@ # Last updated based on Maxmind GeoLite Country -# dated 2015-05-06 +# dated 2015-07-24 # Script borrowed from Tor # # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip @@ -235,7 +235,8 @@ 84148224,84410367,DE 84410368,84418559,RU 84418560,84419583,BZ -84419584,84421631,RU +84419584,84420607,RU +84420608,84421631,NL 84421632,84421759,MX 84421760,84421887,PA 84421888,84422015,BR @@ -251,7 +252,9 @@ 84457472,84459519,ES 84459520,84471807,RU 84471808,84473855,IQ -84475904,84545535,DE +84475904,84498681,DE +84498682,84498682,NL +84498683,84545535,DE 84545536,84549631,GB 84549632,84551679,GE 84551680,84557823,DE @@ -435,7 +438,8 @@ 86446680,86446683,ES 86446684,86446719,FR 86446720,86446727,NL -86446728,86446931,FR +86446728,86446731,DE +86446732,86446931,FR 86446932,86446935,CZ 86446936,86446983,FR 86446984,86446991,IT @@ -482,7 +486,9 @@ 86453312,86453315,ES 86453316,86453836,FR 86453837,86453838,PT -86453839,86454187,FR +86453839,86453947,FR +86453948,86453951,IE +86453952,86454187,FR 86454188,86454191,IT 86454192,86454279,FR 86454280,86454287,ES @@ -505,7 +511,11 @@ 86456352,86456367,CH 86456368,86456371,FR 86456372,86456375,ES -86456376,86457059,FR +86456376,86456655,FR +86456656,86456671,IE +86456672,86456943,FR +86456944,86456947,GR +86456948,86457059,FR 86457060,86457060,DE 86457061,86457087,FR 86457088,86457091,DE @@ -519,7 +529,9 @@ 86457456,86457456,DE 86457457,86457799,FR 86457800,86457803,ES -86457804,86466839,FR +86457804,86458303,FR +86458304,86458335,DE +86458336,86466839,FR 86466840,86466847,NL 86466848,86466943,FR 86466944,86466959,DE @@ -529,7 +541,9 @@ 86468000,86468003,PL 86468004,86468055,FR 86468056,86468056,DE -86468057,86468447,FR +86468057,86468199,FR +86468200,86468200,ES +86468201,86468447,FR 86468448,86468479,CZ 86468480,86468587,FR 86468588,86468591,ES @@ -539,13 +553,25 @@ 86469692,86469695,DE 86469696,86469779,FR 86469780,86469783,IT -86469784,86470007,FR -86470008,86470008,ES -86470009,86470731,FR +86469784,86469974,FR +86469975,86469982,ES +86469983,86469983,FR +86469984,86469986,ES +86469987,86469988,FR +86469989,86469991,ES +86469992,86469993,FR +86469994,86469995,ES +86469996,86470002,FR +86470003,86470008,ES +86470009,86470015,FR +86470016,86470047,ES +86470048,86470731,FR 86470732,86470735,BE 86470736,86471083,FR 86471084,86471087,DE -86471088,86471179,FR +86471088,86471123,FR +86471124,86471127,GB +86471128,86471179,FR 86471180,86471180,DE 86471181,86473087,FR 86473088,86473151,PT @@ -795,7 +821,10 @@ 90499072,90501119,IT 90503168,90505215,IL 90505216,90529791,RU -90529792,90533887,NL +90529792,90533119,NL +90533120,90533375,DE +90533376,90533631,NL +90533632,90533887,GB 90533888,90537983,EE 90537984,90540031,RU 90540032,90544127,GB @@ -1016,7 +1045,9 @@ 92739200,92739215,DE 92739216,92740447,FR 92740448,92740455,IT -92740456,92741203,FR +92740456,92740915,FR +92740916,92740923,DE +92740924,92741203,FR 92741204,92741207,IT 92741208,92741387,FR 92741388,92741395,IT @@ -1061,7 +1092,9 @@ 92746416,92746431,ES 92746432,92747711,FR 92747712,92747775,GB -92747776,92748773,FR +92747776,92748751,FR +92748752,92748752,PT +92748753,92748773,FR 92748774,92748774,PT 92748775,92749067,FR 92749068,92749071,GB @@ -1079,7 +1112,9 @@ 92757312,92757375,ES 92757376,92760159,FR 92760160,92760191,DE -92760192,92761215,FR +92760192,92760323,FR +92760324,92760327,DE +92760328,92761215,FR 92761216,92761343,DE 92761344,92762127,FR 92762128,92762135,ES @@ -1107,7 +1142,9 @@ 92786828,92786831,IT 92786832,92789499,FR 92789500,92789503,IT -92789504,92790271,FR +92789504,92789703,FR +92789704,92789707,DE +92789708,92790271,FR 92790272,92790275,DE 92790276,92790671,FR 92790672,92790679,ES @@ -1125,7 +1162,9 @@ 92796688,92796691,DE 92796692,92797355,FR 92797356,92797359,DE -92797360,92798975,FR +92797360,92798231,FR +92798232,92798239,NL +92798240,92798975,FR 92798976,93323263,RU 93323264,93335551,CH 93335552,93339647,IL @@ -1219,14 +1258,14 @@ 93976576,93978623,GB 93978624,94011391,ES 94011392,94019583,GB -94019584,94027775,RO +94019584,94021631,DE +94021632,94027263,RO +94027264,94027775,MD 94027776,94035967,IT 94035968,94044159,RO 94044160,94109695,SY 94109696,94175231,SA -94175232,94178303,SE -94178304,94178559,NO -94178560,94179071,SE +94175232,94179071,SE 94179072,94179327,NL 94179328,94179583,SE 94179584,94179839,NL @@ -1386,7 +1425,9 @@ 95410560,95410943,GB 95410944,95411199,DE 95411200,95411215,NL -95411216,95420415,DE +95411216,95420173,DE +95420174,95420174,US +95420175,95420415,DE 95420416,95551487,TR 95551488,95555583,AZ 95555584,95557631,GB @@ -1449,11 +1490,15 @@ 96337920,96403455,IR 96403456,96468991,AZ 96468992,96731135,AE -96731136,96739479,FR +96731136,96736399,FR +96736400,96736400,ES +96736401,96739479,FR 96739480,96739483,DE 96739484,96739583,FR 96739584,96739587,PT -96739588,96740111,FR +96739588,96739887,FR +96739888,96739903,IT +96739904,96740111,FR 96740112,96740127,IT 96740128,96740223,FR 96740224,96740351,IT @@ -1488,17 +1533,23 @@ 96756744,96756751,NL 96756752,96757639,FR 96757640,96757643,CH -96757644,96757883,FR +96757644,96757663,FR +96757664,96757667,SE +96757668,96757883,FR 96757884,96757887,ES 96757888,96758247,FR 96758248,96758251,DE -96758252,96759767,FR +96758252,96759735,FR +96759736,96759739,ES +96759740,96759767,FR 96759768,96759775,IT 96759776,96760403,FR 96760404,96760407,IT 96760408,96761855,FR 96761856,96761871,BE -96761872,96762863,FR +96761872,96762799,FR +96762800,96762815,BE +96762816,96762863,FR 96762864,96762879,NL 96762880,96762943,FR 96762944,96763007,ES @@ -1537,7 +1588,9 @@ 96772944,96772959,DE 96772960,96773119,FR 96773120,96773375,ES -96773376,96775599,FR +96773376,96774719,FR +96774720,96774751,ES +96774752,96775599,FR 96775600,96775615,DE 96775616,96776319,FR 96776320,96776323,ES @@ -1545,15 +1598,24 @@ 96776512,96776543,ES 96776544,96777023,FR 96777024,96777087,ES -96777088,96778171,FR +96777088,96778015,FR +96778016,96778031,ES +96778032,96778167,FR +96778168,96778171,LU 96778172,96778175,PT -96778176,96778247,FR +96778176,96778239,FR +96778240,96778243,NL +96778244,96778247,FR 96778248,96778255,IT -96778256,96778867,FR -96778868,96778871,BE +96778256,96778259,NL +96778260,96778859,FR +96778860,96778863,NL +96778864,96778867,CZ +96778868,96778871,NL 96778872,96778991,FR 96778992,96779007,DE -96779008,96779167,FR +96779008,96779011,PT +96779012,96779167,FR 96779168,96779199,PT 96779200,96779247,FR 96779248,96779255,CZ @@ -1561,7 +1623,9 @@ 96779520,96779523,NL 96779524,96779839,FR 96779840,96779903,NL -96779904,96783299,FR +96779904,96782911,FR +96782912,96782915,LT +96782916,96783299,FR 96783300,96783303,ES 96783304,96783311,BE 96783312,96783327,DE @@ -1579,11 +1643,17 @@ 96785416,96785423,NL 96785424,96786431,FR 96786432,96786495,GB -96786496,96792751,FR +96786496,96788143,FR +96788144,96788159,ES +96788160,96792751,FR 96792752,96792767,DE 96792768,96793583,FR 96793584,96793599,DE -96793600,96794471,FR +96793600,96793687,FR +96793688,96793688,ES +96793689,96793715,FR +96793716,96793716,ES +96793717,96794471,FR 96794472,96794479,ES 96794480,96794707,FR 96794708,96794711,IT @@ -1646,12 +1716,21 @@ 98746368,98762751,TR 98762752,98893823,RU 98893824,98959359,TR -98959360,99024895,DE +98959360,98959615,DE +98959616,98959679,US +98959680,98960639,DE +98960640,98960799,US +98960800,98992383,DE +98992384,98992423,US +98992424,98992431,DE +98992432,98992639,US +98992640,98993151,DE +98993152,98993175,US +98993176,99024895,DE 99024896,99025167,GB 99025168,99025279,DE 99025280,99025407,US -99025408,99025663,NL -99025664,99025919,DE +99025408,99025919,DE 99025920,99025935,FI 99025936,99026047,DE 99026048,99026175,US @@ -1747,7 +1826,8 @@ 100579328,100581375,AT 100581376,100589567,SE 100589568,100597759,RU -100597760,100614143,TR +100597760,100598783,TR +100598784,100614143,US 100614144,100630527,NL 100630528,100632575,BE 100632576,100634623,GB @@ -1793,9 +1873,7 @@ 136413184,136415665,CA 136415666,136415666,FR 136415667,136415743,CA -136415744,136699903,US -136699904,136701951,A1 -136701952,139954241,US +136415744,139954241,US 139954242,139954242,ES 139954243,152305663,US 152305664,152338431,GB @@ -1832,9 +1910,7 @@ 212787200,212788223,PR 212788224,212791831,US 212791832,212791839,VI -212791840,212794575,US -212794576,212794583,VI -212794584,213799167,US +212791840,213799167,US 213799168,213799423,CA 213799424,214617343,US 214617344,214617599,CA @@ -1985,7 +2061,9 @@ 288197120,288197631,US 288197632,288198143,CA 288198144,288198655,CL -288198656,288212991,US +288198656,288199679,US +288199680,288200703,CO +288200704,288212991,US 288212992,288215039,CA 288215040,288223231,US 288223232,288227327,CA @@ -1997,16 +2075,21 @@ 289652736,289653759,NL 289653760,289654271,DE 289654272,289656831,US -289656832,289657855,GB +289656832,289657855,BE 289657856,289658879,AE 289658880,289659903,GB 289659904,289660927,US 289660928,289665023,ES 289665024,289667071,US -289667072,289668095,GB -289668096,289948927,US +289667072,289669119,GB +289669120,289783807,US +289783808,289783935,GB +289783936,289796095,US +289796096,289798143,TR +289798144,289948927,US 289948928,289949055,AT -289949056,289949695,US +289949056,289949183,US +289949184,289949695,RU 289949696,289950207,NL 289950208,289950463,PL 289950464,289950719,PT @@ -2015,8 +2098,7 @@ 289951232,289951487,RU 289951488,289951743,US 289951744,289952255,DE -289952256,289952767,US -289952768,289953791,GB +289952256,289953791,GB 289953792,289954303,US 289954304,289954559,ES 289954560,289955839,US @@ -2043,10 +2125,14 @@ 289960960,289961471,BE 289961472,289963007,US 289963008,289964031,FR -289964032,290269183,US +289964032,290265087,US +290265088,290267135,RU +290267136,290269183,US 290269184,290270207,PL 290270208,290271231,PT -290271232,290295295,US +290271232,290277375,US +290277376,290279423,GB +290279424,290295295,US 290295296,290295807,IN 290295808,290299903,US 290299904,290300927,LU @@ -2060,7 +2146,9 @@ 290310144,290312191,IN 290312192,290357247,US 290357248,290365439,IL -290365440,290423807,US +290365440,290377727,US +290377728,290379775,GB +290379776,290423807,US 290423808,290424831,SE 290424832,344260607,US 344260608,344260863,GB @@ -2089,7 +2177,9 @@ 344881152,344881407,IN 344881408,344977407,US 344977408,344977663,IN -344977664,385884159,US +344977664,372398271,US +372398272,372398303,AU +372398304,385884159,US 385884160,385888255,NL 385888256,385917183,US 385917184,385917439,NL @@ -2237,9 +2327,7 @@ 388198400,388202495,NL 388202496,388222975,US 388222976,388227071,NL -388227072,388251647,US -388251648,388255743,NL -388255744,388272127,US +388227072,388272127,US 388272128,388284415,NL 388284416,388288511,US 388288512,388300799,NL @@ -2257,9 +2345,7 @@ 388397056,388399103,NL 388399104,388419583,US 388419584,388423679,NL -388423680,388440063,US -388440064,388444159,NL -388444160,388448255,US +388423680,388448255,US 388448256,388464639,NL 388464640,388472831,US 388472832,388476927,NL @@ -2284,7 +2370,9 @@ 388681728,388698111,US 388698112,388702207,NL 388702208,388706303,US -388706304,388730879,NL +388706304,388714495,NL +388714496,388726783,US +388726784,388730879,NL 388730880,388812799,US 388812800,388816895,NL 388816896,388842239,US @@ -2307,8 +2395,8 @@ 388919296,388923391,NL 388923392,389044223,US 389044224,389045247,NL -389045248,389066751,US -389066752,389078015,NL +389045248,389070847,US +389070848,389078015,NL 389078016,389079039,US 389079040,389083135,NL 389083136,389090303,US @@ -2321,22 +2409,22 @@ 389185536,389201919,NL 389201920,389206015,US 389206016,389210111,NL -389210112,389234687,US -389234688,389238783,NL -389238784,389242879,US +389210112,389242879,US 389242880,389251071,NL 389251072,389259263,US 389259264,389292031,NL 389292032,389296127,US 389296128,389300223,NL 389300224,389328895,US -389328896,389365759,NL +389328896,389341183,NL +389341184,389349375,US +389349376,389365759,NL 389365760,389390335,US 389390336,389398527,NL 389398528,389402623,US -389402624,389427199,NL -389427200,389431295,US -389431296,389451775,NL +389402624,389423103,NL +389423104,389435391,US +389435392,389451775,NL 389451776,389480447,US 389480448,389484543,NL 389484544,389509119,US @@ -2349,8 +2437,8 @@ 389599744,389600767,NL 389600768,389602303,US 389602304,389603327,NL -389603328,389607423,US -389607424,389615615,NL +389603328,389611519,US +389611520,389615615,NL 389615616,389619711,US 389619712,389628927,NL 389628928,389631999,US @@ -2538,8 +2626,8 @@ 398647296,398656511,NL 398656512,398657535,US 398657536,398658559,NL -398658560,398659583,US -398659584,398675967,NL +398658560,398667775,US +398667776,398675967,NL 398675968,398684159,US 398684160,398692351,NL 398692352,398779903,US @@ -2640,15 +2728,11 @@ 400201216,400202751,NL 400202752,400203775,US 400203776,400211967,NL -400211968,400232447,US -400232448,400250367,NL -400250368,400252927,US -400252928,400269311,NL -400269312,400270847,US +400211968,400240639,US +400240640,400250367,NL +400250368,400270847,US 400270848,400271359,NL -400271360,400273407,US -400273408,400281599,NL -400281600,400283647,US +400271360,400283647,US 400283648,400284671,NL 400284672,400293887,US 400293888,400302079,NL @@ -2667,15 +2751,11 @@ 400809984,400884479,US 400884480,400884735,TR 400884736,400884991,GB -400884992,400885095,US -400885096,400885119,GB -400885120,400887551,US +400884992,400887551,US 400887552,400887807,GB 400887808,400888575,US 400888576,400888831,GB -400888832,400897535,US -400897536,400897791,GB -400897792,400911103,US +400888832,400911103,US 400911104,400911359,PA 400911360,400911615,AU 400911616,400911871,CR @@ -2735,8 +2815,7 @@ 402128896,402169855,CA 402169856,402223103,US 402223104,402227199,CA -402227200,402231295,PR -402231296,402239301,US +402227200,402239301,US 402239302,402239302,CA 402239303,402239473,US 402239474,402239474,CA @@ -2905,10 +2984,8 @@ 417808384,417816575,CA 417820672,417857535,US 417857536,417923071,AR -417923072,418060543,US -418060544,418061055,HK -418061056,418061311,US -418061312,418062335,HK +417923072,418060287,US +418060288,418062335,HK 418062336,418070527,CA 418070528,418078719,US 418078720,418119679,CA @@ -3127,7 +3204,6 @@ 461100032,461101055,MN 461101056,461102079,IN 461102080,461103103,ID -461103104,461111295,PH 461111296,461127679,IN 461127680,461131775,PH 461131776,461135871,ID @@ -3229,7 +3305,7 @@ 520492032,520493055,GB 520493056,520493311,BE 520493312,520493567,GB -520493568,520493823,IT +520493568,520493823,AE 520493824,520494079,FI 520494080,520494335,IT 520494336,520494591,CZ @@ -3310,7 +3386,11 @@ 520953856,520962047,RU 520962048,520963407,IE 520963408,520963408,US -520963409,520978431,IE +520963409,520963583,IE +520963584,520963839,US +520963840,520965119,IE +520965120,520965631,US +520965632,520978431,IE 520978432,520980479,RU 520980480,520982527,IT 520982528,520984575,RU @@ -3325,12 +3405,16 @@ 521019392,521019647,NL 521019648,521022463,RO 521022464,521022719,NL -521022720,521023487,RO +521022720,521022975,RO +521022976,521023487,DE 521023488,521023743,NL -521023744,521027839,RO +521023744,521026559,RO +521026560,521027583,ES +521027584,521027839,RO 521027840,521028607,GB 521028608,521028863,RU -521028864,521029375,RO +521028864,521029119,RO +521029120,521029375,ES 521029376,521029631,US 521029632,521031679,RO 521031680,521035775,IR @@ -3342,9 +3426,13 @@ 521048064,521052159,IR 521052160,521056255,RO 521056256,521057279,LT -521057280,521058303,RO +521057280,521058303,MD 521058304,521060351,IT -521060352,521076479,RO +521060352,521074687,RO +521074688,521074943,EG +521074944,521075455,RO +521075456,521075711,EG +521075712,521076479,RO 521076480,521076735,IN 521076736,521078783,ES 521078784,521080831,CZ @@ -3413,8 +3501,7 @@ 521717760,521718783,IQ 521718784,521719807,IR 521719808,521721855,UA -521721856,521723903,GB -521723904,521725951,SA +521721856,521725951,GB 521725952,521727999,IR 521728000,521732095,FR 521732096,521736191,GB @@ -3677,7 +3764,8 @@ 529799424,529799679,UA 529799680,529800191,RU 529800192,529800703,UA -529800704,529801215,CZ +529800704,529800959,CZ +529800960,529801215,BY 529801216,529817599,RU 529817600,529818623,CZ 529818624,529826303,RU @@ -3686,10 +3774,7 @@ 529827840,529828863,CZ 529828864,529829887,RU 529829888,529830911,CZ -529830912,529835007,RU -529835008,529836031,KG -529836032,529837055,CZ -529837056,529839103,RU +529830912,529839103,RU 529839104,529840127,CZ 529840128,529841151,RU 529841152,529842175,UA @@ -3790,7 +3875,9 @@ 531427504,531427511,IT 531427512,531427559,GB 531427560,531427567,IT -531427568,531428191,GB +531427568,531427703,GB +531427704,531427711,IT +531427712,531428191,GB 531428192,531428199,IT 531428200,531428207,GB 531428208,531428215,IT @@ -3798,23 +3885,25 @@ 531428352,531428359,IT 531428360,531428495,GB 531428496,531428503,IT -531428504,531428847,GB -531428848,531428855,IT -531428856,531429135,GB +531428504,531429135,GB 531429136,531429143,IT -531429144,531429207,GB +531429144,531429167,GB +531429168,531429175,IT +531429176,531429207,GB 531429208,531429215,IT 531429216,531429239,GB 531429240,531429247,IT -531429248,531429391,GB +531429248,531429319,GB +531429320,531429327,IT +531429328,531429391,GB 531429392,531429399,IT 531429400,531429407,GB 531429408,531429415,IT 531429416,531429599,GB 531429600,531429607,IT -531429608,531429967,GB -531429968,531429975,IT -531429976,531430319,GB +531429608,531430191,GB +531430192,531430199,IT +531430200,531430319,GB 531430320,531430327,IT 531430328,531430407,GB 531430408,531430415,IT @@ -3860,7 +3949,7 @@ 532209664,532210687,DE 532210688,532211711,RU 532211712,532212223,LU -532212224,532212479,KZ +532212224,532212479,ME 532212480,532212735,NL 532212736,532213759,RU 532213760,532214015,GB @@ -3909,7 +3998,9 @@ 532366080,532366207,NL 532366208,532366239,AR 532366240,532366271,PA -532366272,532367359,DE +532366272,532366893,DE +532366894,532366894,GB +532366895,532367359,DE 532367360,532368383,US 532368384,532368639,NL 532368640,532371455,DE @@ -4122,8 +4213,7 @@ 534523036,534523135,DE 534523136,534523391,NL 534523392,534523903,DE -534523904,534527999,US -534528000,534530047,DE +534523904,534530047,US 534530048,534538239,ES 534538240,534538751,US 534538752,534539007,GB @@ -4200,8 +4290,8 @@ 540753920,540754175,US 540754176,540803071,BZ 540803072,540811263,US -540811264,540814085,SG -540814086,540814086,TH +540811264,540814084,SG +540814085,540814086,TH 540814087,540814327,SG 540814328,540814328,IN 540814329,540814335,SG @@ -4334,7 +4424,9 @@ 621391872,621392127,IT 621392128,621392383,CY 621392384,621392639,GE -621392640,621393919,CY +621392640,621392895,CY +621392896,621393151,IT +621393152,621393919,CY 621393920,621395967,DE 621395968,621398015,CZ 621398016,621400063,TR @@ -4430,7 +4522,9 @@ 622512128,622514175,DE 622514176,622518271,NO 622518272,622518527,GB -622518528,622520319,NL +622518528,622519281,NL +622519282,622519282,GB +622519283,622520319,NL 622520320,622522367,RU 622522368,622524415,FR 622524416,622526463,ES @@ -4521,9 +4615,7 @@ 623801088,623801855,US 623801856,623802367,NL 623802368,623802879,SE -623802880,623804148,NL -623804149,623804159,SE -623804160,623804415,NL +623802880,623804415,NL 623804416,623806463,RU 623806464,623808511,NL 623810560,623812607,ES @@ -4580,17 +4672,26 @@ 624643232,624643235,DE 624643236,624643311,FR 624643312,624643315,IT -624643316,624645147,FR +624643316,624644667,FR +624644668,624644671,DK +624644672,624645147,FR 624645148,624645151,IT -624645152,624646239,FR +624645152,624645479,FR +624645480,624645487,CZ +624645488,624646235,FR +624646236,624646239,IT 624646240,624646255,DE 624646256,624646343,FR 624646344,624646347,NL -624646348,624646583,FR +624646348,624646399,FR +624646400,624646431,BE +624646432,624646583,FR 624646584,624646591,NL 624646592,624647171,FR 624647172,624647183,ES -624647184,624648139,FR +624647184,624647459,FR +624647460,624647463,GB +624647464,624648139,FR 624648140,624648143,ES 624648144,624653311,FR 624653312,624653823,GB @@ -4638,7 +4739,9 @@ 624665804,624665807,NL 624665808,624665951,FR 624665952,624665955,NL -624665956,624666219,FR +624665956,624666167,FR +624666168,624666168,GB +624666169,624666219,FR 624666220,624666223,DE 624666224,624666695,FR 624666696,624666703,DE @@ -5097,7 +5200,8 @@ 630818560,630819327,RO 630819328,630819839,SE 630819840,630820095,GR -630820096,630820607,RO +630820096,630820351,RO +630820352,630820607,ES 630820608,630820863,US 630820864,630828031,RO 630828032,630828543,SE @@ -5117,7 +5221,8 @@ 630990848,630992895,RO 630992896,630996991,IR 630996992,630997503,GB -630997504,630998271,RO +630997504,630997759,MD +630997760,630998271,RO 630998272,630998783,MD 630998784,631001087,RO 631001088,631005183,MD @@ -5136,8 +5241,8 @@ 631033856,631034879,IT 631034880,631039999,RO 631040000,631043071,MD -631043072,631044095,RO -631044096,631045119,MD +631043072,631043839,RO +631043840,631045119,MD 631045120,631046143,RO 631046144,631048191,DK 631048192,631050239,FR @@ -5180,7 +5285,9 @@ 633066240,633066495,ES 633066496,633066751,FR 633066752,633067007,IT -633067008,633077759,FR +633067008,633074760,FR +633074761,633074761,ES +633074762,633077759,FR 633077760,633094143,RU 633094144,633098239,NL 633098240,633100287,HU @@ -5298,21 +5405,15 @@ 635200264,635200271,IT 635200272,635200335,GB 635200336,635200343,IT -635200344,635200415,GB -635200416,635200423,IT -635200424,635200431,GB +635200344,635200431,GB 635200432,635200439,IT 635200440,635200631,GB 635200632,635200639,IT 635200640,635200727,GB 635200728,635200735,IT -635200736,635200959,GB -635200960,635200967,IT -635200968,635200991,GB +635200736,635200991,GB 635200992,635200999,IT -635201000,635201087,GB -635201088,635201095,IT -635201096,635201159,GB +635201000,635201159,GB 635201160,635201167,IT 635201168,635201455,GB 635201456,635201463,IT @@ -5364,7 +5465,9 @@ 635856896,635858943,TR 635858944,635860991,RU 635860992,635863039,BE -635863040,635895807,RU +635863040,635893503,RU +635893504,635893759,AZ +635893760,635895807,RU 635895808,635961343,KW 635961344,635994111,GE 635994112,636026879,RU @@ -5443,8 +5546,12 @@ 637319168,637321215,AT 637321216,637323263,GB 637323264,637325311,FR -637325312,637325567,US -637325568,637327359,NO +637325312,637325823,US +637325824,637326079,GB +637326080,637326335,DE +637326336,637326591,HK +637326592,637326847,AU +637326848,637327359,NO 637329408,637329663,SI 637329664,637330175,FR 637330176,637330431,DE @@ -5490,7 +5597,9 @@ 642093056,642093311,CA 642093312,642093823,US 642093824,642094591,CA -642094592,642793471,US +642094592,642113535,US +642113536,642115583,AU +642115584,642793471,US 642793472,642793983,CA 642793984,643219519,US 643219520,643219523,CA @@ -5559,8 +5668,8 @@ 644768768,644835071,US 644835072,644835327,CA 644835328,644838655,US -644838656,644840447,CA -644840448,644898815,US +644838656,644839423,CA +644839424,644898815,US 644898816,644899071,CA 644899072,644899839,US 644899840,644900095,CA @@ -5639,7 +5748,13 @@ 666894336,671088639,ID 671088640,671113215,US 671113216,671113471,EU -671113472,687618147,US +671113472,675807231,US +675807232,675938303,SG +675938304,679313407,US +679313408,679346175,SG +679346176,679362559,US +679362560,679378943,SG +679378944,687618147,US 687618148,687618151,EU 687618152,687865855,US 687865856,689963007,ZA @@ -6219,8 +6334,7 @@ 702342260,702342263,KE 702342264,702344199,MU 702344200,702344971,KE -702344972,702345215,MU -702345216,702349311,KE +702344972,702349311,MU 702349312,702353407,ZA 702353408,702357503,DZ 702357504,702365695,TZ @@ -6520,7 +6634,6 @@ 736202752,736203775,AU 736203776,736204799,BD 736204800,736205823,SG -736205824,736206847,JP 736206848,736209919,IN 736209920,736210943,CN 736210944,736211967,AU @@ -6591,7 +6704,12 @@ 736398336,736400383,IN 736400384,736402431,CN 736402432,736402559,NZ -736402560,736403455,PK +736402560,736402687,PK +736402688,736402943,SG +736402944,736403071,MY +736403072,736403199,BN +736403200,736403327,AU +736403328,736403455,PK 736403456,736404479,KR 736405504,736408575,IN 736408576,736409599,CN @@ -6608,7 +6726,6 @@ 736421888,736422911,SG 736422912,736423935,IN 736423936,736424959,CN -736424960,736425983,JP 736425984,736428031,MY 736428032,736429055,IN 736429056,736430079,HK @@ -6645,7 +6762,6 @@ 736466944,736467967,HK 736467968,736468991,SG 736468992,736470015,IN -736470016,736471039,JP 736471040,736479231,CN 736479232,736480255,IN 736480256,736481279,ID @@ -7017,7 +7133,8 @@ 737744896,737745919,CN 737745920,737746943,HK 737746944,737747967,TH -737747968,737748991,SG +737747968,737748479,HK +737748480,737748991,SG 737748992,737750015,AF 737750016,737751039,JP 737751040,737753087,IN @@ -7134,11 +7251,9 @@ 737905664,737906687,HK 737906688,737908735,IN 737908736,737909759,AU -737909760,737910271,HK -737910272,737910783,MY -737910784,737911807,HK -737911808,737912063,SG -737912064,737912831,AU +737909760,737911807,HK +737911808,737912703,SG +737912704,737912831,MY 737912832,737915903,IN 737915904,737916927,TW 737916928,737917951,JP @@ -7264,7 +7379,10 @@ 738147328,738148095,CN 738148096,738148351,AU 738148352,738152447,CN -738152448,738153471,HK +738152448,738152703,JP +738152704,738152959,AU +738152960,738153215,JP +738153216,738153471,AU 738153472,738154495,CN 738154496,738156543,TW 738156544,738157567,CN @@ -7312,9 +7430,12 @@ 757645312,757645567,NZ 757645568,757661695,US 757661696,757661951,NZ -757661952,757686271,US +757661952,757662719,US +757662720,757662975,IN +757662976,757686271,US 757686272,757694463,CA -757694464,757696511,US +757694464,757696255,US +757696256,757696511,JP 757696512,757697535,DE 757697536,757711871,US 757711872,757712127,AU @@ -7336,27 +7457,40 @@ 757760256,757760511,ML 757760512,757761535,US 757761536,757761791,MW -757761792,757762303,US +757761792,757762047,US +757762048,757762303,MV 757762304,757762559,JP 757762560,757762815,US 757762816,757763071,CD -757763072,757764095,US +757763072,757763583,US +757763584,757763839,MN +757763840,757764095,US 757764096,757764351,ZW 757764352,757765375,US 757765376,757765631,SD -757765632,757766655,US +757765632,757765887,US +757765888,757766143,KP +757766144,757766655,US 757766656,757766911,BI -757766912,757767935,US +757766912,757767167,US +757767168,757767423,CC +757767424,757767935,US 757767936,757768191,MU 757768192,757769215,US 757769216,757769471,SL 757769472,757769727,US 757769728,757769983,NZ -757769984,757770495,US +757769984,757770239,GU +757770240,757770495,US 757770496,757770751,TG -757770752,757771775,US +757770752,757771007,US +757771008,757771263,FJ +757771264,757771519,CW +757771520,757771775,SB 757771776,757772031,ER -757772032,757773055,US +757772032,757772287,US +757772288,757772543,NR +757772544,757773055,US 757773056,757773311,MR 757773312,757774335,US 757774336,757774591,LR @@ -7384,7 +7518,9 @@ 757788160,757788287,LK 757788288,757789439,US 757789440,757789567,NP -757789568,757858303,US +757789568,757790975,US +757790976,757791231,WS +757791232,757858303,US 757858304,757956607,CA 757956608,757956863,AU 757956864,758683647,US @@ -7392,9 +7528,14 @@ 758683904,758684159,SG 758684160,758685183,US 758685184,758685439,AU -758685440,758779903,US +758685440,758685695,JP +758685696,758691839,US +758691840,758693887,DE +758693888,758779903,US 758779904,758783999,CA -758784000,758796287,US +758784000,758785023,US +758785024,758785535,CA +758785536,758796287,US 758796288,758804479,CA 758804480,758824959,US 758824960,758841343,CA @@ -7402,39 +7543,49 @@ 758874368,758874623,AM 758874624,758875391,US 758875392,758875647,AO -758875648,758875903,US +758875648,758875903,BT 758875904,758876159,AZ 758876160,758876415,AU 758876416,758876671,US 758876672,758876927,SD 758876928,758877439,US 758877440,758877695,KZ -758877696,758878207,US +758877696,758877951,IR +758877952,758878207,PG 758878208,758878463,ET -758878464,758878975,US +758878464,758878719,TO +758878720,758878975,KH 758878976,758879231,KG -758879232,758879743,US +758879232,758879487,US +758879488,758879743,GG 758879744,758879999,CD -758880000,758880511,US +758880000,758880255,SJ +758880256,758880511,AS 758880512,758880767,UZ -758880768,758881535,US +758880768,758881023,GN +758881024,758881535,US 758881536,758881791,PH -758881792,758882047,US +758881792,758882047,CG 758882048,758882303,TM -758882304,758882815,US +758882304,758882559,US +758882560,758882815,CV 758882816,758883071,ZM 758883072,758883583,US 758883584,758883839,TJ -758883840,758884351,US +758883840,758884095,LI +758884096,758884351,MQ 758884352,758884607,MZ -758884608,758885119,US +758884608,758884863,GP +758884864,758885119,RE 758885120,758885375,CN -758885376,758885887,US +758885376,758885631,WF +758885632,758885887,KM 758885888,758886143,SN -758886144,758886655,US +758886144,758886399,TF +758886400,758886655,PA 758886656,758886911,DZ 758886912,758887167,NE -758887168,758887423,US +758887168,758887423,GI 758887424,758887679,TD 758887680,758888191,US 758888192,758888447,LY @@ -7442,13 +7593,18 @@ 758888704,758888959,TZ 758888960,758889215,US 758889216,758889471,MG -758889472,758889727,US +758889472,758889727,LA 758889728,758889983,TN 758889984,758972415,US 758972416,758976511,CA 758976512,758984703,US 758984704,758988799,CA -758988800,759047423,US +758988800,758994943,US +758994944,758996991,IN +758996992,758998015,DE +758998016,759001087,US +759001088,759005183,CN +759005184,759047423,US 759047424,759047679,IN 759047680,759048191,US 759048192,759048447,PK @@ -7526,16 +7682,62 @@ 759234560,759235583,SG 759235584,759236607,NZ 759236608,759237631,IN -759237632,759238655,AU +759237632,759238655,NZ 759693312,759726079,US 759726080,759791615,CA -759791616,759840767,US +759791616,759824639,US +759824640,759824895,SA +759824896,759825151,CR +759825152,759825407,NO +759825408,759825663,BE +759825664,759828735,US +759828736,759828863,GT +759828864,759828991,SV +759828992,759829119,HN +759829120,759829247,NI +759829248,759829375,BO +759829376,759829503,PY +759829504,759829631,SR +759829632,759829759,GY +759829760,759829887,TT +759829888,759830015,GD +759830016,759830143,DM +759830144,759830271,BB +759830272,759830399,LC +759830400,759830527,DO +759830528,759830655,HT +759830656,759830783,TC +759830784,759830911,CV +759830912,759831039,KY +759831040,759831167,BM +759831168,759831295,MS +759831296,759831423,AG +759831424,759831551,BY +759831552,759831679,CM +759831680,759831807,CF +759831808,759831935,US +759831936,759832063,ZW +759832064,759832191,ZM +759832192,759832319,GA +759832320,759832447,RW +759832448,759832575,BW +759832576,759832703,MZ +759832704,759832831,SZ +759832832,759832959,MW +759832960,759833087,BI +759833088,759833215,ER +759833216,759833343,LS +759833344,759840767,US 759840768,759844863,CA 759844864,759848959,US -759848960,759857151,CA -759857152,759889919,US +759848960,759885823,CA +759885824,759889919,US 759889920,759955455,CA -759955456,760217599,US +759955456,760111103,US +760111104,760119295,CA +760119296,760127487,US +760127488,760152063,CA +760152064,760217599,US 761266176,761790463,EG 762314752,762315775,IN 762315776,762316799,JP @@ -7641,10 +7843,11 @@ 762467328,762469375,BD 762469376,762470399,HK 762470400,762471423,CN -762471424,762471679,MY -762471680,762473471,CN +762471424,762472447,MY +762472448,762473471,CN 762473472,762475519,JP -762475520,762476543,ID +762475520,762475775,AU +762475776,762476543,ID 762476544,762478591,PK 762478592,762479615,KR 762479616,762480639,PK @@ -7672,7 +7875,11 @@ 762514432,762515455,BD 762515456,762516479,IN 762516480,762517503,AU -762517504,762519551,HK +762517504,762517759,US +762517760,762518015,KR +762518016,762518079,VN +762518080,762518111,ID +762518112,762519551,HK 762519552,762520575,JP 762520576,762522623,HK 762522624,762523647,CN @@ -7691,6 +7898,7 @@ 762540032,762541055,BD 762541056,762541567,AU 762541568,762541823,TH +762541824,762542079,IN 762542080,762543103,CN 762543104,762544127,HK 762544128,762545151,AU @@ -7739,9 +7947,266 @@ 762603520,762604543,IN 762604544,762605567,AU 762605568,762609663,IN +762609664,762610175,AF +762610176,762610431,HK +762610432,762610687,AU +762610688,762611711,JP +762611712,762612735,SG +762612736,762613759,CN +762613760,762614783,HK +762614784,762615807,IN +762615808,762616831,CN +762616832,762617855,ID +762617856,762619903,IN +762619904,762620927,HK +762620928,762622975,MY +762622976,762630143,IN +762630144,762631167,CN +762631168,762632191,HK +762632192,762633215,TH +762633216,762634239,AU +762634240,762635263,JP +762635264,762636287,IN +762636288,762637311,PK +762637312,762640383,MY +762640384,762641407,BD +762641408,762644479,IN +762644480,762645503,CN +762645504,762646527,KR +762646528,762647551,JP +762647552,762648575,CN +762648576,762649599,AU +762649600,762650623,IN +762650624,762651647,MN +762651648,762652671,NZ +762652672,762653695,CN +762653696,762656767,IN +762656768,762658815,BD +762658816,762659839,IN +762659840,762660863,CN +762660864,762661887,IN +762661888,762663935,VN +762663936,762664959,AU +762664960,762665983,PK +762665984,762667007,IN +762667008,762669055,HK +762669056,762670079,PK +762670080,762673151,IN +762673152,762674175,MY +762674176,762675199,CN +762675200,762678271,IN +762678272,762679295,JP +762679296,762680319,HK +762680320,762681343,IN +762681344,762682367,NP +762682368,762688511,VN +762688512,762690559,IN +762690560,762691583,SG +762691584,762692607,HK +762692608,762693631,MP +762693632,762700799,IN +762700800,762701823,MY +762701824,762702847,IN +762702848,762703871,MY +762703872,762705919,FJ +762705920,762706943,IN +762706944,762707967,CN +762707968,762717183,IN +762717184,762718207,PH +762718208,762719231,JP +762719232,762723327,IN +762723328,762724351,BD +762724352,762725375,AU +762725376,762726399,BD +762726400,762736639,IN +762736640,762737663,ID +762737664,762739711,IN +762739712,762740735,HK +762740736,762741759,IN +762741760,762742783,JP +762742784,762746879,VN +762746880,762754047,IN +762754048,762755071,SG +762755072,762756095,AU +762756096,762757119,NZ +762757120,762770431,IN +762770432,762771455,BD +762771456,762775551,HK +762775552,762783743,IN +762783744,762784767,KR +762784768,762786815,IN +762786816,762787839,CN +762787840,762788863,IN +762788864,762792959,CN +762792960,762796031,VN +762796032,762797055,IN +762797056,762799103,HK +762799104,762800127,NZ +762800128,762801151,CN +762801152,762802175,VN +762802176,762803199,IN +762803200,762804223,CN +762804224,762805247,BD +762805248,762806271,HK +762806272,762810367,IN +762810368,762811391,KR +762811392,762812415,IN +762812416,762814463,SG +762814464,762815487,CN +762815488,762816511,JP +762816512,762824703,IN +762824704,762825727,SG +762825728,762827775,JP +762827776,762829823,VN +762829824,762830847,AU +762830848,762832895,IN +762832896,762833919,CN +762833920,762834943,IN +762834944,762835967,VN +762835968,762838015,IN +762838016,762841087,HK +762841088,762846207,IN +762846208,762847231,HK +762847232,762848255,IN +762848256,762848511,AU +762848512,762848767,IN +762848768,762849279,BD +762849280,762850303,IN +762850304,762851327,JP +762851328,762852351,IN +762852352,762853375,HK +762853376,762855423,IN +762855424,762857471,KR +762857472,762858495,IN +762858496,762860543,HK +762860544,762861567,MM +762861568,762863615,IN +762863616,762864639,BD +762864640,762865663,CN +762865664,762866687,AU +762866688,762867711,PH +762867712,762868735,BD +762868736,762869759,NZ +762869760,762871807,IN +762871808,762872831,MY +762872832,762873855,JP +762873856,762874879,NZ +762874880,762875903,CN +762875904,762876927,IN +762876928,762877951,SG +762877952,762879231,HK +762879232,762879487,JP +762879488,762879743,SG +762879744,762879999,CN +762880000,762881023,IN +762881024,762882047,CN +762882048,762883071,HK +762883072,762884095,IN +762884096,762885119,JP +762885120,762887167,HK +762887168,762888191,IN +762888192,762890239,JP +762890240,762891263,AU +762891264,762893311,HK +762893312,762894335,IN +762894336,762895359,HK +762895360,762896383,CN +762896384,762898431,VN +762898432,762900479,IN +762900480,762901503,CN +762901504,762902527,ID +762902528,762909695,IN +762909696,762910719,CN +762910720,762911743,VN +762911744,762912767,IN +762912768,762913791,HK +762913792,762914815,MY +762914816,762915839,ID +762915840,762916863,IN +762916864,762917887,TW +762917888,762918911,CN +762918912,762919935,HK +762919936,762920959,TH +762920960,762924031,CN +762924032,762925055,IN +762925056,762927103,HK +762927104,762928127,LK +762928128,762930175,CN +762930176,762931199,IN +762931200,762932223,CN +762932224,762938367,IN +762938368,762939391,AU +762939392,762941439,HK +762941440,762942463,MY +762942464,762943487,JP +762943488,762944511,VN +762944512,762945535,IN +762945536,762946559,VN +762946560,762947583,KR +762947584,762948607,IN +762948608,762950655,CN +762950656,762951679,AU +762951680,762952703,JP +762952704,762953727,IN +762953728,762958847,HK +762958848,762959871,CN +762959872,762960895,ID +762960896,762964991,IN +762964992,762966015,KH +762966016,762981375,CN +762981376,762982399,IN +762982400,762983423,TH +762983424,762984447,HK +762984448,762985471,ID +762985472,763000831,CN +763000832,763003903,IN +763003904,763005951,HK +763005952,763010047,IN +763010048,763011071,HK +763011072,763026431,CN +763026432,763027455,VN +763027456,763028479,JP +763028480,763029503,AU +763029504,763035647,VN +763035648,763040767,IN +763040768,763041791,HK +763041792,763042815,IN +763042816,763045887,CN +763045888,763046911,BD +763046912,763059199,CN +763059200,763060223,IN +763060224,763061247,VN +763061248,763062271,MY +763062272,763063295,AU +763063296,763064319,IN +763064320,763066367,HK +763066368,763067391,CN +763067392,763068415,MY +763068416,763071487,CN +763071488,763073535,IN +763073536,763076607,CN +763076608,763077631,IN +763077632,763083775,CN +763083776,763086847,HK +763086848,763087871,MO +763087872,763088895,CN +763088896,763089919,JP +763089920,763090943,CN +763090944,763091967,IN +763091968,763092991,NP +763092992,763102207,CN +763102208,763103231,IN +763103232,763104255,HK +763104256,763105279,BD +763105280,763106303,PH +763106304,763111423,CN +763111424,763112447,AU +763112448,763113471,CN +763113472,763114495,IN 767557632,768606207,ZA 768606208,768868351,GH 769130496,769392639,MA +770703360,771227647,EG 771751936,771817471,RU 771817472,771948543,TR 771948544,772014079,RU @@ -8007,8 +8472,7 @@ 773646336,773648383,TR 773648384,773650431,PL 773650432,773652479,GB -773652480,773652735,TR -773652736,773653503,SK +773652480,773653503,SK 773653504,773654527,TR 773654528,773656575,RU 773656576,773658623,PL @@ -8116,7 +8580,11 @@ 773931008,773934591,DE 773934592,773935352,FR 773935353,773935353,US -773935354,773938231,FR +773935354,773937663,FR +773937664,773937664,DE +773937665,773937673,FR +773937674,773937674,IE +773937675,773938231,FR 773938232,773938239,GB 773938240,773939199,FR 773939200,773947391,CZ @@ -8170,7 +8638,7 @@ 774160703,774160735,CH 774160736,774160768,GR 774160769,774160801,IL -774160802,774160802,A1 +774160802,774160802,GB 774160803,774160832,BG 774160833,774160864,NO 774160865,774160869,BR @@ -8200,7 +8668,7 @@ 774161127,774161136,SC 774161137,774161146,SG 774161147,774161149,BY -774161150,774161151,A1 +774161150,774161151,GB 774161152,774161162,AQ 774161163,774161172,KR 774161173,774161182,TH @@ -8216,7 +8684,7 @@ 774161273,774161282,MT 774161283,774161292,SE 774161293,774161302,HK -774161303,774161312,A1 +774161303,774161312,GB 774161313,774161322,IE 774161323,774161332,PK 774161333,774161337,KW @@ -8232,9 +8700,9 @@ 774161383,774161387,EE 774161388,774161392,LU 774161393,774161397,SK -774161398,774161402,A1 +774161398,774161402,GB 774161403,774161405,LC -774161406,774161408,A1 +774161406,774161408,GB 774161409,774161418,US 774161419,774161428,GL 774161429,774161438,HU @@ -8255,14 +8723,14 @@ 774161579,774161588,VE 774161589,774161598,TC 774161599,774161618,US -774161619,774161628,A1 +774161619,774161628,GB 774161629,774161638,PA 774161639,774161648,RU 774161649,774161658,HK -774161659,774161664,A1 +774161659,774161664,GB 774161665,774161674,US 774161675,774161675,CL -774161676,774161684,A1 +774161676,774161684,GB 774161685,774161694,GR 774161695,774161704,AG 774161705,774161714,AM @@ -8282,25 +8750,17 @@ 774161845,774161854,VU 774161855,774161864,MX 774161865,774161865,AR -774161866,774161869,A1 +774161866,774161869,GB 774161870,774161874,ES -774161875,774161899,A1 +774161875,774161899,GB 774161900,774161904,FR -774161905,774162060,A1 +774161905,774162060,GB 774162061,774162065,US -774162066,774162105,A1 -774162106,774162110,GB -774162111,774162125,A1 +774162066,774162125,GB 774162126,774162130,MO -774162131,774162170,A1 -774162171,774162173,GB -774162174,774162225,A1 -774162226,774162236,GB -774162237,774162246,A1 +774162131,774162246,GB 774162247,774162256,US -774162257,774162296,A1 -774162297,774162306,GB -774162307,774162336,A1 +774162257,774162336,GB 774162337,774162346,AZ 774162347,774162366,US 774162367,774162376,MX @@ -8311,7 +8771,8 @@ 774162397,774162406,SZ 774162407,774162416,SD 774162417,774162426,BF -774162427,774162432,A1 +774162427,774162431,GB +774162432,774162432,A1 774162433,774162442,GB 774162443,774162452,BA 774162453,774162462,BO @@ -8538,16 +8999,23 @@ 778371072,778403839,GB 778403840,778436607,DE 778436608,778461183,RO -778461184,778463231,EE +778461184,778461439,TR +778461440,778462207,EE +778462208,778462463,TR +778462464,778463231,EE 778463232,778467327,RO 778467328,778473471,IR 778473472,778475519,RO 778475520,778475775,CH 778475776,778476031,RO 778476032,778476287,MD -778476288,778481919,RO +778476288,778480639,RO +778480640,778480895,MD +778480896,778481663,RO +778481664,778481919,MD 778481920,778482943,GB -778482944,778484735,RO +778482944,778483199,MD +778483200,778484735,RO 778484736,778485247,IT 778485248,778485759,RO 778485760,778493951,GB @@ -8593,11 +9061,17 @@ 778673208,778673211,ES 778673212,778673383,FR 778673384,778673387,IT -778673388,778673751,FR +778673388,778673631,FR +778673632,778673647,DE +778673648,778673751,FR 778673752,778673759,DE 778673760,778673883,FR 778673884,778673887,ES -778673888,778675795,FR +778673888,778674767,FR +778674768,778674783,BE +778674784,778675695,FR +778675696,778675711,BE +778675712,778675795,FR 778675796,778675799,ES 778675800,778675891,FR 778675892,778675895,ES @@ -8624,13 +9098,19 @@ 778681504,778681507,DE 778681508,778681519,FR 778681520,778681523,ES -778681524,778681823,FR +778681524,778681535,FR +778681536,778681543,NL +778681544,778681823,FR 778681824,778681827,IT 778681828,778682103,FR 778682104,778682111,DE -778682112,778688627,FR +778682112,778688447,FR +778688448,778688451,CZ +778688452,778688627,FR 778688628,778688631,NL -778688632,778691619,FR +778688632,778689923,FR +778689924,778689927,DE +778689928,778691619,FR 778691620,778691623,IT 778691624,778691711,FR 778691712,778691727,GB @@ -8650,7 +9130,9 @@ 778693428,778693431,ES 778693432,778693759,FR 778693760,778693763,ES -778693764,778695471,FR +778693764,778695135,FR +778695136,778695167,DE +778695168,778695471,FR 778695472,778695475,ES 778695476,778695839,FR 778695840,778695871,DE @@ -8659,14 +9141,16 @@ 778696448,778696495,FR 778696496,778696499,ES 778696500,778696811,FR -778696812,778696812,DE -778696813,778696991,FR +778696812,778696815,DE +778696816,778696991,FR 778696992,778696995,ES 778696996,778697067,FR 778697068,778697071,ES 778697072,778697175,FR 778697176,778697179,ES -778697180,778697815,FR +778697180,778697471,FR +778697472,778697479,CZ +778697480,778697815,FR 778697816,778697819,ES 778697820,778697955,FR 778697956,778697959,ES @@ -8715,7 +9199,7 @@ 781189120,781320191,NL 781320192,781451263,RU 781451264,781455359,PL -781455360,781459455,LT +781455360,781459455,UA 781459456,781463551,IR 781463552,781467647,RU 781467648,781475839,PL @@ -8723,7 +9207,8 @@ 781479936,781484031,UA 781484032,781488127,RU 781488128,781496319,PL -781496320,781516799,RU +781496320,781500415,UA +781500416,781516799,RU 781516800,781520895,SA 781520896,781524991,IS 781524992,781529087,RU @@ -8910,7 +9395,9 @@ 783681536,783683583,IE 783683584,783685631,DE 783685632,783687679,RU -783687680,783689727,PT +783687680,783688447,PT +783688448,783688703,ES +783688704,783689727,PT 783689728,783691775,FR 783691776,783693823,BY 783693824,783694367,GB @@ -9479,8 +9966,8 @@ 793247744,793313279,NZ 793313280,793378815,DE 793378816,794558463,CA -794558464,795934719,CN -795934720,797873663,CA +794558464,796917759,CN +796917760,797873663,CA 797873664,797873919,US 797873920,805306367,CA 805306368,822083583,US @@ -9604,31 +10091,19 @@ 838467584,838729727,JP 838729728,838795263,KR 838795264,838860799,AU -838860800,838995711,US -838995712,838995967,CA -838995968,838996991,US +838860800,838996991,US 838996992,838997247,CA 838997248,839016191,US 839016192,839016447,CA -839016448,839027967,US -839027968,839030015,IN -839030016,839056447,US +839016448,839056447,US 839056448,839056455,CN -839056456,839061503,US -839061504,839061759,CA -839061760,839062271,US -839062272,839064063,CA -839064064,839069183,US -839069184,839071231,CA -839071232,839095807,US -839095808,839096063,CA -839096064,839104255,US -839104256,839104511,CA -839104512,839112191,US -839112192,839112703,CA -839112704,839339607,US +839056456,839112191,US +839112192,839112447,CA +839112448,839339607,US 839339608,839339609,A1 -839339610,839348223,US +839339610,839340031,US +839340032,839341055,ES +839341056,839348223,US 839348224,839348479,DE 839348480,839348735,AT 839348736,839348991,GB @@ -9667,11 +10142,7 @@ 840838511,840838512,UA 840838513,840865791,US 840865792,840866047,CA -840866048,840898047,US -840898048,840898559,CA -840898560,840909055,US -840909056,840909311,CA -840909312,840953855,US +840866048,840953855,US 840953856,840954367,JP 840954368,840956927,US 840956928,840957951,JP @@ -9687,9 +10158,7 @@ 846442496,846446591,CA 846446592,846537727,US 846537728,846537983,A1 -846537984,846540031,US -846540032,846540287,A1 -846540288,846544127,US +846537984,846544127,US 846544128,846544383,A1 846544384,846546943,US 846546944,846547199,A1 @@ -9700,10 +10169,24 @@ 846627072,855638015,US 855638016,860905167,GB 860905168,860905171,FR -860905172,872415231,GB +860905172,867041279,GB +867041280,867172351,NO +867172352,867368959,GB +867368960,867401727,IT +867401728,869466111,GB +869466112,869531647,SA +869531648,869924863,GB +869924864,869990399,SA +869990400,870252543,GB +870252544,870318079,SA +870318080,871038975,GB +871038976,871104511,SA +871104512,872153087,GB +872153088,872284159,SA +872284160,872415231,FR 872415232,873463807,US -873463808,873594879,IE -873594880,874250239,US +873463808,873725951,IE +873725952,874250239,US 874250240,874315775,DE 874315776,876609535,US 876609536,876642303,AU @@ -9711,9 +10194,33 @@ 876871680,877002751,JP 877002752,877264895,US 877264896,877330431,SG -877330432,878510079,US +877330432,877395967,US +877395968,877428735,SG +877428736,878510079,US 878510080,878518271,DE -878518272,880877567,US +878518272,878650367,US +878650368,878651391,AU +878651392,878655487,US +878655488,878656511,JP +878656512,878702591,US +878702592,878702847,BR +878702848,878703103,AU +878703104,878703359,SG +878703360,878703615,JP +878703616,878703871,IE +878703872,878704639,US +878704640,878704895,DE +878704896,878705151,CN +878705152,878706431,US +878706432,878706447,BR +878706448,878706463,AU +878706464,878706479,SG +878706480,878706495,JP +878706496,878706511,IE +878706512,878706559,US +878706560,878706575,DE +878706576,878706591,CN +878706592,880877567,US 880877568,880878079,EU 880878080,882843337,US 882843338,882843339,EU @@ -9824,13 +10331,7 @@ 922189568,922205775,IE 922205776,922205776,DE 922205777,922222591,IE -922222592,922289836,JP -922289837,922289837,DE -922289838,922289844,JP -922289845,922289845,DE -922289846,922289852,JP -922289853,922289853,DE -922289854,922419199,JP +922222592,922419199,JP 922419200,922427633,SG 922427634,922427634,US 922427635,922427703,SG @@ -10297,14 +10798,14 @@ 1024196608,1024229375,IN 1024229376,1024262143,JP 1024262144,1024327679,SG -1024327680,1024344063,US +1024327680,1024327935,US +1024327936,1024327943,AU +1024327944,1024344063,US 1024344064,1024352255,SG 1024352256,1024360447,AU 1024360448,1024361167,JP 1024361168,1024361183,HK -1024361184,1024362911,JP -1024362912,1024362943,SG -1024362944,1024364063,JP +1024361184,1024364063,JP 1024364064,1024364079,AU 1024364080,1024365055,JP 1024365056,1024365311,AP @@ -10330,7 +10831,7 @@ 1025245184,1025277951,CN 1025277952,1025294335,PH 1025294336,1025294591,JP -1025294592,1025294847,HK +1025294592,1025294847,SG 1025294848,1025295103,TH 1025295104,1025295615,CN 1025295616,1025295871,MY @@ -10480,7 +10981,11 @@ 1041784832,1041793023,KE 1041793024,1041825791,GB 1041825792,1041842175,NL -1041842176,1041891327,GB +1041842176,1041858559,GB +1041858560,1041862655,HK +1041862656,1041866751,SG +1041866752,1041870847,JP +1041870848,1041891327,GB 1041891328,1042022399,DE 1042022400,1042087935,PT 1042087936,1042120703,TR @@ -10864,7 +11369,9 @@ 1046531840,1046532095,DE 1046532096,1046533375,GB 1046533376,1046533383,DE -1046533384,1046535295,GB +1046533384,1046533537,GB +1046533538,1046533538,DE +1046533539,1046535295,GB 1046535296,1046535311,DE 1046535312,1046535439,GB 1046535440,1046535447,DE @@ -10977,7 +11484,8 @@ 1048051712,1048117247,SA 1048117248,1048125439,GB 1048125440,1048133631,FI -1048133632,1048158207,PL +1048133632,1048150015,RO +1048150016,1048158207,PL 1048158208,1048166399,DK 1048166400,1048182783,CH 1048182784,1048184831,UA @@ -11841,9 +12349,7 @@ 1065906176,1065908223,KY 1065908224,1066254975,US 1066254976,1066255103,GB -1066255104,1066255871,US -1066255872,1066256383,A1 -1066256384,1066311679,US +1066255104,1066311679,US 1066311680,1066315775,CA 1066315776,1066352639,US 1066352640,1066355711,JM @@ -11951,7 +12457,9 @@ 1071477248,1071480831,CA 1071480832,1071522817,US 1071522818,1071522818,MW -1071522819,1071727023,US +1071522819,1071726951,US +1071726952,1071726955,IE +1071726956,1071727023,US 1071727024,1071727027,GB 1071727028,1071954223,US 1071954224,1071954231,GB @@ -11987,9 +12495,7 @@ 1072926208,1072926719,US 1072926720,1072926975,PH 1072926976,1072927487,CA -1072927488,1072927743,US -1072927744,1072927999,CA -1072928000,1072928511,US +1072927488,1072928511,US 1072928512,1072928767,CA 1072928768,1072929023,US 1072929024,1072929535,CA @@ -11998,7 +12504,9 @@ 1072931072,1072931327,US 1072931328,1072931583,CA 1072931584,1072931839,SY -1072931840,1072932607,CA +1072931840,1072932095,CA +1072932096,1072932351,US +1072932352,1072932607,CA 1072932608,1072932863,NG 1072932864,1072933887,US 1072933888,1072934399,CA @@ -12190,9 +12698,9 @@ 1075421184,1075429375,CA 1075429376,1075478527,US 1075478528,1075494911,CA -1075494912,1075558143,US -1075558144,1075558911,VI -1075558912,1075576831,US +1075494912,1075558399,US +1075558400,1075558655,VI +1075558656,1075576831,US 1075576832,1075576895,GB 1075576896,1075576896,SE 1075576897,1075577087,GB @@ -12307,9 +12815,7 @@ 1076174848,1076178943,BM 1076178944,1076183807,US 1076183808,1076184063,CA -1076184064,1076193279,US -1076193280,1076193535,PK -1076193536,1076194559,US +1076184064,1076194559,US 1076194560,1076194815,CA 1076194816,1076195071,US 1076195072,1076195327,IN @@ -12343,11 +12849,7 @@ 1076424704,1076428799,CA 1076428800,1076543487,US 1076543488,1076559871,CA -1076559872,1076628991,US -1076628992,1076629247,VI -1076629248,1076635647,US -1076647680,1076647935,US -1076660224,1076660735,US +1076559872,1076625407,US 1076690944,1076756479,US 1076756480,1076772863,CA 1076772864,1076850687,US @@ -12617,9 +13119,7 @@ 1081037312,1081037567,CA 1081037568,1081038335,US 1081038336,1081040895,CA -1081040896,1081081855,US -1081122560,1081122815,VI -1081126912,1081212927,US +1081040896,1081212927,US 1081212928,1081278463,CA 1081278464,1081369599,US 1081369600,1081370111,CO @@ -12696,7 +13196,9 @@ 1082945536,1082949631,CA 1082949632,1082982399,US 1082982400,1083015167,CA -1083015168,1083396095,US +1083015168,1083267583,US +1083267584,1083268095,JP +1083268096,1083396095,US 1083396096,1083400191,BM 1083400192,1083437055,US 1083437056,1083441151,CA @@ -12728,11 +13230,9 @@ 1085997056,1086013439,CA 1086013440,1086042111,US 1086042112,1086046207,CA -1086046208,1086309887,US -1086309888,1086310143,AU -1086310144,1086317823,US -1086317824,1086318079,CA -1086318080,1086421503,US +1086046208,1086050815,US +1086050816,1086051327,CA +1086051328,1086421503,US 1086421504,1086422015,MP 1086422016,1086922751,US 1086922752,1086930943,CA @@ -12875,9 +13375,7 @@ 1090427392,1090427647,CA 1090427648,1090445311,US 1090445312,1090453503,CA -1090453504,1091798783,US -1091798784,1091799039,CN -1091799040,1091803135,US +1090453504,1091803135,US 1091803136,1091803391,CN 1091803392,1091807231,US 1091807232,1091807487,CA @@ -12896,9 +13394,7 @@ 1093033984,1093055487,US 1093055488,1093055743,AR 1093055744,1093058559,US -1093058560,1093063167,PR -1093063168,1093063679,DO -1093063680,1093066751,PR +1093058560,1093066751,PR 1093066752,1093074943,US 1093074944,1093091327,CA 1093091328,1093107967,US @@ -12992,9 +13488,9 @@ 1093723648,1093724415,BB 1093724416,1093725183,VC 1093725184,1093730303,BB -1093730304,1093733887,US -1093733888,1093734143,A1 -1093734144,1093965960,US +1093730304,1093734053,US +1093734054,1093734054,PH +1093734055,1093965960,US 1093965961,1093965961,NL 1093965962,1093966163,US 1093966164,1093966164,NL @@ -13329,9 +13825,7 @@ 1110887424,1110887679,IE 1110887680,1110929407,US 1110929408,1110933503,BM -1110933504,1110937599,US -1110937600,1110937855,A1 -1110937856,1111195647,US +1110933504,1111195647,US 1111195648,1111212031,CA 1111212032,1111228415,US 1111228416,1111244799,AR @@ -13339,13 +13833,14 @@ 1112432640,1112440831,CA 1112440832,1112530943,US 1112530944,1112539135,CA -1112539136,1112867071,US -1112871936,1112872191,US -1112872960,1112873215,US +1112539136,1112870911,US +1112871936,1112873983,US 1112873984,1112875007,CA 1112875008,1112907775,US 1112907776,1112907783,CA -1112907784,1113591807,US +1112907784,1112931327,US +1112931328,1112931839,CA +1112932352,1113591807,US 1113591808,1113595903,CA 1113595904,1113596415,CL 1113596416,1113596927,GT @@ -13467,9 +13962,7 @@ 1117415424,1117416191,CW 1117416192,1117416447,CA 1117416448,1117416703,US -1117416704,1117419775,CA -1117419776,1117420031,US -1117420032,1117420415,CA +1117416704,1117420415,CA 1117420416,1117420447,US 1117420448,1117421567,CA 1117421568,1117458911,US @@ -13504,10 +13997,8 @@ 1118031872,1118126335,US 1118126336,1118126591,CA 1118126592,1118130687,US -1118130688,1118131353,CA -1118131354,1118131354,US -1118131355,1118131455,CA -1118131456,1118131967,US +1118130688,1118131199,CA +1118131200,1118131967,US 1118131968,1118132479,CA 1118132480,1118132991,US 1118132992,1118133247,CA @@ -13627,9 +14118,7 @@ 1119558144,1119558655,PR 1119558656,1119568383,US 1119568384,1119568639,GB -1119568640,1119570559,US -1119570560,1119570687,GB -1119570688,1119571967,US +1119568640,1119571967,US 1119571968,1119576063,CA 1119576064,1119580159,US 1119580160,1119584255,CA @@ -13683,9 +14172,7 @@ 1120376480,1120376494,CA 1120376495,1120376559,US 1120376560,1120376575,CA -1120376576,1120376695,US -1120376696,1120376703,CA -1120376704,1120376831,US +1120376576,1120376831,US 1120376832,1120377087,CA 1120377088,1120377343,US 1120377344,1120377599,CA @@ -13925,9 +14412,7 @@ 1125550336,1125552127,CA 1125552128,1125572607,US 1125572608,1125576703,CA -1125576704,1125593371,US -1125593372,1125593375,GB -1125593376,1125613567,US +1125576704,1125613567,US 1125613568,1125617663,CA 1125617664,1126924287,US 1126924288,1126928383,CA @@ -13953,7 +14438,9 @@ 1133785352,1133785359,IE 1133785360,1133785439,US 1133785440,1133785471,GB -1133785472,1133789695,US +1133785472,1133785487,US +1133785488,1133785495,IE +1133785496,1133789695,US 1133789696,1133789823,GB 1133789824,1133789887,US 1133789888,1133789895,NL @@ -14072,9 +14559,7 @@ 1138544896,1138545151,GB 1138545152,1138593791,US 1138593792,1138597887,CA -1138597888,1138600447,US -1138600448,1138600703,BE -1138600704,1138704383,US +1138597888,1138704383,US 1138704384,1138716671,CA 1138716672,1138720767,US 1138720768,1138728959,CA @@ -14171,9 +14656,7 @@ 1157753088,1157753343,GB 1157753344,1157758207,US 1157758208,1157758463,RU -1157758464,1157912703,US -1157912704,1157912831,CA -1157912832,1157913215,US +1157758464,1157913215,US 1157913216,1157913279,CA 1157913280,1157914194,US 1157914195,1157914202,IN @@ -14209,8 +14692,12 @@ 1158348800,1158381567,CA 1158381568,1158422527,US 1158422528,1158423551,CA -1158423552,1158440959,US +1158423552,1158427647,US +1158427648,1158428159,CA +1158428160,1158428415,US +1158428672,1158440959,US 1158441216,1158441471,US +1158441472,1158441983,CA 1158441984,1158443007,DM 1158443008,1158774783,US 1158774784,1158784703,CA @@ -14226,13 +14713,7 @@ 1159102720,1159102975,A1 1159102976,1159112703,US 1159112704,1159112959,A1 -1159112960,1159113215,US -1159113216,1159113471,A1 -1159113472,1159113727,US -1159113728,1159113983,A1 -1159113984,1159115519,US -1159115520,1159115775,A1 -1159115776,1159117055,US +1159112960,1159117055,US 1159117056,1159117311,A1 1159117312,1159117567,US 1159117568,1159117823,A1 @@ -14495,9 +14976,7 @@ 1162840064,1162853375,US 1162853376,1162854399,PR 1162854400,1162858495,JM -1162858496,1162862591,US -1162862592,1162866687,PR -1162866688,1162870783,US +1162858496,1162870783,US 1162870784,1162871295,BB 1162871296,1162879999,LC 1162880000,1162882559,DM @@ -14548,7 +15027,11 @@ 1163536128,1163536383,CA 1163536384,1163537663,US 1163537664,1163538431,CA -1163538432,1163540351,US +1163538432,1163538463,US +1163538464,1163538479,CA +1163538480,1163538575,US +1163538576,1163538591,CA +1163538592,1163540351,US 1163540352,1163540479,CA 1163540480,1163540735,US 1163540736,1163541503,CA @@ -14709,8 +15192,8 @@ 1168958528,1168958559,IN 1168958560,1168960671,US 1168960672,1168960703,CA -1168960704,1168961023,US -1168961024,1168961791,CA +1168960704,1168961535,US +1168961536,1168961791,CA 1168961792,1168961807,US 1168961808,1168961815,CA 1168961816,1168961887,US @@ -14748,8 +15231,7 @@ 1170467840,1170468351,DO 1170468352,1170470911,US 1170470912,1170471167,ES -1170471168,1170472703,US -1170472704,1170472959,VG +1170471168,1170472959,US 1170472960,1170481151,CA 1170481152,1170489343,US 1170489344,1170497535,CA @@ -14777,8 +15259,7 @@ 1176626112,1176626127,CA 1176626128,1176630271,US 1176630272,1176631295,CA -1176631296,1176631551,NL -1176631552,1176702975,US +1176631296,1176702975,US 1176702976,1176707071,CA 1176707072,1176731647,US 1176731648,1176735743,PR @@ -14832,12 +15313,12 @@ 1177059328,1177061375,CA 1177061376,1177062143,US 1177062144,1177075455,CA -1177075456,1177164863,US +1177075456,1177164415,US +1177164416,1177164543,CA +1177164544,1177164863,US 1177164864,1177164895,CA 1177164896,1177165055,US -1177165056,1177165061,CA -1177165062,1177165062,US -1177165063,1177165311,CA +1177165056,1177165311,CA 1177165312,1177354239,US 1177354240,1177403391,PR 1177403392,1177403647,US @@ -14881,9 +15362,7 @@ 1208338176,1208590335,US 1208590336,1208598527,CA 1208598528,1208647679,US -1208647680,1208656575,CA -1208656576,1208656583,DO -1208656584,1208657775,CA +1208647680,1208657775,CA 1208657776,1208657783,TR 1208657784,1208659967,CA 1208659968,1208721407,US @@ -15158,7 +15637,7 @@ 1248915456,1248919551,US 1248919552,1248920575,CA 1248920576,1248921599,US -1248921600,1248923647,CA +1248922624,1248923647,CA 1248923648,1248936959,US 1248936960,1248939007,CA 1248939008,1248946175,US @@ -15246,7 +15725,7 @@ 1249359872,1249361919,CA 1249361920,1249379327,US 1249379328,1249380351,CA -1249380352,1249384447,US +1249380352,1249383423,US 1249384448,1249386495,PR 1249386496,1249391615,US 1249391616,1249392639,CA @@ -15391,9 +15870,7 @@ 1254490112,1254555647,CA 1254555648,1254621183,US 1254621184,1254629375,CA -1254629376,1254704383,US -1254704384,1254704639,PH -1254704640,1254978751,US +1254629376,1254978751,US 1254978752,1254978767,LB 1254978768,1254989823,US 1254989824,1254998015,CA @@ -15607,7 +16084,9 @@ 1296237824,1296237824,GB 1296237825,1296237825,FR 1296237826,1296237826,GB -1296237827,1296238591,FR +1296237827,1296237878,FR +1296237879,1296237879,GB +1296237880,1296238591,FR 1296238592,1296239103,NL 1296239104,1296239231,FR 1296239232,1296239359,NL @@ -15840,7 +16319,11 @@ 1297072128,1297088511,PL 1297088512,1297121279,AT 1297121280,1297154047,SE -1297154048,1297168383,RO +1297154048,1297154815,RO +1297154816,1297155071,MD +1297155072,1297162239,RO +1297162240,1297166335,IR +1297166336,1297168383,RO 1297168384,1297170431,AZ 1297170432,1297170943,RO 1297170944,1297171455,GB @@ -15852,7 +16335,9 @@ 1297176320,1297176831,RO 1297176832,1297177599,GB 1297177600,1297177855,QA -1297177856,1297178623,RO +1297177856,1297178111,US +1297178112,1297178367,QA +1297178368,1297178623,RO 1297178624,1297178879,NL 1297178880,1297182719,RO 1297182720,1297184767,ES @@ -16418,7 +16903,10 @@ 1311264768,1311266815,RU 1311266816,1311268863,FR 1311268864,1311270911,BE -1311270912,1311272959,RU +1311270912,1311271935,RU +1311271936,1311272447,KZ +1311272448,1311272703,RU +1311272704,1311272959,IE 1311272960,1311275007,GB 1311275008,1311277055,FR 1311277056,1311279103,IT @@ -16569,17 +17057,7 @@ 1317011456,1317044223,BG 1317044224,1317076991,CZ 1317076992,1317109759,BE -1317109760,1317111935,GB -1317111936,1317111999,A1 -1317112000,1317115391,GB -1317115392,1317115647,A1 -1317115648,1317117951,GB -1317117952,1317118207,A1 -1317118208,1317119999,GB -1317120000,1317120255,A1 -1317120256,1317120767,GB -1317120768,1317120895,A1 -1317120896,1317126399,GB +1317109760,1317126399,GB 1317126400,1317126655,US 1317126656,1317142527,GB 1317142528,1317175295,PT @@ -16645,9 +17123,13 @@ 1318593984,1318593991,GB 1318593992,1318594007,NL 1318594008,1318594015,GB -1318594016,1318597343,NL +1318594016,1318596543,NL +1318596544,1318596559,SE +1318596560,1318597343,NL 1318597344,1318597359,US -1318597360,1318600703,NL +1318597360,1318599679,NL +1318599680,1318599687,IE +1318599688,1318600703,NL 1318600704,1318608895,AT 1318608896,1318617087,IT 1318617088,1318625279,FR @@ -16687,10 +17169,9 @@ 1318903808,1318911999,RU 1318912000,1318920191,MK 1318920192,1318928383,IR -1318928384,1318936319,LT -1318936320,1318936383,US +1318928384,1318936383,LT 1318936384,1318936447,BR -1318936448,1318936575,US +1318936448,1318936575,LT 1318936576,1318944767,DK 1318944768,1318958079,CZ 1318958080,1318960127,PL @@ -16843,7 +17324,9 @@ 1334116352,1334124543,AX 1334124544,1334125567,DE 1334125568,1334126591,ES -1334126592,1334130687,DE +1334126592,1334127359,DE +1334127360,1334127615,AT +1334127616,1334130687,DE 1334130688,1334131711,NL 1334131712,1334132735,DE 1334132736,1334165503,RU @@ -16942,10 +17425,7 @@ 1334724352,1334724607,SE 1334724608,1334724863,US 1334724864,1334725631,NL -1334725632,1334725887,SE -1334725888,1334725900,NL -1334725901,1334725901,SE -1334725902,1334726143,NL +1334725632,1334726143,SE 1334726144,1334726399,LU 1334726400,1334726655,SE 1334726656,1334734847,RU @@ -17669,7 +18149,9 @@ 1347694592,1347706879,GB 1347706880,1347710975,IT 1347710976,1347715071,RU -1347715072,1347718143,ES +1347715072,1347717375,ES +1347717376,1347717631,BG +1347717632,1347718143,ES 1347718144,1347718399,US 1347718400,1347723263,ES 1347723264,1347727359,GB @@ -17768,7 +18250,11 @@ 1348063232,1348067327,CH 1348067328,1348071423,NL 1348071424,1348075519,DE -1348075520,1348083711,LV +1348075520,1348076287,LV +1348076288,1348076543,RU +1348076544,1348082687,LV +1348082688,1348082943,RU +1348082944,1348083711,LV 1348083712,1348091903,LU 1348091904,1348095999,RU 1348096000,1348100095,AL @@ -17988,7 +18474,9 @@ 1357316096,1357317119,EU 1357317120,1357317375,GB 1357317376,1357317631,A2 -1357317632,1357318399,EU +1357317632,1357318159,EU +1357318160,1357318191,GB +1357318192,1357318399,EU 1357318400,1357318655,FR 1357318656,1357321023,EU 1357321024,1357321087,KE @@ -18000,8 +18488,8 @@ 1357323008,1357323015,CG 1357323016,1357323519,EU 1357323520,1357323775,GB -1357323776,1357323779,FI -1357323780,1357324287,EU +1357323776,1357323783,FI +1357323784,1357324287,EU 1357324288,1357325311,GB 1357325312,1357326335,EU 1357326336,1357326337,ES @@ -18046,8 +18534,8 @@ 1357348416,1357348479,EU 1357348480,1357348607,ES 1357348608,1357350399,EU -1357350400,1357350527,GB -1357350528,1357351167,EU +1357350400,1357350591,GB +1357350592,1357351167,EU 1357351168,1357351423,PL 1357351424,1357360063,EU 1357360064,1357360127,GB @@ -18078,8 +18566,8 @@ 1357373556,1357373567,EU 1357373568,1357373695,GB 1357373696,1357373951,EU -1357373952,1357374975,GB -1357374976,1357377535,EU +1357373952,1357375103,GB +1357375104,1357377535,EU 1357377536,1357377671,FR 1357377672,1357377791,EU 1357377792,1357378559,FR @@ -18205,7 +18693,9 @@ 1357984120,1357984367,GB 1357984368,1357984375,IT 1357984376,1357984527,GB -1357984528,1357984551,IT +1357984528,1357984535,IT +1357984536,1357984543,GB +1357984544,1357984551,IT 1357984552,1357984591,GB 1357984592,1357984599,IT 1357984600,1357984831,GB @@ -18436,8 +18926,10 @@ 1358861568,1358861823,DE 1358861824,1358862335,FR 1358862336,1358862847,US -1358862848,1358863103,DK -1358863104,1358863359,EU +1358862848,1358862911,DK +1358862912,1358862914,EU +1358862915,1358862915,DK +1358862916,1358863359,EU 1358863360,1358863615,US 1358863616,1358864383,GB 1358864384,1358872575,CH @@ -18612,7 +19104,9 @@ 1360359424,1360363519,AT 1360363520,1360365567,IT 1360365568,1360367615,NL -1360367616,1360371711,IE +1360367616,1360367771,IE +1360367772,1360367772,DE +1360367773,1360371711,IE 1360371712,1360375807,TR 1360375808,1360379903,NL 1360379904,1360383999,PL @@ -18681,7 +19175,8 @@ 1360654336,1360658431,EE 1360658432,1360666623,PL 1360666624,1360674815,NO -1360674816,1360678911,DZ +1360674816,1360676863,DZ +1360676864,1360678911,ZA 1360678912,1360683007,RU 1360683008,1360691199,GB 1360691200,1360698879,RU @@ -18740,7 +19235,13 @@ 1360961536,1360965631,UA 1360965632,1360977919,RU 1360977920,1360986111,CZ -1360986112,1360992255,GB +1360986112,1360986269,GB +1360986270,1360986270,US +1360986271,1360986299,GB +1360986300,1360986300,US +1360986301,1360986367,GB +1360986368,1360986399,US +1360986400,1360992255,GB 1360992256,1360992511,DE 1360992512,1360994303,GB 1360994304,1360998399,CZ @@ -19026,7 +19527,9 @@ 1370619904,1370750975,GB 1370750976,1370767359,RO 1370767360,1370771455,MD -1370771456,1370882047,RO +1370771456,1370772479,RO +1370772480,1370772991,MD +1370772992,1370882047,RO 1370882048,1371013119,HU 1371013120,1371078655,ES 1371078656,1371144191,FR @@ -19052,7 +19555,9 @@ 1372004352,1372012543,A2 1372012544,1372013567,ZM 1372013568,1372020735,A2 -1372020736,1372022783,ZM +1372020736,1372020991,ZM +1372020992,1372021247,CD +1372021248,1372022783,ZM 1372022784,1372026623,A2 1372026624,1372026879,KE 1372026880,1372027903,IL @@ -19260,7 +19765,9 @@ 1382367232,1382383615,BG 1382383616,1382399999,DZ 1382400000,1382416383,NL -1382416384,1382432767,PT +1382416384,1382417663,PT +1382417664,1382418175,SE +1382418176,1382432767,PT 1382432768,1382449151,CY 1382449152,1382465535,IL 1382465536,1382481919,PS @@ -19276,7 +19783,9 @@ 1383088128,1383096319,IS 1383096320,1383098879,GB 1383098880,1383099135,DE -1383099136,1383104511,GB +1383099136,1383099163,GB +1383099164,1383099164,NL +1383099165,1383104511,GB 1383104512,1383112703,JE 1383112704,1383114751,LB 1383114752,1383116799,GB @@ -19422,9 +19931,7 @@ 1385218048,1385226239,UA 1385226240,1385234431,GB 1385234432,1385242623,DE -1385242624,1385250431,GB -1385250432,1385250559,A1 -1385250560,1385250815,GB +1385242624,1385250815,GB 1385250816,1385259007,PL 1385259008,1385267199,IT 1385267200,1385275391,SE @@ -19493,7 +20000,9 @@ 1386448896,1386450943,IL 1386450944,1386479615,GB 1386479616,1386545151,NO -1386545152,1386610687,DE +1386545152,1386552319,DE +1386552320,1386553087,GB +1386553088,1386610687,DE 1386610688,1386676223,IL 1386676224,1386741759,SA 1386741760,1387249663,NL @@ -19539,7 +20048,9 @@ 1388568576,1388576767,CH 1388576768,1388580863,NL 1388580864,1388581119,GB -1388581120,1388584959,FR +1388581120,1388583167,FR +1388583168,1388583423,DZ +1388583424,1388584959,FR 1388584960,1388587455,EU 1388587456,1388587471,GB 1388587472,1388589055,EU @@ -19584,9 +20095,15 @@ 1388688160,1388691455,CH 1388691456,1388699647,NL 1388699648,1388707839,SE -1388707840,1388709375,RU +1388707840,1388708727,RU +1388708728,1388708743,US +1388708744,1388708859,RU +1388708860,1388708863,US +1388708864,1388709375,RU 1388709376,1388709887,LT -1388709888,1388714239,RU +1388709888,1388712063,RU +1388712064,1388712191,LT +1388712192,1388714239,RU 1388714240,1388714495,LB 1388714496,1388714751,RU 1388714752,1388715007,LT @@ -19675,7 +20192,9 @@ 1389290496,1389297663,A2 1389297664,1389330431,UA 1389330432,1389363199,DE -1389363200,1389379583,CZ +1389363200,1389373498,CZ +1389373499,1389373499,ES +1389373500,1389379583,CZ 1389379584,1389395967,RU 1389395968,1389412351,RO 1389412352,1389428735,RS @@ -19804,28 +20323,8 @@ 1399717888,1399848959,AE 1399848960,1400111103,FR 1400111104,1400373247,NL -1400373248,1400702463,DE -1400702464,1400702975,EU -1400702976,1400705023,DE -1400705024,1400706047,EU -1400706048,1400707071,DE -1400707072,1400709119,EU -1400709120,1400710143,DE -1400710144,1400711167,EU -1400711168,1400712191,DE -1400712192,1400713215,EU -1400713216,1400718335,DE -1400718336,1400719359,EU -1400719360,1400721919,DE -1400721920,1400722687,EU -1400722688,1400727551,DE -1400727552,1400727807,EU -1400727808,1400727935,DE -1400727936,1400729599,EU -1400729600,1400730623,DE -1400730624,1400731647,EU -1400731648,1400733695,DE -1400733696,1400897535,EU +1400373248,1400766463,DE +1400766464,1400897535,EU 1400897536,1400963071,NL 1400963072,1401028607,DE 1401028608,1401094143,IL @@ -19919,7 +20418,13 @@ 1401708288,1401708543,DE 1401708544,1401712895,SE 1401712896,1401713151,DE -1401713152,1401749503,SE +1401713152,1401727743,SE +1401727744,1401727999,GB +1401728000,1401740543,SE +1401740544,1401740799,DE +1401740800,1401747711,SE +1401747712,1401747967,FR +1401747968,1401749503,SE 1401749504,1401765887,DE 1401765888,1401782271,IE 1401782272,1401815039,FR @@ -19999,9 +20504,7 @@ 1402142720,1402159103,ES 1402159104,1402175487,IT 1402175488,1402191871,IE -1402191872,1402194943,IR -1402194944,1402195967,PT -1402195968,1402208255,IR +1402191872,1402208255,IR 1402208256,1402224639,CZ 1402224640,1402241023,BG 1402241024,1402257407,GB @@ -20039,9 +20542,9 @@ 1403420672,1403428863,NL 1403428864,1403437055,GB 1403437056,1403445247,RO -1403445248,1403447811,RU -1403447812,1403447812,MD -1403447813,1403461631,RU +1403445248,1403447295,RU +1403447296,1403448575,MD +1403448576,1403461631,RU 1403461632,1403469823,FR 1403469824,1403486207,RU 1403486208,1403494399,FR @@ -20422,7 +20925,9 @@ 1408761856,1409286143,SE 1409286144,1409362431,HU 1409362432,1409363967,BG -1409363968,1409378679,HU +1409363968,1409377791,HU +1409377792,1409378047,RO +1409378048,1409378679,HU 1409378680,1409378687,RO 1409378688,1409413119,HU 1409413120,1409415167,BG @@ -20637,10 +21142,8 @@ 1412805632,1412806143,EU 1412806144,1412808703,US 1412808704,1412825087,RU -1412825088,1412830463,IQ -1412830464,1412832767,LB +1412825088,1412831231,IQ 1412832768,1412833023,SL -1412833024,1412841471,LB 1412841472,1412857855,UZ 1412857856,1412874239,BG 1412874240,1412890623,RU @@ -20698,15 +21201,11 @@ 1422786560,1422852095,HU 1422852096,1422857087,EU 1422857088,1422857151,FR -1422857152,1422907391,EU -1422907392,1422909439,NL -1422909440,1422910207,EU -1422910208,1422910463,NL -1422910464,1422910975,EU -1422910976,1422911231,NL -1422911232,1422911487,EU -1422911488,1422913535,GB -1422913536,1422916607,EU +1422857152,1422905343,EU +1422905344,1422907391,IE +1422907392,1422911487,NL +1422911488,1422915583,GB +1422915584,1422916607,EU 1422916608,1422916863,GB 1422916864,1422917343,EU 1422917344,1422917375,NL @@ -20716,11 +21215,7 @@ 1423704064,1423966207,IT 1423966208,1424097279,HU 1424097280,1424228351,CH -1424228352,1424286719,IL -1424286720,1424286938,BG -1424286939,1424286939,IL -1424286940,1424287743,BG -1424287744,1424359423,IL +1424228352,1424359423,IL 1424359424,1424490495,FI 1424490496,1424503711,ES 1424503712,1424503715,PT @@ -20845,11 +21340,11 @@ 1425467392,1425469439,CH 1425469440,1425471487,DK 1425471488,1425473535,DE -1425473536,1425479679,RO -1425479680,1425480703,MD -1425480704,1425484799,RO +1425473536,1425484799,RO 1425484800,1425485311,MD -1425485312,1425489407,RO +1425485312,1425486847,RO +1425486848,1425487359,MD +1425487360,1425489407,RO 1425489408,1425489663,NL 1425489664,1425506303,RO 1425506304,1425522687,NO @@ -20888,7 +21383,9 @@ 1426660659,1426669567,RO 1426669568,1426685951,IR 1426685952,1426702335,TJ -1426702336,1426718719,LV +1426702336,1426716159,LV +1426716160,1426716415,RU +1426716416,1426718719,LV 1426718720,1426731007,SI 1426731008,1426735103,HR 1426735104,1426743295,BE @@ -21038,8 +21535,7 @@ 1432054016,1432054271,RO 1432054272,1432056831,RU 1432056832,1432057343,RO -1432057344,1432058623,RU -1432058624,1432059903,RO +1432057344,1432059903,RU 1432059904,1432068095,BG 1432068096,1432076287,BE 1432076288,1432084479,RU @@ -21294,7 +21790,8 @@ 1438515200,1438560255,DE 1438560256,1438562303,US 1438562304,1438580735,DE -1438580736,1438646271,NL +1438580736,1438613503,NL +1438613504,1438646271,DK 1438646272,1438662655,RU 1438662656,1438679039,ES 1438679040,1438695423,RU @@ -21308,9 +21805,12 @@ 1438777344,1438793727,SE 1438793728,1438810111,SA 1438810112,1438826495,SE -1438826496,1438838783,FI +1438826496,1438827519,FI +1438827520,1438828543,IQ +1438828544,1438829567,EE +1438829568,1438838783,FI 1438838784,1438840831,PL -1438840832,1438841855,FI +1438840832,1438841855,IQ 1438841856,1438842367,DE 1438842368,1438842879,DK 1438842880,1438859263,SE @@ -21327,9 +21827,7 @@ 1438894080,1438896127,IS 1438896128,1438900223,AQ 1438900224,1438908415,CH -1438908416,1438914815,BG -1438914816,1438917887,GR -1438917888,1438924799,BG +1438908416,1438924799,GR 1438924800,1438941183,NO 1438941184,1438957567,BG 1438957568,1438973951,EE @@ -21364,7 +21862,9 @@ 1439371520,1439371775,FR 1439371776,1439372031,SE 1439372032,1439372287,TR -1439372288,1439373311,NL +1439372288,1439372543,IT +1439372544,1439372799,JP +1439372800,1439373311,NL 1439373312,1439373567,SE 1439373568,1439383551,NL 1439383552,1439399935,FR @@ -21390,17 +21890,22 @@ 1439459328,1439459839,IR 1439459840,1439460607,RO 1439460608,1439460863,MD -1439460864,1439463423,RO +1439460864,1439462655,RO +1439462656,1439462911,MD +1439462912,1439463423,RO 1439463424,1439463935,DK 1439463936,1439466495,RO 1439466496,1439467007,DK 1439467008,1439467519,RO 1439467520,1439468031,DK -1439468032,1439477759,RO +1439468032,1439468543,RO +1439468544,1439469567,ES +1439469568,1439477759,RO 1439477760,1439479807,MD 1439479808,1439482367,RO 1439482368,1439482879,DK -1439482880,1439485951,RO +1439482880,1439483903,RO +1439483904,1439485951,ES 1439485952,1439490047,IR 1439490048,1439498239,RO 1439498240,1439513599,DE @@ -21440,9 +21945,7 @@ 1439629312,1439694847,CZ 1439694848,1439825919,SA 1439825920,1439956991,GB -1439956992,1440204799,DE -1440204800,1440215039,EU -1440215040,1440251903,DE +1439956992,1440251903,DE 1440251904,1440284671,SK 1440284672,1440317439,FI 1440317440,1440350207,BG @@ -21483,7 +21986,9 @@ 1441439744,1441447935,LV 1441447936,1441456127,BE 1441456128,1441464319,NL -1441464320,1441472511,SE +1441464320,1441469439,SE +1441469440,1441469695,DK +1441469696,1441472511,SE 1441472512,1441480703,RU 1441480704,1441488895,TR 1441488896,1441497087,GB @@ -21632,12 +22137,16 @@ 1449714176,1449715711,RO 1449715712,1449719807,IR 1449719808,1449722111,RO -1449722112,1449722367,NL +1449722112,1449722367,IT 1449722368,1449723135,RO -1449723136,1449723391,NL +1449723136,1449723391,DE 1449723392,1449724927,RO 1449724928,1449725183,GB -1449725184,1449734143,RO +1449725184,1449726463,RO +1449726464,1449726719,NL +1449726720,1449727999,RO +1449728000,1449728255,MD +1449728256,1449734143,RO 1449734144,1449736191,IT 1449736192,1449742335,RO 1449742336,1449744383,MD @@ -21645,15 +22154,29 @@ 1449750528,1449752575,SE 1449752576,1449754623,RO 1449754624,1449758719,IR -1449758720,1449765887,RO +1449758720,1449759743,RO +1449759744,1449760511,MD +1449760512,1449764863,RO +1449764864,1449765119,MD +1449765120,1449765887,RO 1449765888,1449766911,MD 1449766912,1449768959,RO 1449768960,1449769471,GB -1449769472,1449776127,RO +1449769472,1449772031,RO +1449772032,1449772287,GB +1449772288,1449776127,RO 1449776128,1449776639,FR -1449776640,1449780479,RO +1449776640,1449778431,RO +1449778432,1449778687,MD +1449778688,1449779455,RO +1449779456,1449779711,GB +1449779712,1449779967,RO +1449779968,1449780223,EU +1449780224,1449780479,RO 1449780480,1449780991,GB -1449780992,1449782015,RO +1449780992,1449781247,RO +1449781248,1449781503,MD +1449781504,1449782015,RO 1449782016,1449782271,GB 1449782272,1449783295,RO 1449783296,1449783551,DE @@ -21666,12 +22189,16 @@ 1449791488,1449793279,RO 1449793280,1449793535,NL 1449793536,1449794047,IR -1449794048,1449811199,RO +1449794048,1449794303,PH +1449794304,1449810943,RO +1449810944,1449811199,MD 1449811200,1449811455,BG 1449811456,1449811967,GB -1449811968,1449812991,RO +1449811968,1449812223,DK +1449812224,1449812991,RO 1449812992,1449813503,GB -1449813504,1449814271,RO +1449813504,1449813759,EU +1449813760,1449814271,RO 1449814272,1449815039,GB 1449815040,1449815295,RO 1449815296,1449816063,GB @@ -21694,7 +22221,9 @@ 1449859584,1449860607,GB 1449860608,1449863679,RO 1449863680,1449863935,GB -1449863936,1449870847,RO +1449863936,1449869311,RO +1449869312,1449870335,MD +1449870336,1449870847,RO 1449870848,1449871615,GB 1449871616,1449871871,RO 1449871872,1449872383,GB @@ -21704,16 +22233,21 @@ 1449878528,1449879039,RO 1449879040,1449879167,PH 1449879168,1449879295,TH -1449879296,1449883647,RO +1449879296,1449880319,RO +1449880320,1449880575,MD +1449880576,1449883647,RO 1449883648,1449885695,BE 1449885696,1449889791,GB 1449889792,1449893887,IR 1449893888,1449895935,MD -1449895936,1449901823,RO +1449895936,1449900543,RO +1449900544,1449901055,MD +1449901056,1449901823,RO 1449901824,1449902079,DE 1449902080,1449902335,RO 1449902336,1449903103,GB -1449903104,1449906175,RO +1449903104,1449903359,MD +1449903360,1449906175,RO 1449906176,1449910271,IR 1449910272,1449918463,RO 1449918464,1449951231,JO @@ -21829,9 +22363,7 @@ 1467285504,1467301887,RU 1467301888,1467318271,GB 1467318272,1467334655,RU -1467334656,1467345023,GB -1467345024,1467345151,A1 -1467345152,1467346495,GB +1467334656,1467346495,GB 1467346496,1467346559,A1 1467346560,1467351039,GB 1467351040,1467367423,NO @@ -22259,9 +22791,7 @@ 1485242368,1485246463,RU 1485246464,1485250559,UA 1485250560,1485254655,IR -1485254656,1485259007,RU -1485259008,1485262847,UA -1485262848,1485266943,RU +1485254656,1485266943,RU 1485266944,1485271039,RO 1485271040,1485275135,UA 1485275136,1485283327,LV @@ -22270,7 +22800,15 @@ 1485307904,1485832191,FR 1485832192,1485963263,GB 1485963264,1486028799,CZ -1486028800,1486061567,BE +1486028800,1486031615,IT +1486031616,1486031871,BE +1486031872,1486032383,IT +1486032384,1486032639,BE +1486032640,1486038271,IT +1486038272,1486038527,BE +1486038528,1486040319,IT +1486040320,1486040575,BE +1486040576,1486061567,IT 1486061568,1486094335,RU 1486094336,1486127103,ES 1486127104,1486159871,FI @@ -22369,7 +22907,11 @@ 1489665024,1489666047,EU 1489666048,1489674239,GB 1489674240,1489676287,NL -1489676288,1489698815,GB +1489676288,1489692415,GB +1489692416,1489692431,AU +1489692432,1489692447,GB +1489692448,1489692463,AU +1489692464,1489698815,GB 1489698816,1489731583,MT 1489731584,1489764351,BG 1489764352,1489797119,RU @@ -22399,7 +22941,9 @@ 1490173952,1490190335,PT 1490190336,1490193616,GB 1490193617,1490193617,DE -1490193618,1490206719,GB +1490193618,1490196991,GB +1490196992,1490197247,IE +1490197248,1490206719,GB 1490206720,1490223103,GE 1490223104,1490255871,GB 1490255872,1490272255,NL @@ -22610,7 +23154,9 @@ 1495293952,1495298047,IR 1495298048,1495300095,RO 1495300096,1495300351,SE -1495300352,1495304191,RO +1495300352,1495300607,US +1495300608,1495300863,SE +1495300864,1495304191,RO 1495304192,1495306239,MD 1495306240,1495306573,GB 1495306574,1495306574,RO @@ -22618,29 +23164,39 @@ 1495308288,1495312383,RO 1495312384,1495312895,IT 1495312896,1495313151,GB -1495313152,1495316991,RO +1495313152,1495313407,MD +1495313408,1495316991,RO 1495316992,1495317503,IT -1495317504,1495319551,RO +1495317504,1495319295,RO +1495319296,1495319551,SE 1495319552,1495320063,IR -1495320064,1495330815,RO -1495330816,1495332863,MD -1495332864,1495334911,RO +1495320064,1495326719,RO +1495326720,1495332863,MD +1495332864,1495333375,RO +1495333376,1495333631,CH +1495333632,1495334911,RO 1495334912,1495335167,MD 1495335168,1495336447,RO 1495336448,1495336959,NL 1495336960,1495339007,RO 1495339008,1495339263,DE -1495339264,1495339519,RO +1495339264,1495339519,MD 1495339520,1495340031,IR -1495340032,1495345151,RO +1495340032,1495342591,RO +1495342592,1495342847,MD +1495342848,1495345151,RO 1495345152,1495345407,FI -1495345408,1495346687,RO +1495345408,1495345663,US +1495345664,1495345919,FI +1495345920,1495346687,RO 1495346688,1495347199,GB 1495347200,1495351295,RO 1495351296,1495351551,GB -1495351552,1495351807,RO +1495351552,1495351807,MD 1495351808,1495352319,IQ -1495352320,1495362559,RO +1495352320,1495352831,RO +1495352832,1495353087,FI +1495353088,1495362559,RO 1495362560,1495363583,ES 1495363584,1495364607,RO 1495364608,1495364863,GB @@ -22690,31 +23246,46 @@ 1495428864,1495429119,DE 1495429120,1495433215,RO 1495433216,1495441407,IR -1495441408,1495443455,RO +1495441408,1495442943,RO +1495442944,1495443199,AE +1495443200,1495443455,RO 1495443456,1495443967,IR 1495443968,1495444479,RO 1495444480,1495444607,KR 1495444608,1495444735,IN 1495444736,1495445503,RO 1495445504,1495446015,IR -1495446016,1495447551,RO +1495446016,1495446271,RO +1495446272,1495446527,MD +1495446528,1495447551,RO 1495447552,1495449599,SE 1495449600,1495451647,MD 1495451648,1495452159,IR -1495452160,1495461887,RO +1495452160,1495455743,RO +1495455744,1495456255,MD +1495456256,1495459839,RO +1495459840,1495460863,MD +1495460864,1495461887,RO 1495461888,1495463935,SE -1495463936,1495480831,RO +1495463936,1495466495,RO +1495466496,1495467007,DE +1495467008,1495474687,RO +1495474688,1495474943,MD +1495474944,1495480831,RO 1495480832,1495481343,IR -1495481344,1495487487,RO -1495487488,1495488511,MD -1495488512,1495488767,RO +1495481344,1495485439,RO +1495485440,1495485695,MD +1495485696,1495487487,RO +1495487488,1495488767,MD 1495488768,1495489279,GB 1495489280,1495489535,MD 1495489536,1495493119,RO 1495493120,1495493375,US 1495493376,1495493631,RO 1495493632,1495494655,AE -1495494656,1495498239,RO +1495494656,1495495167,RO +1495495168,1495495423,MD +1495495424,1495498239,RO 1495498240,1495498367,IN 1495498368,1495498495,BD 1495498496,1495499775,RO @@ -22723,23 +23294,38 @@ 1495505152,1495505407,GB 1495505408,1495505919,RO 1495505920,1495506431,IR -1495506432,1495508991,RO +1495506432,1495507711,RO +1495507712,1495507967,MD +1495507968,1495508991,RO 1495508992,1495510015,IT -1495510016,1495511039,RO +1495510016,1495510527,RO +1495510528,1495511039,DE 1495511040,1495511551,IR 1495511552,1495511807,LT 1495511808,1495515647,RO 1495515648,1495516159,IR -1495516160,1495517183,RO +1495516160,1495516671,RO +1495516672,1495516927,GR +1495516928,1495517183,RO 1495517184,1495518207,MD -1495518208,1495535615,RO +1495518208,1495529471,RO +1495529472,1495529727,MD +1495529728,1495535615,RO 1495535616,1495536127,IR 1495536128,1495541247,RO 1495541248,1495541759,GB 1495541760,1495543807,RO 1495543808,1495547903,IR 1495547904,1495548159,US -1495548160,1495556095,RO +1495548160,1495548671,RO +1495548672,1495548927,RU +1495548928,1495549695,RO +1495549696,1495549951,RU +1495549952,1495551999,RO +1495552000,1495554047,ES +1495554048,1495554559,RO +1495554560,1495555071,SE +1495555072,1495556095,RO 1495556096,1495560191,IR 1495560192,1495566847,RO 1495566848,1495567359,GB @@ -22753,13 +23339,15 @@ 1495589376,1495589887,IR 1495589888,1495596031,RO 1495596032,1495596543,IR -1495596544,1495597055,RO +1495596544,1495596799,RO +1495596800,1495597055,MD 1495597056,1495601151,IR 1495601152,1495603199,AZ 1495603200,1495604735,RO 1495604736,1495605247,IR 1495605248,1495607295,AZ -1495607296,1495607807,RO +1495607296,1495607551,MD +1495607552,1495607807,RO 1495607808,1495608319,IR 1495608320,1495617535,RO 1495617536,1495618559,ES @@ -22767,8 +23355,8 @@ 1495620608,1495621375,GB 1495621376,1495623167,RO 1495623168,1495623679,IR -1495623680,1495623935,MD -1495623936,1495630079,RO +1495623680,1495624191,MD +1495624192,1495630079,RO 1495630080,1495631359,GB 1495631360,1495632127,RO 1495632128,1495632639,MD @@ -22785,7 +23373,8 @@ 1495669248,1495669503,GB 1495669504,1495670783,RO 1495670784,1495671807,MD -1495671808,1495672831,RO +1495671808,1495672575,RO +1495672576,1495672831,MD 1495672832,1495674879,ES 1495674880,1495682047,RO 1495682048,1495683071,MD @@ -22794,7 +23383,11 @@ 1495688704,1495689215,IR 1495689216,1495724543,RO 1495724544,1495725055,IR -1495725056,1495745791,RO +1495725056,1495732223,RO +1495732224,1495732991,ES +1495732992,1495733247,RO +1495733248,1495734271,ES +1495734272,1495745791,RO 1495745792,1495746047,GB 1495746048,1495747583,RO 1495747584,1495748607,MD @@ -22813,7 +23406,9 @@ 1495763968,1495765503,RO 1495765504,1495765759,GB 1495765760,1495766015,NL -1495766016,1495771135,RO +1495766016,1495767039,RO +1495767040,1495769087,ES +1495769088,1495771135,RO 1495771136,1495772159,PL 1495772160,1495775743,RO 1495775744,1495776255,IR @@ -22829,9 +23424,13 @@ 1495791360,1495791615,GB 1495791616,1495793663,RO 1495793664,1495794687,DE -1495794688,1495803391,RO +1495794688,1495795455,RO +1495795456,1495795711,RU +1495795712,1495803391,RO 1495803392,1495803903,IR -1495803904,1495805951,RO +1495803904,1495804927,RO +1495804928,1495805439,GB +1495805440,1495805951,RO 1495805952,1495810047,KZ 1495810048,1495813631,RO 1495813632,1495814143,IR @@ -22845,7 +23444,9 @@ 1495821824,1495822335,IR 1495822336,1495826431,RO 1495826432,1495826943,IR -1495826944,1495829503,RO +1495826944,1495827967,RO +1495827968,1495828479,DE +1495828480,1495829503,RO 1495829504,1495830015,GB 1495830016,1495837695,RO 1495837696,1495838719,IT @@ -22853,7 +23454,9 @@ 1495845632,1495845887,GB 1495845888,1495846911,RO 1495846912,1495847423,GB -1495847424,1495855103,RO +1495847424,1495848959,RO +1495848960,1495849471,SE +1495849472,1495855103,RO 1495855104,1495859199,IR 1495859200,1495860223,ES 1495860224,1495861247,AZ @@ -22890,7 +23493,9 @@ 1495951360,1495952383,MD 1495952384,1495953919,RO 1495953920,1495954175,GB -1495954176,1495963135,RO +1495954176,1495960575,RO +1495960576,1495961087,SE +1495961088,1495963135,RO 1495963136,1495963647,IR 1495963648,1495964415,GB 1495964416,1495967743,RO @@ -22927,14 +23532,20 @@ 1496051712,1496055807,RO 1496055808,1496057855,SE 1496057856,1496058111,DE -1496058112,1496084479,RO +1496058112,1496066815,RO +1496066816,1496067071,QA +1496067072,1496084479,RO 1496084480,1496084991,IR 1496084992,1496085247,MD 1496085248,1496086015,RO 1496086016,1496086527,IR -1496086528,1496093183,RO +1496086528,1496088063,RO +1496088064,1496088575,MD +1496088576,1496093183,RO 1496093184,1496093695,IR -1496093696,1496104447,RO +1496093696,1496094719,RO +1496094720,1496095743,MD +1496095744,1496104447,RO 1496104448,1496104959,IR 1496104960,1496107519,RO 1496107520,1496108031,IR @@ -22955,10 +23566,13 @@ 1496150016,1496152063,IR 1496152064,1496153599,RO 1496153600,1496154111,IR -1496154112,1496180223,RO +1496154112,1496179199,RO +1496179200,1496179711,SE +1496179712,1496180223,RO 1496180224,1496180735,IR 1496180736,1496182783,SE -1496182784,1496188927,RO +1496182784,1496183039,ES +1496183040,1496188927,RO 1496188928,1496189951,ES 1496189952,1496190975,RO 1496190976,1496193023,SE @@ -22974,16 +23588,22 @@ 1496210944,1496211455,IR 1496211456,1496213503,RO 1496213504,1496215551,IT -1496215552,1496228863,RO +1496215552,1496216319,RO +1496216320,1496216575,MD +1496216576,1496228863,RO 1496228864,1496229887,MD 1496229888,1496231935,RO 1496231936,1496233983,PS 1496233984,1496236031,RO 1496236032,1496238079,IT 1496238080,1496240127,IQ -1496240128,1496268799,RO +1496240128,1496253439,RO +1496253440,1496254463,ES +1496254464,1496268799,RO 1496268800,1496272895,IR -1496272896,1496276735,RO +1496272896,1496275455,RO +1496275456,1496275711,MD +1496275712,1496276735,RO 1496276736,1496276991,MD 1496276992,1496285183,RO 1496285184,1496293375,IR @@ -23585,10 +24205,17 @@ 1507393536,1507459071,CH 1507459072,1507524607,KZ 1507524608,1507525631,EE -1507525632,1507531775,KZ -1507531776,1507540991,EE +1507525632,1507533823,KZ +1507533824,1507540991,AZ 1507540992,1507557375,IR -1507557376,1507573759,EE +1507557376,1507558399,EE +1507558400,1507558911,AZ +1507558912,1507564287,EE +1507564288,1507565823,AZ +1507565824,1507566335,EE +1507566336,1507567615,AZ +1507567616,1507567871,EE +1507567872,1507573759,AZ 1507573760,1507590143,IR 1507590144,1507655679,NL 1507655680,1507659775,DE @@ -23726,7 +24353,8 @@ 1509883904,1509900287,NL 1509900288,1509916671,RU 1509916672,1509933055,GB -1509933056,1509941247,NL +1509933056,1509935103,CH +1509935104,1509941247,NL 1509941248,1509947391,SE 1509947392,1509949439,NL 1509949440,1510608639,FR @@ -24130,7 +24758,11 @@ 1533730816,1533732863,NL 1533732864,1533734911,RU 1533734912,1533739007,CZ -1533739008,1533820927,RU +1533739008,1533805567,RU +1533805568,1533806591,NL +1533806592,1533818879,RU +1533818880,1533819903,NL +1533819904,1533820927,RU 1533820928,1533837311,DE 1533837312,1533845503,IR 1533845504,1533847551,GB @@ -24164,7 +24796,9 @@ 1534590976,1534656511,HU 1534656512,1534711807,FR 1534711808,1534712831,BE -1534712832,1534714415,FR +1534712832,1534714207,FR +1534714208,1534714223,NL +1534714224,1534714415,FR 1534714416,1534714431,ES 1534714432,1534714639,FR 1534714640,1534714655,IE @@ -24380,7 +25014,7 @@ 1538850816,1538859007,KZ 1538859008,1538875391,RU 1538875392,1538883583,RS -1538883584,1538891775,BE +1538883584,1538891775,IR 1538891776,1538897919,GB 1538897920,1538899967,PL 1538899968,1538908159,SI @@ -24641,7 +25275,8 @@ 1539482624,1539483135,RU 1539483648,1539484159,UA 1539484672,1539485695,RU -1539485696,1539486207,RO +1539485696,1539485951,LV +1539485952,1539486207,RO 1539486208,1539486719,FR 1539486720,1539487231,DE 1539487744,1539488255,RU @@ -24751,7 +25386,6 @@ 1539549184,1539549695,GB 1539549696,1539550207,RU 1539550208,1539550719,UA -1539550720,1539551231,ES 1539551232,1539551743,RS 1539551744,1539552255,RU 1539552256,1539552767,RO @@ -25092,7 +25726,7 @@ 1539763968,1539764223,PT 1539764224,1539764479,AT 1539764480,1539764735,GB -1539764736,1539764991,RO +1539764736,1539764991,DE 1539764992,1539765247,BE 1539765248,1539765503,GB 1539765504,1539766015,PL @@ -25121,7 +25755,6 @@ 1539772160,1539772415,BE 1539772416,1539772671,RU 1539772672,1539772927,RS -1539772928,1539773183,RU 1539773184,1539773439,GB 1539773440,1539773695,KZ 1539773696,1539773951,DE @@ -25338,7 +25971,9 @@ 1539851264,1539852287,PL 1539852288,1539853311,UA 1539853312,1539854335,PL -1539854336,1539855359,UA +1539854336,1539855103,UA +1539855104,1539855231,US +1539855232,1539855359,UA 1539855360,1539856383,RU 1539857408,1539858431,PL 1539858432,1539859455,RO @@ -25421,8 +26056,8 @@ 1539956736,1539957759,UA 1539957760,1539958783,RU 1539958784,1539960063,UA -1539960064,1539960575,RU -1539960576,1539962879,UA +1539960064,1539960831,RU +1539960832,1539962879,UA 1539962880,1539964927,RU 1539964928,1539965951,UA 1539965952,1539966975,RU @@ -26477,7 +27112,6 @@ 1540655360,1540655615,RU 1540655616,1540655871,GB 1540655872,1540656383,NL -1540656640,1540656895,RU 1540656896,1540657151,RO 1540657152,1540657407,DE 1540657408,1540657663,CY @@ -26567,7 +27201,7 @@ 1540682496,1540682751,DE 1540682752,1540683007,EE 1540683008,1540683263,DE -1540683264,1540683775,HR +1540683520,1540683775,HR 1540683776,1540684031,UA 1540684032,1540684287,IT 1540684288,1540684543,HU @@ -26674,7 +27308,6 @@ 1540713216,1540713727,PL 1540713728,1540713983,RU 1540713984,1540714239,GB -1540714240,1540714495,RO 1540714496,1540714751,NL 1540714752,1540715263,RU 1540715264,1540715519,NL @@ -26725,7 +27358,6 @@ 1540729600,1540729855,CH 1540729856,1540730111,RU 1540730112,1540730367,GB -1540730368,1540730623,RU 1540730624,1540730879,UA 1540730880,1540731135,IL 1540731136,1540731391,DE @@ -26765,7 +27397,6 @@ 1540740608,1540740863,NL 1540740864,1540741119,RO 1540741120,1540741375,GB -1540741376,1540741631,EU 1540741632,1540742143,NL 1540742144,1540742399,RU 1540742400,1540742655,DE @@ -26877,7 +27508,7 @@ 1540851712,1540853759,RU 1540853760,1540854783,UA 1540854784,1540855807,NL -1540855808,1540856831,UA +1540855808,1540856831,BG 1540856832,1540857855,NL 1540857856,1540858879,DK 1540858880,1540859903,GB @@ -27350,7 +27981,8 @@ 1541082112,1541083135,RU 1541083136,1541084159,RO 1541084160,1541086207,RU -1541086208,1541088255,UA +1541086208,1541086463,NL +1541086464,1541088255,UA 1541088256,1541089279,RU 1541089280,1541090303,GB 1541090304,1541091327,CZ @@ -27826,7 +28458,7 @@ 1541348608,1541348863,HR 1541348864,1541349119,UA 1541349120,1541349375,PL -1541349376,1541349631,ES +1541349376,1541349631,RU 1541349632,1541349887,PL 1541349888,1541350143,RU 1541350144,1541350399,FR @@ -28257,7 +28889,6 @@ 1541583872,1541584127,SE 1541584128,1541584383,GB 1541584384,1541584895,NL -1541584896,1541585151,DE 1541585152,1541585663,RU 1541585664,1541585919,UA 1541585920,1541586431,RU @@ -28347,10 +28978,8 @@ 1541635072,1541636095,GB 1541636096,1541636863,AT 1541636864,1541637119,RO -1541637120,1541637631,PL 1541637632,1541638143,CZ 1541638144,1541638399,RU -1541638400,1541638655,FR 1541638656,1541639167,HU 1541639168,1541640191,RU 1541640192,1541641215,KZ @@ -28389,7 +29018,7 @@ 1541660672,1541661695,SK 1541661696,1541661951,RU 1541661952,1541662207,NL -1541662208,1541662719,RO +1541662208,1541662719,AT 1541662720,1541663743,CZ 1541663744,1541664767,RO 1541664768,1541666047,RU @@ -28511,7 +29140,6 @@ 1541734912,1541735167,RU 1541735168,1541735423,DE 1541735424,1541735679,GB -1541735680,1541735935,RU 1541735936,1541736447,RO 1541736448,1541737471,RU 1541737472,1541739519,RO @@ -29421,7 +30049,7 @@ 1542273024,1542274047,BG 1542274048,1542275071,PL 1542275072,1542275327,UA -1542275328,1542275583,DE +1542275328,1542275583,AT 1542275584,1542276095,SE 1542276096,1542277631,PL 1542277632,1542278143,GB @@ -29781,8 +30409,7 @@ 1542475776,1542476799,LB 1542476800,1542477823,RU 1542477824,1542478079,DK -1542478336,1542478847,UA -1542478848,1542479103,RU +1542478336,1542479103,RU 1542479104,1542479359,PL 1542479360,1542479615,RO 1542479616,1542479871,RU @@ -30092,8 +30719,8 @@ 1545895936,1545928703,BA 1545928704,1545961471,SI 1545961472,1545994751,RU -1545994752,1545995263,CZ -1545995264,1545995519,RU +1545994752,1545995007,CZ +1545995008,1545995519,RU 1545995520,1545996287,CZ 1545996288,1545998335,RU 1545998336,1546000383,CZ @@ -30103,7 +30730,9 @@ 1546003200,1546003967,RU 1546003968,1546004479,CZ 1546004480,1546004735,UA -1546004736,1546005247,CZ +1546004736,1546004795,CZ +1546004796,1546004796,UA +1546004797,1546005247,CZ 1546005248,1546006527,RU 1546006528,1546008575,UA 1546008576,1546014719,BY @@ -30136,7 +30765,9 @@ 1546122650,1546122650,PT 1546122651,1546122696,FR 1546122697,1546122704,ES -1546122705,1546125311,FR +1546122705,1546124191,FR +1546124192,1546124223,DZ +1546124224,1546125311,FR 1546125312,1546256383,GB 1546256384,1546264575,RU 1546264576,1546266623,TR @@ -30179,7 +30810,9 @@ 1546342400,1546344447,TR 1546344448,1546346495,DK 1546346496,1546348543,AT -1546348544,1546350591,DE +1546348544,1546348607,DE +1546348608,1546348623,CH +1546348624,1546350591,DE 1546350592,1546352639,PL 1546352640,1546354687,DK 1546354688,1546356735,FR @@ -30381,21 +31014,20 @@ 1550843904,1550974975,UA 1550974976,1550975999,RO 1550976000,1550976255,EG -1550976256,1550979071,RO +1550976256,1550976767,RO +1550976768,1550977023,US +1550977024,1550979071,RO 1550979072,1550983167,IR 1550983168,1550984191,RO -1550984192,1550984319,KR -1550984320,1550984447,VG +1550984192,1550984447,KR 1550984448,1550985215,RO 1550985216,1550987263,PS 1550987264,1550988543,RO -1550988544,1550988671,VG -1550988672,1550988799,JP +1550988544,1550988799,JP 1550988800,1550996223,RO -1550996224,1550996351,VG -1550996352,1550996479,AU +1550996224,1550996479,AU 1550996480,1550998527,RO -1550998528,1550998783,NL +1550998528,1550998783,IT 1550998784,1551014143,RO 1551014144,1551014399,MD 1551014400,1551015167,RO @@ -30476,11 +31108,21 @@ 1558091352,1558091352,ES 1558091353,1558093531,FR 1558093532,1558093532,HR -1558093533,1558097919,FR +1558093533,1558093609,FR +1558093610,1558093610,ES +1558093611,1558097919,FR 1558097920,1558098175,GB 1558098176,1558103159,FR 1558103160,1558103167,GB -1558103168,1558118399,FR +1558103168,1558112095,FR +1558112096,1558112127,ES +1558112128,1558112191,FR +1558112192,1558112192,ES +1558112193,1558112207,FR +1558112208,1558112208,ES +1558112209,1558112209,FR +1558112210,1558112211,ES +1558112212,1558118399,FR 1558118400,1558119423,DE 1558119424,1558122495,RU 1558122496,1558123007,SG @@ -30500,7 +31142,9 @@ 1558151168,1558172927,IT 1558172928,1558173183,US 1558173184,1558179839,IT -1558179840,1558180023,NL +1558179840,1558179955,NL +1558179956,1558179959,IT +1558179960,1558180023,NL 1558180024,1558180039,IT 1558180040,1558180863,NL 1558180864,1558183935,IT @@ -30585,7 +31229,8 @@ 1560135680,1560135807,UA 1560135808,1560135935,CZ 1560135936,1560137727,RU -1560137728,1560150015,CZ +1560137728,1560137983,DE +1560137984,1560150015,CZ 1560150016,1560182783,NL 1560182784,1560215551,SE 1560215552,1560281087,RU @@ -30699,12 +31344,33 @@ 1566394533,1566394533,NL 1566394534,1566394534,SE 1566394535,1566394535,PT -1566394536,1566394538,NO +1566394536,1566394536,GB +1566394537,1566394538,NO 1566394539,1566394539,RU 1566394540,1566396415,NO 1566396416,1566398463,GB 1566398464,1566400511,RU -1566400512,1566402559,NO +1566400512,1566400607,NO +1566400608,1566400639,GB +1566400640,1566400671,NO +1566400672,1566400703,DE +1566400704,1566400735,NL +1566400736,1566401023,NO +1566401024,1566401087,US +1566401088,1566401151,NO +1566401152,1566401279,US +1566401280,1566401599,NO +1566401600,1566401631,HK +1566401632,1566401663,NO +1566401664,1566401695,SG +1566401696,1566401727,NO +1566401728,1566401759,AU +1566401760,1566401887,NO +1566401888,1566401919,A2 +1566401920,1566402143,NO +1566402144,1566402175,A2 +1566402176,1566402303,NO +1566402304,1566402559,SG 1566404608,1566406655,ES 1566406656,1566408703,NL 1566408704,1566410751,GB @@ -30825,7 +31491,15 @@ 1567766272,1567767039,RO 1567767040,1567767551,GB 1567767552,1567768575,ES -1567768576,1567826175,RO +1567768576,1567769343,RO +1567769344,1567769599,MD +1567769600,1567773951,RO +1567773952,1567774207,MD +1567774208,1567785983,RO +1567785984,1567786239,MD +1567786240,1567789055,RO +1567789056,1567793151,ES +1567793152,1567826175,RO 1567826176,1567826431,DE 1567826432,1567827455,RO 1567827456,1567827711,BG @@ -30859,7 +31533,8 @@ 1567993856,1567997951,IR 1567997952,1568014335,NL 1568014336,1568022527,DE -1568022528,1568024063,RO +1568022528,1568023551,FR +1568023552,1568024063,RO 1568024064,1568024319,SG 1568024320,1568038911,RO 1568038912,1568059391,IR @@ -30942,7 +31617,9 @@ 1570645248,1570652159,FR 1570652160,1570660863,SE 1570660864,1570661375,NO -1570661376,1570668543,SE +1570661376,1570662143,SE +1570662144,1570662399,DE +1570662400,1570668543,SE 1570668544,1570686975,RU 1570686976,1570693119,NL 1570693120,1570695167,RU @@ -30981,7 +31658,10 @@ 1571426048,1571426303,UA 1571426304,1571428607,CZ 1571428608,1571428863,UA -1571428864,1571432447,CZ +1571428864,1571430399,CZ +1571430400,1571430911,UA +1571430912,1571431423,CZ +1571431424,1571432447,KZ 1571432448,1571434495,RU 1571434496,1571435519,UA 1571435520,1571436031,RU @@ -31005,7 +31685,8 @@ 1571447296,1571447807,RU 1571447808,1571448063,CZ 1571448064,1571448319,RU -1571448320,1571448831,CZ +1571448320,1571448575,CZ +1571448576,1571448831,RU 1571448832,1571449343,NL 1571449344,1571449855,CZ 1571449856,1571451391,RU @@ -31040,7 +31721,9 @@ 1571483648,1571484159,RU 1571484160,1571487743,CZ 1571487744,1571489791,SK -1571489792,1571491327,CZ +1571489792,1571490303,CZ +1571490304,1571491071,RU +1571491072,1571491327,CZ 1571491328,1571495935,UA 1571495936,1571496447,RU 1571496448,1571497983,BY @@ -31053,7 +31736,8 @@ 1571522048,1571522815,RU 1571522816,1571524607,CZ 1571524608,1571526655,RU -1571526656,1571528703,CZ +1571526656,1571528191,CZ +1571528192,1571528703,UA 1571528704,1571529215,BY 1571529216,1571529471,CZ 1571529472,1571529727,UA @@ -31073,7 +31757,11 @@ 1571535872,1571538943,RU 1571538944,1571539967,CZ 1571539968,1571540223,UA -1571540224,1571540991,CZ +1571540224,1571540694,CZ +1571540695,1571540695,RU +1571540696,1571540696,CZ +1571540697,1571540697,RU +1571540698,1571540991,CZ 1571540992,1571541247,RU 1571541248,1571541503,UA 1571541504,1571542015,CZ @@ -31158,7 +31846,7 @@ 1572030464,1572034815,RU 1572034816,1572034943,BY 1572034944,1572035071,US -1572035072,1572035199,RU +1572035072,1572035199,CZ 1572035200,1572035327,NG 1572035328,1572035455,US 1572035456,1572035583,RU @@ -31377,8 +32065,8 @@ 1572794368,1572796415,RU 1572796416,1572798463,DE 1572798464,1572800511,NL -1572800512,1572800739,RU -1572800740,1572800740,UA +1572800512,1572800738,RU +1572800739,1572800740,UA 1572800741,1572804607,RU 1572804608,1572808703,GB 1572808704,1572810751,FR @@ -31453,7 +32141,9 @@ 1578592200,1578592207,CH 1578592208,1578592295,FR 1578592296,1578592303,NL -1578592304,1578593023,FR +1578592304,1578592783,FR +1578592784,1578592799,BE +1578592800,1578593023,FR 1578593024,1578593279,DE 1578593280,1578593415,FR 1578593416,1578593423,IT @@ -31496,7 +32186,22 @@ 1578613736,1578613739,ES 1578613740,1578613931,FR 1578613932,1578613935,NL -1578613936,1578614495,FR +1578613936,1578614319,FR +1578614320,1578614323,RU +1578614324,1578614327,HU +1578614328,1578614399,FR +1578614400,1578614403,EE +1578614404,1578614423,FR +1578614424,1578614427,IS +1578614428,1578614431,LV +1578614432,1578614435,BG +1578614436,1578614459,FR +1578614460,1578614463,NO +1578614464,1578614467,FR +1578614468,1578614471,AT +1578614472,1578614475,SI +1578614476,1578614479,UA +1578614480,1578614495,FR 1578614496,1578614511,DE 1578614512,1578631167,FR 1578631168,1578659839,RO @@ -31524,10 +32229,12 @@ 1580048384,1580064767,RU 1580064768,1580072959,GB 1580072960,1580083199,PT -1580083200,1580089343,DE -1580089344,1580101631,PT -1580101632,1580105727,GB -1580105728,1580109823,PT +1580083200,1580085247,DE +1580085248,1580089343,US +1580089344,1580097535,PT +1580097536,1580105727,GB +1580105728,1580109567,PT +1580109568,1580109823,SE 1580109824,1580113919,US 1580113920,1580138495,PT 1580138496,1580204031,IT @@ -31633,7 +32340,9 @@ 1583782704,1583782711,IT 1583782712,1583782975,GB 1583782976,1583782983,IT -1583782984,1583783495,GB +1583782984,1583783095,GB +1583783096,1583783103,IT +1583783104,1583783495,GB 1583783496,1583783503,IT 1583783504,1583783935,GB 1583783936,1583788031,EU @@ -31910,7 +32619,10 @@ 1587478528,1587511295,RU 1587511296,1587544063,IL 1587544064,1588068351,IT -1588068352,1588592639,GB +1588068352,1588092159,NL +1588092160,1588092415,GB +1588092416,1588133887,NL +1588133888,1588592639,GB 1588592640,1588593663,RO 1588593664,1588593919,MD 1588593920,1588594687,RO @@ -31920,14 +32632,17 @@ 1588609024,1588613119,MD 1588613120,1588617215,IR 1588617216,1588619775,RO -1588619776,1588620159,SG -1588620160,1588620287,VG -1588620288,1588641535,RO +1588619776,1588620287,SG +1588620288,1588637695,RO +1588637696,1588638719,ES +1588638720,1588641535,RO 1588641536,1588641791,GB 1588641792,1588643839,ES 1588643840,1588649983,RO 1588649984,1588652031,SE -1588652032,1588659199,RO +1588652032,1588654079,RO +1588654080,1588658175,DE +1588658176,1588659199,RO 1588659200,1588659711,NL 1588659712,1588664319,RO 1588664320,1588664831,VG @@ -32090,7 +32805,7 @@ 1592221696,1592225791,DK 1592225792,1592242175,RU 1592242176,1592246271,UA -1592246272,1592254463,RU +1592246272,1592250367,RU 1592254464,1592258559,PL 1592258560,1592262655,NL 1592262656,1592270847,RU @@ -32120,7 +32835,9 @@ 1592459264,1592524799,TR 1592524800,1592557567,GB 1592557568,1592590335,BG -1592590336,1592623103,FI +1592590336,1592594431,FI +1592594432,1592598527,DE +1592598528,1592623103,FI 1592623104,1592655871,RU 1592655872,1592786943,FR 1592786944,1592803327,PL @@ -32141,9 +32858,7 @@ 1593065472,1593081855,LT 1593081856,1593098239,UA 1593098240,1593114623,CH -1593114624,1593118719,SE -1593118720,1593122815,DK -1593122816,1593131007,SE +1593114624,1593131007,SE 1593131008,1593131023,CH 1593131024,1593131519,GB 1593131520,1593131775,CH @@ -32166,7 +32881,9 @@ 1593180160,1593196543,NO 1593196544,1593203103,SE 1593203104,1593203135,FI -1593203136,1593212927,SE +1593203136,1593206783,SE +1593206784,1593207039,FI +1593207040,1593212927,SE 1593212928,1593229311,PL 1593229312,1593245695,EE 1593245696,1593247743,NL @@ -32248,8 +32965,10 @@ 1596456960,1596588031,PL 1596588032,1596719103,BG 1596719104,1596850175,IE -1596850176,1596866559,CZ -1596866560,1596876799,RU +1596850176,1596858879,CZ +1596858880,1596859391,RU +1596859392,1596862463,CZ +1596862464,1596876799,RU 1596876800,1596881919,CZ 1596881920,1596887295,RU 1596887296,1596887551,KZ @@ -32261,7 +32980,8 @@ 1596890112,1596890623,RU 1596890624,1596890879,CZ 1596890880,1596900351,RU -1596900352,1596900863,CZ +1596900352,1596900607,CZ +1596900608,1596900863,RU 1596900864,1596901375,NL 1596901376,1596907519,BY 1596907520,1596909567,RU @@ -32401,7 +33121,9 @@ 1600978944,1601011711,SE 1601011712,1601044479,UA 1601044480,1601077247,RU -1601077248,1601110015,IT +1601077248,1601109567,IT +1601109568,1601109631,FR +1601109632,1601110015,IT 1601110016,1601142783,BG 1601142784,1601175551,UA 1601175552,1601699839,DE @@ -32648,9 +33370,7 @@ 1603895296,1603928063,RU 1603928064,1603944447,DK 1603944448,1603977215,RU -1603977216,1603990847,GB -1603990848,1603990911,A1 -1603990912,1603993599,GB +1603977216,1603993599,GB 1603993600,1604009983,ME 1604009984,1604026367,PL 1604026368,1604042751,NL @@ -32716,7 +33436,9 @@ 1605108408,1605108415,IT 1605108416,1605108567,GB 1605108568,1605108575,IT -1605108576,1605109223,GB +1605108576,1605108903,GB +1605108904,1605108911,IT +1605108912,1605109223,GB 1605109224,1605109231,IT 1605109232,1605109495,GB 1605109496,1605109503,IT @@ -32730,13 +33452,9 @@ 1605110264,1605110271,IT 1605110272,1605111023,GB 1605111024,1605111031,IT -1605111032,1605111087,GB -1605111088,1605111095,IT -1605111096,1605111199,GB +1605111032,1605111199,GB 1605111200,1605111207,IT -1605111208,1605111375,GB -1605111376,1605111383,IT -1605111384,1605111799,GB +1605111208,1605111799,GB 1605111800,1605111807,IT 1605111808,1605111879,GB 1605111880,1605111887,IT @@ -32744,7 +33462,9 @@ 1605111920,1605111927,IT 1605111928,1605111935,GB 1605111936,1605111943,IT -1605111944,1605112847,GB +1605111944,1605112423,GB +1605112424,1605112431,IT +1605112432,1605112847,GB 1605112848,1605112855,IT 1605112856,1605113087,GB 1605113088,1605113095,IT @@ -32752,7 +33472,9 @@ 1605113384,1605113391,IT 1605113392,1605113407,GB 1605113408,1605113415,IT -1605113416,1605113815,GB +1605113416,1605113567,GB +1605113568,1605113583,IT +1605113584,1605113815,GB 1605113816,1605113823,IT 1605113824,1605114199,GB 1605114200,1605114207,IT @@ -32780,7 +33502,9 @@ 1605125904,1605125919,DE 1605125920,1605130239,GB 1605130240,1605130271,NL -1605130272,1605132287,GB +1605130272,1605131263,GB +1605131264,1605131519,DE +1605131520,1605132287,GB 1605132288,1605148671,RU 1605148672,1605156863,PT 1605156864,1605165055,JO @@ -32820,7 +33544,9 @@ 1605599232,1605631999,GR 1605632000,1605664767,RS 1605664768,1605697535,MK -1605697536,1605753855,RU +1605697536,1605753343,RU +1605753344,1605753471,US +1605753472,1605753855,RU 1605753856,1605754879,FR 1605754880,1605763071,RU 1605763072,1605769215,KZ @@ -32828,8 +33554,10 @@ 1605771264,1605795839,RU 1605795840,1605828607,BE 1605828608,1605828863,GB -1605828864,1605829375,US -1605829376,1605830399,IL +1605828864,1605829631,US +1605829632,1605829887,GB +1605829888,1605830143,US +1605830144,1605830399,IL 1605830400,1605830655,US 1605830656,1605840895,RU 1605840896,1605844991,CH @@ -32845,9 +33573,10 @@ 1607575552,1607577599,GB 1607577600,1607581695,SE 1607581696,1607598079,DK -1607598080,1607598335,IT +1607598080,1607598335,GB 1607598336,1607598591,EU -1607598592,1607600383,IT +1607598592,1607599103,GB +1607599104,1607600383,IT 1607600384,1607600639,DE 1607600640,1607600895,AT 1607600896,1607601151,CH @@ -32855,7 +33584,9 @@ 1607601920,1607602175,GB 1607602176,1607606015,IT 1607606016,1607606271,FR -1607606272,1607608319,IT +1607606272,1607606783,DE +1607606784,1607607039,GB +1607607040,1607608319,IT 1607608320,1607608575,HU 1607608576,1607608831,SK 1607608832,1607610367,EU @@ -32873,8 +33604,9 @@ 1607625216,1607625471,EU 1607625472,1607625727,IT 1607625728,1607626751,ES -1607626752,1607627519,EU -1607627520,1607628543,IT +1607626752,1607627519,FR +1607627520,1607627775,FI +1607627776,1607628543,IT 1607628544,1607628799,EU 1607628800,1607629567,IT 1607629568,1607634431,EU @@ -32981,7 +33713,8 @@ 1611128832,1611130879,NL 1611130880,1611227135,US 1611227136,1611235327,CA -1611235328,1611662335,US +1611235328,1611251711,SG +1611251712,1611662335,US 1611662336,1611662847,NL 1611662848,1611692543,US 1611692544,1611693567,NL @@ -33066,7 +33799,8 @@ 1653555200,1653567487,CA 1653567488,1653571583,US 1653571584,1653575679,CA -1653575680,1653592063,US +1653575680,1653579775,US +1653583872,1653592063,US 1653592064,1653596159,CA 1653596160,1653600255,US 1653600256,1653604351,CA @@ -33434,7 +34168,8 @@ 1728375040,1728375295,IN 1728375296,1728376831,AU 1728376832,1728377855,ID -1728377856,1728378879,HK +1728377856,1728378623,HK +1728378624,1728378879,US 1728378880,1728380927,IN 1728380928,1728382975,PH 1728382976,1728383999,SG @@ -33603,7 +34338,7 @@ 1728538624,1728539647,AF 1728539648,1728540671,IN 1728540672,1728541695,BD -1728541696,1728543743,JP +1728541696,1728542719,JP 1728543744,1728544767,SG 1728544768,1728545791,IN 1728545792,1728546815,JP @@ -33643,7 +34378,6 @@ 1728574464,1728575487,KR 1728575488,1728576511,BD 1728576512,1728577535,BT -1728577536,1728578559,LA 1728578560,1728580607,CN 1728580608,1728580863,ID 1728580864,1728581119,VN @@ -33839,7 +34573,6 @@ 1728775168,1728776191,JP 1728776192,1728777215,AU 1728777216,1728778239,TH -1728778240,1728779263,JP 1728779264,1728779519,IN 1728779776,1728780287,ID 1728780288,1728781311,KR @@ -33849,7 +34582,8 @@ 1728784384,1728785407,PH 1728785408,1728786431,KR 1728786432,1728787455,SG -1728787456,1728788479,AU +1728787456,1728787711,AU +1728787712,1728788479,NZ 1728788480,1728789503,KR 1728789504,1728790527,PK 1728790528,1728791551,PH @@ -33877,7 +34611,7 @@ 1728812544,1728813055,SG 1728813056,1728814079,IN 1728814080,1728815103,JP -1728815104,1728817151,AU +1728816128,1728817151,AU 1728818176,1728819199,VN 1728819200,1728819711,ID 1728819712,1728819967,NZ @@ -33906,7 +34640,11 @@ 1728838656,1728839679,ID 1728839936,1728840191,IN 1728840192,1728840447,SG -1728840448,1728842751,AU +1728840448,1728841727,AU +1728841728,1728841983,NZ +1728841984,1728842239,AU +1728842240,1728842495,NZ +1728842496,1728842751,AU 1728842752,1728843775,ID 1728843776,1728844799,JP 1728844800,1728845311,ID @@ -34022,9 +34760,8 @@ 1728951552,1728951807,ID 1728951808,1728952063,SG 1728952064,1728952319,IN -1728952832,1728953343,AU -1728953344,1728954112,GB -1728954113,1728954367,HK +1728952832,1728953343,NZ +1728953344,1728954367,HK 1728954368,1728955391,JP 1728955392,1728956415,CN 1728956416,1728957439,ID @@ -34168,7 +34905,8 @@ 1729079296,1729080319,AU 1729080320,1729081343,ID 1729081344,1729081599,IN -1729081600,1729082111,AU +1729081600,1729081855,AU +1729081856,1729082111,NZ 1729082112,1729082367,IN 1729082368,1729083391,HK 1729083392,1729083647,JP @@ -34279,7 +35017,6 @@ 1729182208,1729182463,ID 1729182464,1729182719,AU 1729182720,1729183743,AF -1729183744,1729184767,JP 1729184768,1729185791,BD 1729185792,1729186815,HK 1729186816,1729187327,ID @@ -34295,7 +35032,6 @@ 1729198080,1729199103,CN 1729199104,1729199615,MY 1729199616,1729199871,JP -1729199872,1729200127,TH 1729200128,1729201151,IN 1729201152,1729202175,AU 1729203200,1729205247,SG @@ -34340,7 +35076,6 @@ 1729239040,1729240063,JP 1729240064,1729242111,ID 1729242112,1729244159,AU -1729244160,1729245183,SG 1729245184,1729247231,AU 1729247232,1729247487,NZ 1729247488,1729247743,AU @@ -34438,7 +35173,7 @@ 1729352704,1729353727,IN 1729353728,1729353983,AU 1729353984,1729354239,IN -1729354240,1729354751,AU +1729354240,1729354495,AU 1729354752,1729355775,VN 1729355776,1729356799,IN 1729356800,1729357823,ID @@ -34675,7 +35410,7 @@ 1729613824,1729614847,SG 1729614848,1729615103,NZ 1729615104,1729615359,KH -1729615360,1729615871,IN +1729615360,1729615615,IN 1729615872,1729616895,AU 1729616896,1729617919,JP 1729617920,1729618943,ID @@ -34691,11 +35426,10 @@ 1729627136,1729628159,SG 1729628160,1729629183,KR 1729629184,1729629695,ID -1729629696,1729629951,AU +1729629696,1729629951,NZ 1729629952,1729630207,HK 1729630208,1729631231,PH 1729631232,1729632255,IN -1729632256,1729633279,SG 1729633280,1729634303,NZ 1729634304,1729635327,KH 1729635328,1729636351,IN @@ -34782,7 +35516,6 @@ 1729723392,1729726463,IN 1729726464,1729727487,PK 1729727488,1729728511,KI -1729728512,1729729535,JP 1729729536,1729730559,CN 1729730560,1729731583,IN 1729731584,1729732607,CN @@ -34923,7 +35656,6 @@ 1729874944,1729875455,MY 1729875456,1729875967,ID 1729875968,1729876991,CN -1729876992,1729878015,JP 1729878016,1729879039,NZ 1729879040,1729879295,AU 1729879296,1729879423,KR @@ -34961,7 +35693,6 @@ 1729902080,1729902591,SG 1729902592,1729903615,ID 1729903616,1729905663,KR -1729905664,1729906687,PH 1729906688,1729906943,AU 1729906944,1729907199,JP 1729907200,1729907711,ID @@ -35010,7 +35741,6 @@ 1729952000,1729952511,JP 1729952512,1729952767,NZ 1729952768,1729953791,IN -1729953792,1729954815,MY 1729954816,1729955839,ID 1729955840,1729956863,BD 1729956864,1729957887,HK @@ -35027,7 +35757,7 @@ 1729968128,1729969151,MY 1729969152,1729970175,LK 1729970176,1729971199,AU -1729971200,1729972223,JP +1729971200,1729972223,SG 1729972224,1729973247,HK 1729973248,1729974271,AU 1729974272,1729975295,PH @@ -35127,7 +35857,6 @@ 1730073600,1730073855,HK 1730074112,1730074367,AU 1730074368,1730074623,SG -1730074624,1730075647,CN 1730075648,1730076671,ID 1730077696,1730078719,CN 1730078720,1730079743,HK @@ -35273,7 +36002,7 @@ 1730522112,1730524159,CN 1730524160,1730525183,IN 1730525184,1730526207,HK -1730526208,1730528255,JP +1730527232,1730528255,JP 1730528256,1730529279,SG 1730529280,1730529791,IN 1730529792,1730530303,AU @@ -35297,7 +36026,6 @@ 1730552832,1730553855,IN 1730553856,1730555903,CN 1730555904,1730556415,IN -1730556416,1730556927,HK 1730556928,1730557951,JP 1730557952,1730558975,CN 1730558976,1730559999,MY @@ -35548,7 +36276,7 @@ 1730858240,1730858495,ID 1730858496,1730859007,IN 1730859008,1730860031,BN -1730860032,1730861055,MY +1730860032,1730861055,HK 1730861056,1730862079,MM 1730862080,1730863103,JP 1730863104,1730864127,AU @@ -35584,8 +36312,8 @@ 1730893824,1730895103,AU 1730895104,1730895359,BD 1730895360,1730895871,NL -1730895872,1730899455,CN -1730899456,1730899967,MO +1730895872,1730898943,CN +1730898944,1730899967,MO 1730899968,1730900991,IN 1730900992,1730901503,AU 1730901504,1730901759,DE @@ -35756,9 +36484,10 @@ 1731167232,1731168255,ID 1731168256,1731170559,CN 1731170560,1731170687,HK -1731170688,1731170815,PK +1731170688,1731170815,MY 1731170816,1731171071,AU -1731171072,1731171327,PK +1731171072,1731171199,TH +1731171200,1731171327,MY 1731171328,1731172863,IN 1731172864,1731173375,MY 1731173376,1731178495,IN @@ -36092,7 +36821,11 @@ 1731557376,1731558399,JP 1731558400,1731564543,CN 1731564544,1731565567,NZ -1731565568,1731566079,HK +1731565568,1731565600,HK +1731565601,1731565605,JP +1731565606,1731565611,HK +1731565612,1731565613,JP +1731565614,1731566079,HK 1731566080,1731566591,PH 1731566592,1731567615,IN 1731567616,1731568639,CN @@ -36107,7 +36840,8 @@ 1731574784,1731576831,ID 1731576832,1731577087,AU 1731577088,1731577599,SG -1731577600,1731578879,AU +1731577600,1731577855,HK +1731577856,1731578879,AU 1731578880,1731580927,CN 1731581952,1731582975,CN 1731582976,1731583999,PH @@ -36125,8 +36859,7 @@ 1731601408,1731603455,BD 1731603456,1731604479,HK 1731604480,1731605503,CN -1731605504,1731605759,MY -1731605760,1731606527,CN +1731605504,1731606527,MY 1731606528,1731607551,JP 1731607552,1731608575,CN 1731608576,1731609599,IN @@ -36173,7 +36906,10 @@ 1731655680,1731657727,VN 1731657728,1731658751,TH 1731658752,1731659775,JP -1731659776,1731660799,HK +1731659776,1731660031,HK +1731660032,1731660287,SG +1731660288,1731660543,MY +1731660544,1731660799,BN 1731660800,1731661823,JP 1731661824,1731662847,AU 1731662848,1731663871,HK @@ -36275,8 +37011,354 @@ 1731761664,1731762175,AU 1731762176,1731763199,CN 1731763200,1731767295,VN -1731767296,1731767551,IN -1731768320,1731770367,IN +1731767296,1731767807,IN +1731767808,1731768063,KH +1731768064,1731770367,IN +1731770368,1731771391,CN +1731771392,1731772415,ID +1731772416,1731773439,HK +1731773440,1731774463,IN +1731774464,1731775487,CN +1731775488,1731776511,ID +1731776512,1731777023,BD +1731777024,1731777535,IN +1731777536,1731778559,JP +1731778560,1731779071,HK +1731779072,1731779583,JP +1731779584,1731782655,IN +1731782656,1731783679,ID +1731783680,1731788799,IN +1731788800,1731789823,AU +1731789824,1731790847,JP +1731790848,1731791871,ID +1731791872,1731792895,CN +1731792896,1731793919,IN +1731793920,1731794943,BD +1731794944,1731795967,HK +1731795968,1731796991,JP +1731796992,1731798015,AU +1731798016,1731799039,ID +1731799040,1731800063,BD +1731800064,1731802111,JP +1731802112,1731804159,CN +1731804160,1731805183,KR +1731805184,1731806207,IN +1731806208,1731806463,AU +1731806464,1731807231,IN +1731807232,1731808255,SG +1731808256,1731809279,CN +1731809280,1731811583,IN +1731811584,1731811839,AU +1731811840,1731812095,HK +1731812096,1731812351,AU +1731812352,1731813375,MN +1731813376,1731815423,JP +1731815424,1731816447,VN +1731816448,1731817471,CN +1731817472,1731818495,VN +1731818496,1731820543,BD +1731820544,1731821567,IN +1731821568,1731822591,JP +1731822592,1731823615,IN +1731823616,1731824639,CN +1731824640,1731825663,IN +1731825664,1731826687,JP +1731826688,1731827199,AU +1731827200,1731827455,IN +1731827456,1731827711,BD +1731827712,1731828735,PK +1731828736,1731829759,SG +1731829760,1731830783,IN +1731830784,1731831039,SG +1731831040,1731831807,AU +1731831808,1731832831,PK +1731832832,1731836927,IN +1731836928,1731837951,MY +1731837952,1731838975,ID +1731838976,1731839999,CN +1731840000,1731841023,HK +1731841024,1731842047,NP +1731842048,1731843071,VN +1731843072,1731845119,IN +1731845120,1731846143,VN +1731846144,1731846655,HK +1731846656,1731846911,IN +1731846912,1731847167,PH +1731847168,1731848191,HK +1731848192,1731849215,MP +1731849216,1731858431,IN +1731858432,1731859455,MY +1731859456,1731860479,FJ +1731860480,1731861503,CN +1731861504,1731862527,IN +1731862528,1731862783,AU +1731862784,1731863039,ID +1731863040,1731863551,AU +1731863552,1731871743,IN +1731871744,1731872767,JP +1731872768,1731873791,BD +1731873792,1731877887,IN +1731877888,1731878911,BD +1731878912,1731879935,IN +1731879936,1731881983,ID +1731881984,1731882495,BD +1731882496,1731882751,SG +1731882752,1731883007,ID +1731883008,1731883263,SG +1731883264,1731883519,MY +1731883520,1731891199,IN +1731891200,1731891711,NP +1731891712,1731892223,ID +1731892224,1731893247,TH +1731893248,1731895295,IN +1731895296,1731896319,ID +1731896320,1731899391,IN +1731899392,1731900415,HK +1731900416,1731900671,IN +1731900672,1731900927,HK +1731900928,1731901439,CN +1731901440,1731903487,IN +1731903488,1731905535,AU +1731905536,1731908607,IN +1731908608,1731911679,AU +1731911680,1731912703,KH +1731912704,1731913727,NZ +1731913728,1731913983,AU +1731913984,1731928063,IN +1731928064,1731929087,JP +1731929088,1731930111,BD +1731930112,1731933183,HK +1731933184,1731934207,LA +1731934208,1731939327,IN +1731939328,1731940351,CN +1731940352,1731942655,IN +1731942656,1731942911,JP +1731942912,1731943423,HK +1731943424,1731944447,KR +1731944448,1731945471,IN +1731945472,1731946495,CN +1731946496,1731947519,IN +1731947520,1731948543,AU +1731948544,1731953663,CN +1731953664,1731954687,IN +1731954688,1731955711,JP +1731956736,1731957759,HK +1731957760,1731958783,CN +1731958784,1731959807,IN +1731959808,1731960831,KR +1731960832,1731961855,AU +1731961856,1731962879,CN +1731962880,1731963903,BD +1731963904,1731964927,KH +1731964928,1731965951,BD +1731965952,1731966463,IN +1731966464,1731966975,AU +1731966976,1731975167,IN +1731975168,1731976191,CN +1731976192,1731977215,TW +1731977216,1731979519,IN +1731979520,1731979775,BD +1731979776,1731980287,ID +1731980288,1731986431,IN +1731986432,1731987455,JP +1731987456,1731988479,SG +1731988480,1731989503,JP +1731989504,1731990527,VN +1731990528,1731990783,AU +1731990784,1731991039,IN +1731991040,1731991551,AU +1731991552,1731992575,MY +1731992576,1731993599,IN +1731993600,1731994623,CN +1731994624,1731995647,JP +1731995648,1731996671,IN +1731996672,1731997695,CN +1731997696,1731999743,IN +1731999744,1732002815,HK +1732002816,1732007935,IN +1732007936,1732009983,JP +1732009984,1732010239,AU +1732010240,1732010495,MN +1732010496,1732010751,AU +1732010752,1732011007,NZ +1732011008,1732012287,IN +1732012288,1732013055,AU +1732013056,1732014079,HK +1732014080,1732016127,IN +1732016128,1732018175,KR +1732018176,1732019199,IN +1732019200,1732019967,AU +1732019968,1732022271,IN +1732022272,1732024319,HK +1732024320,1732025343,AU +1732025344,1732026367,IN +1732026368,1732027391,BD +1732027392,1732028415,CN +1732028416,1732029439,PH +1732029440,1732030463,BD +1732030464,1732031487,IN +1732031488,1732032511,ID +1732032512,1732032767,PH +1732032768,1732033023,TH +1732033024,1732033535,IN +1732033536,1732034559,JP +1732034560,1732035583,NZ +1732035584,1732036607,IN +1732036608,1732037631,AU +1732037632,1732038655,JP +1732038656,1732040703,IN +1732040704,1732040959,AU +1732040960,1732041215,SG +1732041216,1732041727,IN +1732041728,1732042751,HK +1732042752,1732043775,JP +1732043776,1732044799,CN +1732044800,1732045823,HK +1732045824,1732046847,CN +1732046848,1732047871,AU +1732047872,1732048895,IN +1732048896,1732049919,HK +1732049920,1732050943,PH +1732050944,1732051967,HK +1732051968,1732052991,SG +1732052992,1732054015,MM +1732054016,1732055039,IN +1732055040,1732056063,ID +1732056064,1732057087,HK +1732057088,1732058111,KH +1732058112,1732059135,HK +1732059136,1732060159,IN +1732060160,1732061183,HK +1732061184,1732061439,AU +1732061440,1732061695,ID +1732061696,1732062207,AU +1732062208,1732064255,VN +1732064256,1732066303,IN +1732066304,1732067327,CN +1732067328,1732068607,IN +1732068608,1732068863,NZ +1732068864,1732069119,AU +1732069120,1732069375,ID +1732069376,1732074495,IN +1732074496,1732075519,KH +1732075520,1732076543,AU +1732076544,1732077567,IN +1732077568,1732078591,CN +1732078592,1732080639,IN +1732080640,1732081663,ID +1732081664,1732082687,HK +1732082688,1732083711,MY +1732083712,1732084735,AU +1732084736,1732085759,IN +1732085760,1732086783,TW +1732086784,1732087807,CN +1732087808,1732088831,HK +1732088832,1732089599,IN +1732089600,1732089855,JP +1732089856,1732092927,CN +1732092928,1732093951,IN +1732093952,1732094975,HK +1732094976,1732097023,CN +1732097024,1732098047,IN +1732098048,1732100095,CN +1732100096,1732100607,SG +1732100608,1732107263,IN +1732107264,1732108287,HK +1732108288,1732109823,AU +1732109824,1732110335,IN +1732110336,1732111359,JP +1732111360,1732113407,HK +1732113408,1732114431,JP +1732114432,1732115455,ID +1732115456,1732116479,IN +1732116480,1732117503,PH +1732117504,1732118527,SG +1732118528,1732119551,VN +1732119552,1732122623,IN +1732122624,1732123647,CN +1732123648,1732124159,AU +1732124160,1732124671,PH +1732124672,1732126719,AU +1732126720,1732127743,IN +1732127744,1732129791,HK +1732129792,1732130815,CN +1732130816,1732134911,IN +1732134912,1732140031,CN +1732140032,1732141055,IN +1732141056,1732151295,CN +1732151296,1732152319,IN +1732152320,1732153855,BD +1732153856,1732154367,IN +1732154368,1732155391,HK +1732155392,1732156415,PH +1732156416,1732166655,CN +1732166656,1732167167,ID +1732167168,1732167679,IN +1732167680,1732168191,AU +1732168192,1732168703,ID +1732168704,1732174847,CN +1732174848,1732175871,KR +1732175872,1732176895,PK +1732176896,1732177919,IN +1732177920,1732178943,SG +1732178944,1732179967,JP +1732179968,1732182015,IN +1732182016,1732184063,HK +1732184064,1732188671,IN +1732188672,1732188927,AU +1732188928,1732189183,WS +1732189184,1732190207,IN +1732190208,1732205567,CN +1732205568,1732206591,NZ +1732206592,1732207615,ID +1732207616,1732207871,AU +1732207872,1732208127,IN +1732208128,1732208383,PH +1732208384,1732208639,AU +1732208640,1732213759,VN +1732213760,1732215807,IN +1732215808,1732217855,HK +1732217856,1732219903,CN +1732219904,1732220927,IN +1732220928,1732221951,CN +1732221952,1732222975,BD +1732222976,1732230143,CN +1732230144,1732230399,LA +1732230400,1732230655,AU +1732230656,1732230911,KH +1732230912,1732231167,AU +1732231168,1732236287,CN +1732236288,1732237311,VN +1732237312,1732240383,JP +1732240384,1732241407,AU +1732241408,1732241663,IN +1732241664,1732241919,ID +1732241920,1732242431,BD +1732242432,1732243455,HK +1732243456,1732247551,CN +1740636160,1740644351,CN +1740644352,1740645375,IN +1740645376,1740647423,HK +1740647424,1740648447,MO +1740648448,1740651519,CN +1740651520,1740653567,IN +1740653568,1740654591,JP +1740654592,1740655615,IN +1740655616,1740656639,NP +1740656640,1740656895,NZ +1740656896,1740657151,AF +1740657152,1740657663,AU +1740657664,1740665855,CN +1740665856,1740666879,IN +1740666880,1740667903,JP +1740667904,1740668927,PH +1740668928,1740674047,CN +1740674048,1740675071,JP +1740675072,1740676095,AU +1740676096,1740677119,BD +1740677120,1740678143,HK +1740678144,1740679167,CN +1740679168,1740681215,IN 1742734336,1742735359,IN 1742735360,1742736383,JP 1742736384,1742737407,PK @@ -36299,7 +37381,7 @@ 1742750720,1742751743,IN 1742751744,1742752767,HK 1742752768,1742753791,NZ -1742753792,1742754815,CN +1742753792,1742754815,HK 1742754816,1742756863,AU 1742756864,1742757887,JP 1742757888,1742758911,BN @@ -36465,13 +37547,13 @@ 1742928896,1742929919,NZ 1742929920,1742930175,IN 1742930432,1742930943,PH -1742930944,1742931967,KH 1742931968,1742932991,JP 1742932992,1742933503,SG 1742933504,1742933759,ID 1742933760,1742934015,NZ 1742934016,1742935039,AF -1742935040,1742938111,AU +1742935040,1742937087,AU +1742937088,1742938111,NZ 1742938112,1742939135,TW 1742939136,1742940159,IN 1742940160,1742941183,JP @@ -36502,8 +37584,6 @@ 1742972928,1742973439,AU 1742973440,1742973951,NZ 1742973952,1742975999,SG -1742976000,1742977023,JP -1742977024,1742978047,HK 1742978048,1742979071,JP 1742979072,1742980095,HK 1742980096,1742981119,CN @@ -36525,7 +37605,6 @@ 1742994432,1742995455,ID 1742995456,1742996479,BD 1742996480,1742997503,TH -1742997504,1742998527,JP 1742998528,1742999551,CN 1742999552,1742999807,AU 1742999808,1743000063,ID @@ -36544,27 +37623,22 @@ 1743015936,1743016447,ID 1743016448,1743016703,HK 1743016704,1743016959,IN -1743016960,1743017983,KH 1743017984,1743019007,CN 1743019008,1743021055,HK 1743021056,1743021311,SG 1743021312,1743021567,NZ 1743021568,1743021823,PH 1743021824,1743022079,IN -1743022080,1743023103,AU 1743023104,1743024127,HK 1743024128,1743025151,IN 1743025152,1743026175,ID 1743026176,1743027199,BD 1743027200,1743028223,AU 1743028224,1743029247,CN -1743029248,1743029503,AU -1743030272,1743031295,HK 1743031296,1743035391,IN 1743035392,1743036415,PK 1743036416,1743037439,CN 1743037440,1743038463,AU -1743038464,1743039487,JP 1743039488,1743040511,IN 1743040512,1743041535,CN 1743041536,1743042559,HK @@ -36578,7 +37652,6 @@ 1743049728,1743050751,AU 1743050752,1743051775,TW 1743051776,1743052799,IN -1743052800,1743053823,JP 1743053824,1743055871,CN 1743055872,1743059199,ID 1743059200,1743059967,IN @@ -36603,9 +37676,7 @@ 1743074048,1743074303,IN 1743074304,1743075327,HK 1743075328,1743076351,MY -1743076352,1743077375,JP 1743077376,1743078399,IN -1743078400,1743079423,JP 1743079424,1743080959,ID 1743080960,1743081471,IN 1743081472,1743083519,BD @@ -36629,7 +37700,6 @@ 1743095808,1743096831,CN 1743096832,1743098879,HK 1743098880,1743099903,CN -1743099904,1743100927,KH 1743100928,1743101951,KR 1743101952,1743103999,ID 1743104000,1743105023,IN @@ -36660,7 +37730,6 @@ 1743126528,1743127551,CN 1743127552,1743128575,BD 1743128576,1743129599,JP -1743129600,1743131647,HK 1743131648,1743132671,IN 1743132672,1743133695,JP 1743133696,1743134719,CN @@ -36675,7 +37744,6 @@ 1743140864,1743141887,MY 1743141888,1743142911,BD 1743142912,1743143935,BN -1743143936,1743144959,HK 1743144960,1743145983,AU 1743145984,1743147007,NZ 1743147008,1743147263,AU @@ -36690,24 +37758,21 @@ 1743153152,1743154175,BD 1743154176,1743155199,HK 1743155200,1743156223,KR -1743156224,1743157247,KH 1743157248,1743158271,HK -1743158272,1743160319,JP +1743159296,1743160319,JP 1743160320,1743161343,TH -1743161344,1743163391,HK +1743161344,1743162367,HK 1743163392,1743166463,IN 1743166464,1743167487,AU 1743167488,1743168511,HK 1743169024,1743169535,IN 1743169536,1743170559,JP -1743170560,1743171583,KR 1743171584,1743172607,AU 1743172608,1743173631,BD 1743173632,1743174655,AU 1743174656,1743175679,ID 1743175680,1743176703,HK 1743176704,1743179775,CN -1743179776,1743180799,JP 1743180800,1743181823,CN 1743181824,1743182847,HK 1743182848,1743184895,IN @@ -36751,8 +37816,7 @@ 1743225856,1743226367,IN 1743226368,1743226623,PH 1743226624,1743226879,BD -1743226880,1743227647,AF -1743227648,1743227903,IR +1743226880,1743227903,AF 1743227904,1743228927,HK 1743228928,1743229951,CN 1743229952,1743230975,VN @@ -36799,12 +37863,10 @@ 1743273984,1743275007,ID 1743275008,1743276031,HK 1743276032,1743277055,JP -1743277056,1743278079,PH 1743278080,1743279103,LA 1743279104,1743281151,HK 1743281152,1743283199,AU 1743283200,1743284223,BD -1743284224,1743285247,JP 1743285248,1743286271,NZ 1743286272,1743287295,IN 1743287296,1743288319,AU @@ -36842,7 +37904,6 @@ 1743319296,1743319551,IN 1743319552,1743320063,ID 1743320064,1743321087,IN -1743321088,1743322111,JP 1743322112,1743323135,AU 1743323136,1743324159,MY 1743324160,1743325183,CN @@ -36852,7 +37913,6 @@ 1743329280,1743330303,IN 1743330304,1743331327,AU 1743331328,1743333375,PH -1743333376,1743334399,JP 1743334400,1743335423,CN 1743335424,1743336447,VN 1743336448,1743337471,CN @@ -36895,7 +37955,7 @@ 1743370240,1743371263,HK 1743371264,1743372287,MO 1743372288,1743373311,TH -1743373312,1743375359,JP +1743373312,1743374335,JP 1743375360,1743376383,MM 1743376384,1743377407,AU 1743377408,1743378431,JP @@ -36922,7 +37982,6 @@ 1743396864,1743397887,HK 1743397888,1743398911,VN 1743398912,1743399935,TW -1743399936,1743400959,JP 1743400960,1743401983,PG 1743401984,1743403007,HK 1743403008,1743404031,CN @@ -37084,7 +38143,7 @@ 1743682560,1743683583,MY 1743683584,1743683839,JP 1743683840,1743684095,AU -1743684096,1743684351,HK +1743684096,1743684351,JP 1743684352,1743684607,AU 1743684608,1743685631,CN 1743685632,1743686655,ID @@ -37157,7 +38216,6 @@ 1743767552,1743768575,PH 1743768576,1743770623,CN 1743770624,1743770879,AU -1743770880,1743771135,PH 1743771136,1743771647,NZ 1743771648,1743772671,JP 1743772672,1743773695,SG @@ -37564,7 +38622,6 @@ 1744218112,1744218367,AU 1744218368,1744218623,ID 1744218624,1744219135,IN -1744219136,1744220159,PH 1744220160,1744220927,HK 1744220928,1744221183,JP 1744221184,1744222207,NZ @@ -37681,7 +38738,7 @@ 1744337920,1744338943,CN 1744338944,1744339967,AU 1744339968,1744340991,SG -1744340992,1744343039,HK +1744342016,1744343039,HK 1744343040,1744343551,SG 1744343552,1744343807,ID 1744343808,1744344063,AU @@ -37693,7 +38750,8 @@ 1744350208,1744351231,IN 1744351232,1744352255,NZ 1744353280,1744354303,HK -1744354304,1744355327,AU +1744354304,1744354559,AU +1744354560,1744355327,NZ 1744355328,1744356351,CN 1744356352,1744357375,JP 1744357376,1744357631,NZ @@ -37913,7 +38971,11 @@ 1744594432,1744594943,AU 1744594944,1744595967,CN 1744595968,1744596991,IN -1744596992,1744598015,SG +1744596992,1744597123,SG +1744597124,1744597124,US +1744597125,1744597151,SG +1744597152,1744597183,IN +1744597184,1744598015,SG 1744599040,1744601087,JP 1744602112,1744603135,HK 1744603136,1744604159,JP @@ -38057,7 +39119,7 @@ 1744752640,1744753663,HK 1744753664,1744754687,SG 1744754688,1744755711,VN -1744755712,1744756735,CN +1744755712,1744756735,HK 1744756736,1744757759,PF 1744757760,1744758271,NZ 1744758272,1744758527,IN @@ -38119,7 +39181,7 @@ 1744825344,1744826367,VN 1744826368,1744827391,ID 1744827392,1744828415,JP -1744828416,1744828927,AU +1744828416,1744828927,NZ 1744828928,1744829183,SG 1744829184,1744829439,AU 1744829440,1744830463,HK @@ -38190,7 +39252,9 @@ 1749397504,1749406719,NL 1749406720,1749413887,US 1749413888,1749422079,NL -1749422080,1749476863,US +1749422080,1749449727,US +1749449728,1749450239,NL +1749450240,1749476863,US 1749476864,1749496319,NL 1749496320,1749497855,US 1749497856,1749499391,NL @@ -38214,19 +39278,63 @@ 1749685248,1749686783,NL 1749686784,1749696511,US 1749696512,1749698047,NL -1749698048,1749749247,US +1749698048,1749698559,US +1749698560,1749718015,NL +1749718016,1749749247,US 1749749248,1749749759,NL 1749749760,1749757951,US 1749757952,1749767167,NL -1749767168,1749816831,US +1749767168,1749767679,US +1749767680,1749769215,NL +1749769216,1749770239,US +1749770240,1749778431,NL +1749778432,1749816831,US 1749816832,1749818367,NL 1749818368,1749819391,US 1749819392,1749827583,NL -1749827584,1749862143,US +1749827584,1749837823,US +1749837824,1749838847,NL +1749838848,1749862143,US 1749862144,1749862399,NL -1749862400,1749866239,US +1749862400,1749863423,US +1749863424,1749863679,NL +1749863680,1749866239,US 1749866240,1749866495,NL -1749866496,1753251839,US +1749866496,1749867263,US +1749867264,1749867519,NL +1749867520,1749868031,US +1749868032,1749868287,NL +1749868288,1750079999,US +1750080000,1750081535,NL +1750081536,1750089727,US +1750089728,1750106111,NL +1750106112,1750241279,US +1750241280,1750252543,NL +1750252544,1750253567,US +1750253568,1750261759,NL +1750261760,1750270975,US +1750270976,1750290943,NL +1750290944,1750292479,US +1750292480,1750294527,NL +1750294528,1750302719,US +1750302720,1750321663,NL +1750321664,1750323199,US +1750323200,1750331391,NL +1750331392,1750372351,US +1750372352,1750373375,NL +1750373376,1750374399,US +1750374400,1750374911,NL +1750374912,1750494719,US +1750494720,1750495231,NL +1750495232,1750515199,US +1750515200,1750515711,NL +1750515712,1750523903,US +1750523904,1750533119,NL +1750533120,1750581247,US +1750581248,1750597631,NL +1750597632,1750705151,US +1750705152,1750724607,NL +1750724608,1753251839,US 1753251840,1753252095,MN 1753252096,1753252351,SY 1753252352,1753252607,BY @@ -38262,7 +39370,9 @@ 1753489664,1753490175,US 1753490176,1753490431,AU 1753490432,1753490687,IL -1753490688,1753735167,US +1753490688,1753517567,US +1753517568,1753517823,NO +1753517824,1753735167,US 1753735168,1753743359,IE 1753743360,1754136575,US 1754136576,1754169343,CA @@ -38600,7 +39710,9 @@ 1758420224,1758420479,HU 1758420480,1758420735,CH 1758420736,1758420991,MM -1758420992,1759128575,US +1758420992,1758429695,US +1758429696,1758430207,DE +1758430208,1759128575,US 1759128576,1759129599,CA 1759129600,1759131647,US 1759131648,1759133695,CA @@ -38734,7 +39846,7 @@ 1759522560,1759522815,PN 1759522816,1759523071,MP 1759523072,1759523327,NF -1759523328,1759523583,US +1759523328,1759523583,PR 1759523584,1759523839,NU 1759523840,1759524095,NC 1759524096,1759524351,NL @@ -38751,8 +39863,8 @@ 1759526912,1759535103,US 1759535104,1759543295,CA 1759543296,1759547391,US -1759547392,1759549439,NL -1759549440,1760047103,US +1759547392,1759548415,NL +1759548416,1760047103,US 1760047104,1760051199,CA 1760051200,1760083967,US 1760083968,1760086015,SE @@ -38779,22 +39891,25 @@ 1760440832,1760441343,AU 1760441344,1760443391,US 1760443392,1760444415,DE -1760444416,1760468991,US +1760444416,1760465919,US +1760465920,1760466943,JP +1760466944,1760468479,US +1760468480,1760468991,DE 1760468992,1760469503,JP 1760469504,1760470527,US 1760470528,1760471039,DE 1760471040,1760473087,GB 1760473088,1760473599,DE 1760473600,1760475135,US -1760475136,1760477183,GB +1760475136,1760476159,GB +1760476160,1760477183,FR 1760477184,1760657407,US 1760657408,1760677887,CA 1760677888,1760690175,US 1760690176,1760755711,CA 1760755712,1760776191,US 1760776192,1760784383,CA -1760784384,1760817151,US -1760817152,1760817407,MO +1760784384,1760817407,US 1760817408,1760817663,BZ 1760817664,1760817919,BS 1760817920,1760818175,PA @@ -38810,7 +39925,9 @@ 1760820480,1760820735,CA 1760820736,1760837631,US 1760837632,1760839679,CA -1760839680,1760867327,US +1760839680,1760840379,US +1760840380,1760840380,LU +1760840381,1760867327,US 1760867328,1760868351,PR 1760868352,1760869375,US 1760869376,1760870399,CA @@ -38857,7 +39974,9 @@ 1761044480,1761044735,AU 1761044736,1761046527,US 1761046528,1761046783,JP -1761046784,1761075199,US +1761046784,1761048063,US +1761048064,1761048319,IN +1761048320,1761075199,US 1761075200,1761083391,CA 1761083392,1761181695,US 1761181696,1761181951,MX @@ -38898,7 +40017,7 @@ 1761259520,1761259775,KH 1761259776,1761260031,AZ 1761260032,1761260287,ET -1761260288,1761260543,CU +1761260288,1761260543,US 1761260544,1761260799,EC 1761260800,1761261055,MU 1761261056,1761261311,JM @@ -38907,7 +40026,9 @@ 1761261824,1761262079,SG 1761262080,1761262335,IN 1761262336,1761262591,PK -1761262592,1761273599,US +1761262592,1761262847,US +1761262848,1761263103,RU +1761263104,1761273599,US 1761273600,1761273855,AU 1761273856,1761275391,US 1761275392,1761275647,JP @@ -38917,7 +40038,9 @@ 1761302016,1761302271,CA 1761302272,1761304575,US 1761304576,1761308671,CA -1761308672,1761478655,US +1761308672,1761328639,US +1761328640,1761328895,AU +1761328896,1761478655,US 1761478656,1761479679,CA 1761479680,1761484799,US 1761484800,1761485823,CA @@ -38966,7 +40089,7 @@ 1762681088,1762681599,DE 1762681600,1762684927,MU 1762684928,1762689023,KE -1762689024,1762691071,MU +1762689024,1762691071,DJ 1762691072,1762693119,TZ 1762693120,1762695167,MZ 1762695168,1762701311,ZA @@ -38977,14 +40100,15 @@ 1762770944,1762783231,MU 1762783232,1762791423,KE 1762791424,1762795519,DJ -1762795520,1762803711,MU -1762803712,1762807807,ZA -1762807808,1762815999,MU +1762795520,1762799615,TZ +1762799616,1762803711,MZ +1762803712,1762815999,ZA 1762816000,1762820095,FR 1762820096,1762942975,MU 1762942976,1762947071,NL 1762947072,1762951167,SE -1762951168,1762983935,MU +1762951168,1762955263,DE +1762955264,1762983935,MU 1762983936,1763000319,KE 1763000320,1763008511,UG 1763008512,1763016703,RW @@ -39004,7 +40128,8 @@ 1763344896,1763352575,DE 1763352576,1763385343,MU 1763385344,1763393535,AE -1763393536,1763402239,MU +1763393536,1763401727,GB +1763401728,1763402239,MU 1763402240,1763402751,KE 1763402752,1763406335,MU 1763406336,1763406847,ZA @@ -39013,16 +40138,21 @@ 1763428864,1763430399,MU 1763430400,1763438591,KE 1763438592,1763442687,UG -1763442688,1763450879,MU +1763442688,1763446783,RW +1763446784,1763450879,DJ 1763450880,1763459071,TZ 1763459072,1763463167,MZ 1763463168,1763475455,ZA 1763475456,1763479551,FR -1763479552,1763573759,MU +1763479552,1763483647,GB +1763483648,1763573759,MU 1763573760,1763577855,US -1763577856,1763602431,MU +1763577856,1763598335,MU +1763598336,1763602431,IN 1763602432,1763606527,NL -1763606528,1763631103,MU +1763606528,1763610623,MU +1763610624,1763614719,DE +1763614720,1763631103,MU 1763631104,1763635199,AE 1763635200,1763657727,MU 1763657728,1763659775,ZA @@ -39104,8 +40234,8 @@ 1795560448,1795560959,CA 1795560960,1795561247,US 1795561248,1795561343,CA -1795561344,1795561471,US -1795561472,1795562495,CA +1795561344,1795561983,US +1795561984,1795562495,CA 1795562496,1795562911,US 1795562912,1795562943,CA 1795562944,1795564031,US @@ -39263,14 +40393,15 @@ 1815962112,1815962623,NL 1815962624,1815963391,US 1815963392,1815963647,NL -1815963648,1815964159,US +1815963648,1815963903,US +1815963904,1815964159,FR 1815964160,1815964415,DK 1815964416,1815964671,PL 1815964672,1815965695,US 1815965696,1815966207,DE 1815966208,1815966719,US 1815966720,1815966975,GB -1815966976,1815967231,US +1815966976,1815967231,NL 1815967232,1815967487,CA 1815967488,1815968255,US 1815968256,1815968767,FR @@ -39310,7 +40441,9 @@ 1815996160,1815996415,CA 1815996416,1815997695,US 1815997696,1815997951,FR -1815997952,1816001023,US +1815997952,1816000063,US +1816000064,1816000511,JP +1816000512,1816001023,US 1816001024,1816001279,JP 1816001280,1816001535,AU 1816001536,1816001791,US @@ -39653,10 +40786,13 @@ 1835597824,1835606015,HU 1835606016,1835614207,CZ 1835614208,1835622399,RU -1835622400,1835630591,SE +1835622400,1835627007,SE +1835627008,1835627263,DK +1835627264,1835630591,SE 1835630592,1835636735,RU 1835636736,1835638527,LU -1835638528,1835646975,RU +1835638528,1835638783,AM +1835638784,1835646975,RU 1835646976,1835655167,BA 1835655168,1835663359,CY 1835663360,1835671551,UA @@ -39696,7 +40832,9 @@ 1835917856,1835917863,IT 1835917864,1835917919,GB 1835917920,1835917935,IT -1835917936,1835918383,GB +1835917936,1835918031,GB +1835918032,1835918039,IT +1835918040,1835918383,GB 1835918384,1835918391,IT 1835918392,1835918439,GB 1835918440,1835918447,IT @@ -39716,9 +40854,7 @@ 1835919752,1835919759,IT 1835919760,1835920479,GB 1835920480,1835920487,IT -1835920488,1835920991,GB -1835920992,1835920999,IT -1835921000,1835921119,GB +1835920488,1835921119,GB 1835921120,1835921127,IT 1835921128,1835921343,GB 1835921344,1835921351,IT @@ -39840,13 +40976,9 @@ 1839693824,1839726591,RU 1839726592,1839759359,IT 1839759360,1839792127,RU -1839792128,1839793279,GB -1839793280,1839793407,A1 -1839793408,1839794847,GB +1839792128,1839794847,GB 1839794848,1839794879,CH -1839794880,1839796479,GB -1839796480,1839796671,A1 -1839796672,1839816703,GB +1839794880,1839816703,GB 1839816704,1839824895,NO 1839824896,1839890431,RU 1839890432,1839923199,GB @@ -39977,9 +41109,18 @@ 1842085888,1842118655,GB 1842118656,1842151423,FI 1842151424,1842153471,FR -1842153472,1842154271,NO +1842153472,1842153983,NO +1842153984,1842154239,US +1842154240,1842154271,NO 1842154272,1842154303,HK -1842154304,1842155519,NO +1842154304,1842154335,NO +1842154336,1842154343,SG +1842154344,1842154351,NO +1842154352,1842154367,SG +1842154368,1842154495,NO +1842154496,1842155007,US +1842155008,1842155263,AU +1842155264,1842155519,NL 1842155520,1842157567,IT 1842157568,1842159615,AE 1842159616,1842161663,BA @@ -40017,7 +41158,7 @@ 1842233344,1842241535,SA 1842241536,1842249727,RS 1842249728,1842257919,RU -1842257920,1842266111,EU +1842257920,1842266111,NL 1842266112,1842274303,PL 1842282496,1842286591,RU 1842286592,1842290687,GB @@ -40253,9 +41394,15 @@ 1844772864,1844838399,RS 1844838400,1844903935,GB 1844903936,1844969471,NO -1844969472,1845029887,RU +1844969472,1845006335,RU +1845006336,1845010431,KZ +1845010432,1845025535,RU +1845025536,1845025791,KZ +1845025792,1845029887,RU 1845029888,1845030143,KZ -1845030144,1845034751,RU +1845030144,1845030911,RU +1845030912,1845031935,GE +1845031936,1845034751,RU 1845034752,1845035007,BY 1845035008,1845100543,GB 1845100544,1845166079,DE @@ -40562,7 +41709,6 @@ 1876934656,1876942847,JP 1876942848,1876946943,AU 1876946944,1876947967,CN -1876947968,1876948991,AF 1876948992,1876950015,CN 1876950016,1876951039,ID 1876951040,1877475327,CN @@ -41017,7 +42163,11 @@ 1933922304,1933926399,IN 1933926400,1933934591,KR 1933934592,1933942783,IN -1933942784,1933950975,AU +1933942784,1933944319,NZ +1933944320,1933944575,AU +1933944576,1933946879,NZ +1933946880,1933948927,AU +1933948928,1933950975,NZ 1933950976,1933955071,JP 1933955072,1933957119,BD 1933957120,1933959167,ID @@ -41039,7 +42189,8 @@ 1934966784,1934974975,ID 1934974976,1934983167,JP 1934983168,1934983423,MY -1934983424,1934985215,AU +1934983424,1934984959,AU +1934984960,1934985215,US 1934985216,1934987263,JP 1934987264,1934991359,TW 1934991360,1934999551,KR @@ -41135,13 +42286,17 @@ 1946163200,1946165247,CN 1946165248,1946173439,PK 1946173440,1946173695,PG -1946173696,1946175487,SG -1946175488,1946176511,SY +1946173696,1946173951,TW +1946173952,1946174463,SG +1946174464,1946174719,TW +1946174720,1946176511,SG 1946176512,1946176639,AU 1946176640,1946176767,PH 1946176768,1946178047,SG 1946178048,1946178303,HK -1946178304,1946181631,SG +1946178304,1946179583,SG +1946179584,1946179839,AU +1946179840,1946181631,SG 1946181632,1946189823,MY 1946189824,1946222591,JP 1946222592,1946943487,CN @@ -41162,7 +42317,9 @@ 1949440000,1949442047,ID 1949442048,1949446143,TW 1949446144,1949448191,JP -1949448192,1949449471,AU +1949448192,1949449395,AU +1949449396,1949449396,AP +1949449397,1949449471,AU 1949449472,1949449727,JP 1949449728,1949450239,AU 1949450240,1949466623,IN @@ -41287,7 +42444,7 @@ 1959239680,1959241727,KR 1959241728,1959243775,IN 1959243776,1959247871,JP -1959247872,1959251967,ID +1959247872,1959249919,ID 1959251968,1959256063,NZ 1959256064,1959260159,AU 1959260160,1959264255,JP @@ -41343,9 +42500,7 @@ 1962663936,1962672127,HK 1962672128,1962803199,CN 1962803200,1962827775,JP -1962827776,1962829823,ID -1962829824,1962831871,JP -1962831872,1962835967,ID +1962827776,1962835967,ID 1962835968,1962868735,CN 1962868736,1962885119,AU 1962885120,1962901503,KR @@ -41474,7 +42629,11 @@ 1970798592,1970800639,SG 1970800640,1970802943,AU 1970802944,1970803199,SG -1970803200,1970804735,AU +1970803200,1970803711,AU +1970803712,1970803967,HK +1970803968,1970804519,AU +1970804520,1970804520,SG +1970804521,1970804735,AU 1970804736,1970806783,KH 1970806784,1970808831,NZ 1970808832,1970810879,AU @@ -41489,7 +42648,8 @@ 1970926336,1970926591,US 1970926592,1970926847,SG 1970926848,1970927103,IL -1970927104,1970927615,SG +1970927104,1970927359,SG +1970927360,1970927615,US 1970927616,1970929663,AU 1970929664,1970962431,VN 1970962432,1970995199,CN @@ -41551,7 +42711,8 @@ 1986498560,1986502655,HK 1986510848,1986519039,KR 1986519040,1986523135,PK -1986523136,1986525183,CN +1986523136,1986523904,HK +1986523905,1986525183,CN 1986525184,1986527231,BN 1986527232,1986723839,JP 1986723840,1986740223,AU @@ -41621,7 +42782,9 @@ 1996685312,1996750847,HK 1996750848,1997078527,CN 1997078528,1997094911,AU -1997094912,1997144063,HK +1997094912,1997111295,HK +1997111296,1997127679,AU +1997127680,1997144063,HK 1997144064,1997176831,CN 1997176832,1997180927,AU 1997180928,1997185023,HK @@ -41709,7 +42872,6 @@ 1999136768,1999138815,AU 1999138816,1999142911,MY 1999142912,1999249407,CN -1999249408,1999257599,PH 1999257600,1999273983,TH 1999273984,1999278079,CN 1999278080,1999280127,HK @@ -41766,61 +42928,27 @@ 2001829888,2001841247,HK 2001841248,2001841248,SA 2001841249,2001846271,HK -2001846272,2001855231,SG +2001846272,2001854943,SG +2001854944,2001854951,CN +2001854952,2001855231,SG 2001855232,2001855263,US 2001855264,2001855775,SG 2001855776,2001855791,US -2001855792,2001855807,SG -2001855808,2001855823,GB -2001855824,2001857439,SG -2001857440,2001857503,US -2001857504,2001857975,SG -2001857976,2001857983,US -2001857984,2001858007,SG -2001858008,2001858011,US -2001858012,2001858111,SG -2001858112,2001858143,US -2001858144,2001859007,SG -2001859008,2001859015,NL -2001859016,2001859039,SG -2001859040,2001859071,US -2001859072,2001859791,SG -2001859792,2001859799,US -2001859800,2001859807,SG -2001859808,2001859811,US -2001859812,2001859899,SG -2001859900,2001859903,US -2001859904,2001860119,SG -2001860120,2001860127,US -2001860128,2001860227,SG -2001860228,2001860231,US -2001860232,2001860335,SG -2001860336,2001860343,US -2001860344,2001860439,SG -2001860440,2001860443,US -2001860444,2001860527,SG -2001860528,2001860531,US -2001860532,2001860603,SG -2001860604,2001860607,US -2001860608,2001860791,SG -2001860792,2001860795,US -2001860796,2001860855,SG -2001860856,2001860863,US -2001860864,2001860903,SG -2001860904,2001860907,US -2001860908,2001860959,SG -2001860960,2001860963,US -2001860964,2001861087,SG -2001861088,2001861095,US -2001861096,2001861207,SG -2001861208,2001861215,US -2001861216,2001861399,SG -2001861400,2001861415,US -2001861416,2001861439,SG -2001861440,2001861447,AU -2001861448,2001862015,SG -2001862016,2001862047,US -2001862048,2001862655,SG +2001855792,2001857439,SG +2001857440,2001857471,US +2001857472,2001857791,SG +2001857792,2001858047,HK +2001858048,2001858335,SG +2001858336,2001858367,US +2001858368,2001858639,SG +2001858640,2001858655,US +2001858656,2001860031,SG +2001860032,2001860047,HK +2001860048,2001860351,SG +2001860352,2001860607,HK +2001860608,2001862079,SG +2001862080,2001862143,US +2001862144,2001862655,SG 2001862656,2001864703,AU 2001864704,2001870847,JP 2001870848,2001879039,KR @@ -42149,9 +43277,7 @@ 2047496192,2047504383,HK 2047504384,2047506431,CN 2047506432,2047508479,US -2047508480,2047517695,CN -2047517696,2047518719,HK -2047518720,2047574015,CN +2047508480,2047574015,CN 2047574016,2047606783,SG 2047606784,2047770879,CN 2047770880,2047773184,HK @@ -42565,7 +43691,6 @@ 2084569088,2084732927,CN 2084732928,2084741119,SG 2084741120,2084743167,ID -2084743168,2084745215,JP 2084745216,2084749311,KR 2084749312,2084753407,JP 2084753408,2084757503,KR @@ -42786,9 +43911,13 @@ 2113688000,2113688031,AU 2113688032,2113688959,JP 2113688960,2113688991,SG -2113688992,2113693599,JP +2113688992,2113691135,JP +2113691136,2113691391,SG +2113691392,2113693599,JP 2113693600,2113693615,HK -2113693616,2113694175,JP +2113693616,2113693879,JP +2113693880,2113693887,AU +2113693888,2113694175,JP 2113694176,2113694191,HK 2113694192,2113716223,JP 2113716224,2113724927,SG @@ -42811,8 +43940,8 @@ 2147491840,2147494911,DE 2147494912,2147495167,RO 2147495168,2147495423,DE -2147495424,2147495935,RO -2147495936,2147497215,DE +2147495424,2147496959,RO +2147496960,2147497215,DE 2147497216,2147497471,RO 2147497472,2147498239,DE 2147498240,2147498495,RO @@ -42885,7 +44014,12 @@ 2153387008,2153387263,CH 2153387264,2153387775,US 2153387776,2153388031,CH -2153388032,2153406463,US +2153388032,2153397247,US +2153397248,2153397503,IN +2153397504,2153397759,SA +2153397760,2153398015,QA +2153398016,2153398271,BH +2153398272,2153406463,US 2153406464,2153407487,JP 2153407488,2153407743,HK 2153407744,2153407999,US @@ -42948,7 +44082,9 @@ 2156331008,2156593151,US 2156593152,2156658687,IL 2156658688,2156691455,IR -2156691456,2156695551,A2 +2156691456,2156694271,A2 +2156694272,2156694783,FR +2156694784,2156695551,A2 2156695552,2156697599,FR 2156697600,2156699647,GR 2156699648,2156703743,RU @@ -43084,6 +44220,8 @@ 2177105920,2177302527,US 2177302528,2177368063,FR 2177368064,2177695743,US +2177703936,2177712127,ZA +2177744896,2177761279,BW 2177761280,2177826815,DE 2177826816,2177892351,US 2177892352,2177957887,SA @@ -43283,17 +44421,19 @@ 2193707408,2193707415,IT 2193707416,2193707559,GB 2193707560,2193707567,IT -2193707568,2193707631,GB -2193707632,2193707639,IT -2193707640,2193707655,GB +2193707568,2193707655,GB 2193707656,2193707663,IT 2193707664,2193707751,GB 2193707752,2193707759,IT 2193707760,2193708735,GB 2193708736,2193708743,IT -2193708744,2193709087,GB +2193708744,2193708967,GB +2193708968,2193708975,IT +2193708976,2193709087,GB 2193709088,2193709095,IT -2193709096,2193709631,GB +2193709096,2193709199,GB +2193709200,2193709215,IT +2193709216,2193709631,GB 2193709632,2193709639,IT 2193709640,2193711103,GB 2193711104,2193713151,DE @@ -43339,7 +44479,9 @@ 2197751808,2197753855,RU 2197753856,2197754879,GB 2197754880,2197755135,DK -2197755136,2197757951,GB +2197755136,2197756159,GB +2197756160,2197756175,PT +2197756176,2197757951,GB 2197757952,2197766143,RU 2197766144,2197768191,PS 2197768192,2197770239,DE @@ -43487,7 +44629,7 @@ 2206400512,2206466047,US 2206466048,2207121407,CA 2207121408,2207449087,US -2207449088,2207514623,HK +2207449088,2207514623,JP 2207514624,2207647487,CA 2207647488,2207647743,US 2207647744,2207648511,CA @@ -43569,7 +44711,7 @@ 2211446784,2211643391,US 2211643392,2211708927,NL 2211708928,2211774463,US -2211774464,2211839999,HK +2211774464,2211839999,JP 2211840000,2212036607,US 2212036608,2212102143,AU 2212102144,2212233215,US @@ -43746,7 +44888,9 @@ 2231362560,2231364607,BR 2231364608,2231365631,CL 2231365632,2231369727,BR -2231369728,2248146943,JP +2231369728,2239889407,JP +2239889408,2239890431,US +2239890432,2248146943,JP 2248146944,2248148991,IT 2248148992,2248151039,ES 2248151040,2248153087,GB @@ -44047,7 +45191,11 @@ 2258614816,2258615039,AU 2258615040,2258615055,IN 2258615056,2258616319,AU -2258616320,2258632703,HK +2258616320,2258621951,HK +2258621952,2258622207,NZ +2258622208,2258622719,HK +2258622720,2258623231,NZ +2258623232,2258632703,HK 2258632704,2258698239,JP 2258698240,2259222527,US 2259222528,2259288063,DE @@ -44106,7 +45254,7 @@ 2263613440,2263678975,TH 2263678976,2263744511,JP 2263744512,2263810047,US -2263810048,2263875583,GB +2263810048,2263875583,RO 2263875584,2264203263,US 2264203264,2264268799,DE 2264268800,2264334335,FR @@ -44504,8 +45652,7 @@ 2321447936,2321452031,BR 2321452032,2321453055,MX 2321453056,2321454079,HN -2321454080,2321456127,BR -2321457152,2321471487,BR +2321454080,2321471487,BR 2321471488,2321472511,HN 2321472512,2321477631,BR 2321477632,2321478655,TT @@ -44520,11 +45667,14 @@ 2321633280,2321634303,CO 2321634304,2321648639,BR 2321648640,2321649663,SV -2321649664,2321653759,BR +2321649664,2321652735,BR +2321652736,2321653759,BZ 2321653760,2321654783,NI 2321654784,2321655807,BR 2321655808,2321656831,MX -2321656832,2321663999,BR +2321656832,2321657855,BR +2321657856,2321658879,AR +2321658880,2321663999,BR 2321664000,2321665023,AR 2321665024,2321673215,BR 2321673216,2321674239,AR @@ -44540,24 +45690,36 @@ 2321755136,2321756159,UY 2321756160,2321769471,BR 2321769472,2321770495,PY -2321770496,2321774591,BR -2321774592,2321775615,BZ +2321770496,2321774719,BR +2321774720,2321774847,PE +2321774848,2321774975,AR +2321774976,2321775103,VE +2321775104,2321775231,PE +2321775232,2321775359,BR +2321775360,2321775487,EC +2321775488,2321775615,AR 2321775616,2321776639,VE 2321776640,2321777663,AR 2321777664,2321778687,BR 2321778688,2321779711,PA +2321779712,2321780735,BR +2321780736,2321780991,PA +2321780992,2321781247,BR +2321781248,2321781503,PA +2321781504,2321781759,BR +2321781760,2321782783,MX 2321782784,2321787903,BR 2321787904,2321788927,AR 2321788928,2321789951,CL 2321789952,2321790975,SV 2321790976,2321791999,AR -2321793024,2321797119,BR +2321792000,2321797119,BR 2321797120,2321798143,BZ 2321798144,2321799167,CW 2321799168,2321800191,BZ 2321800192,2321801215,VE 2321801216,2321802239,CL -2321802240,2321803263,BR +2321802240,2321804287,BR 2321804288,2321805311,DO 2321805312,2321809407,BR 2321809408,2321874943,ES @@ -44574,15 +45736,19 @@ 2322368512,2322368767,MY 2322368768,2322923519,US 2322923520,2322924543,BR +2322924544,2322925567,NI 2322925568,2322929663,AR -2322930688,2322931711,BR -2322932736,2322933759,BR +2322929664,2322933759,BR +2322933760,2322934783,CO 2322934784,2322935807,VE 2322935808,2322936831,AR -2322936832,2322939903,BR +2322936832,2322940927,BR 2322940928,2322941951,CL 2322941952,2322942975,BR -2322947072,2322948095,BR +2322942976,2322943999,AR +2322944000,2322945023,BR +2322945024,2322946047,CO +2322946048,2322948095,BR 2322948096,2322949119,HN 2322949120,2322951167,BR 2322951168,2322952191,CO @@ -44592,11 +45758,94 @@ 2322957312,2322958335,BR 2322958336,2322959359,CO 2322959360,2322960383,GT +2322960384,2322961407,BR 2322961408,2322962431,CL +2322962432,2322963455,BR +2322963456,2322964479,AR +2322964480,2322965503,PE +2322965504,2322974719,BR +2322974720,2322975743,AR +2322975744,2322980863,BR +2322989056,2322991103,BR +2322991104,2322992127,CL +2322992128,2322998271,BR +2322998272,2322999295,AR +2322999296,2323001343,BR +2323001344,2323002367,AR +2323002368,2323009535,BR +2323009536,2323010559,CR +2323010560,2323015679,BR +2323015680,2323016703,GT +2323016704,2323017727,BR +2323017728,2323018751,AR +2323018752,2323020799,BR +2323020800,2323021823,PA +2323021824,2323025919,BR +2323025920,2323026943,AR +2323026944,2323028991,BR +2323028992,2323030015,CR +2323030016,2323042303,BR +2323042304,2323045375,AR +2323045376,2323054591,BR 2323054592,2323120127,CA +2323120128,2323185663,FR +2323185664,2323186687,BR +2323186688,2323187711,CO +2323187712,2323188735,BR +2323188736,2323189759,CO +2323189760,2323205119,BR +2323205120,2323208191,AR +2323209216,2323210239,BR +2323210240,2323211263,CL +2323211264,2323213311,AR +2323213312,2323214335,CL +2323214336,2323215359,AR +2323215360,2323217407,BR +2323217408,2323218431,AR +2323218432,2323221503,BR +2323221504,2323222527,CR +2323222528,2323225599,BR +2323225600,2323226623,CO +2323226624,2323227647,AR +2323227648,2323228671,BR +2323228672,2323229695,CL +2323229696,2323230719,BR +2323230720,2323231743,CL +2323231744,2323236863,BR +2323236864,2323237887,CO +2323237888,2323244031,BR +2323244032,2323245055,AR +2323245056,2323247103,BR +2323247104,2323248127,AR +2323248128,2323252223,BR +2323252224,2323253247,VE +2323253248,2323257343,BR +2323257344,2323258367,CR +2323258368,2323275775,BR +2323275776,2323276799,MX +2323276800,2323278847,BR +2323278848,2323279871,EC +2323279872,2323283967,BR +2323283968,2323284991,AR +2323284992,2323288063,BR +2323289088,2323291135,BR +2323291136,2323292159,AR +2323292160,2323293183,PY +2323293184,2323298303,BR +2323299328,2323300351,AR +2323300352,2323301375,HN +2323302400,2323303423,CO +2323303424,2323308543,BR +2323308544,2323309567,CL +2323309568,2323310591,AR +2323310592,2323313663,BR +2323313664,2323314687,CR +2323315712,2323316735,MX 2323316736,2323382271,US 2323382272,2323447807,NO -2323447808,2323699711,US +2323447808,2323690495,US +2323690496,2323690751,IN +2323690752,2323699711,US 2323699712,2323700735,NL 2323700736,2323701759,US 2323701760,2323709951,VG @@ -44607,6 +45856,40 @@ 2323972096,2324037631,US 2324037632,2324103167,IL 2324103168,2327379967,US +2327379968,2327380991,MX +2327380992,2327383039,BR +2327383040,2327384063,CL +2327384064,2327396351,BR +2327397376,2327398399,VE +2327398400,2327399423,BR +2327400448,2327401471,AR +2327401472,2327406591,BR +2327406592,2327407615,NI +2327407616,2327408639,BR +2327408640,2327409663,AR +2327411712,2327412735,BR +2327413760,2327414783,BR +2327415808,2327416831,AR +2327416832,2327432191,BR +2327432192,2327433215,AR +2327433216,2327434239,BQ +2327434240,2327437311,BR +2327437312,2327438335,MX +2327438336,2327440383,BR +2327443456,2327444479,CR +2327445504,2327446527,BR +2327446528,2327447551,VE +2327450624,2327451647,CO +2327451648,2327452671,BR +2327453696,2327459839,BR +2327460864,2327461887,PY +2327463936,2327464959,BR +2327465984,2327468031,BR +2327468032,2327469055,PA +2327469056,2327474175,BR +2327478272,2327480319,BR +2327480320,2327481343,HN +2327481344,2327482367,AR 2327511040,2327838719,CH 2327838720,2327969791,US 2327969792,2328035327,AU @@ -44685,7 +45968,9 @@ 2335965184,2336161791,US 2336161792,2336227327,NL 2336292864,2336358399,US -2336358400,2336423935,FI +2336358400,2336411647,FI +2336411648,2336412671,SG +2336412672,2336423935,FI 2336423936,2336882687,US 2336882688,2336948223,FI 2336948224,2337013759,DE @@ -44767,7 +46052,9 @@ 2342518784,2342584319,FR 2342584320,2342649856,US 2342649857,2342658047,SG -2342658048,2342715391,US +2342658048,2342700247,US +2342700248,2342700248,GB +2342700249,2342715391,US 2342715392,2342780927,AU 2342780928,2342846463,NO 2342846464,2342911999,BE @@ -45195,13 +46482,13 @@ 2382692352,2383085567,CA 2383085568,2383151103,US 2383151104,2385903615,CA -2385903616,2385908223,US +2385903616,2385908735,US 2385908736,2385909759,VG 2385909760,2385915903,US 2385915904,2385919999,CA 2385920000,2385952767,US 2385952768,2385954815,BM -2385954816,2385955327,US +2385954816,2385955839,US 2385955840,2385956863,TC 2385956864,2385969151,US 2385969152,2386624511,CA @@ -45239,17 +46526,19 @@ 2391015424,2391277567,CA 2391277568,2391343103,US 2391343104,2391998463,CA -2391998464,2392001535,US -2392002304,2392012799,CA +2391998464,2392002047,US +2392002304,2392010751,CA +2392010752,2392011263,US +2392011264,2392011519,CA +2392011776,2392012799,CA 2392012800,2392013823,US 2392014080,2392014335,CA 2392015360,2392015615,CA -2392015872,2392016895,US -2392016896,2392019199,CA -2392019968,2392020991,US -2392020992,2392021247,HK -2392021248,2392021503,JP -2392021504,2392021759,US +2392015872,2392017407,US +2392017408,2392017663,CA +2392018432,2392018687,CA +2392018944,2392019967,CA +2392019968,2392021759,US 2392021760,2392022015,NL 2392022016,2392022271,FR 2392022272,2392022527,DE @@ -45350,7 +46639,9 @@ 2413428736,2413494271,AU 2413494272,2413625343,US 2413625344,2413690879,JP -2413690880,2413821951,US +2413690880,2413758463,US +2413758464,2413758975,GB +2413758976,2413821951,US 2413821952,2413887487,AT 2413887488,2413953023,IT 2413953024,2414411775,US @@ -45391,41 +46682,127 @@ 2417688576,2417754111,SE 2417754112,2418016255,US 2418016256,2418081791,GB -2418081792,2418296319,US +2418081792,2418278655,US +2418278656,2418278911,ZA +2418278912,2418279487,US +2418279488,2418279491,ES +2418279492,2418281151,US +2418281152,2418281215,IN +2418281216,2418281983,US +2418281984,2418282239,ES +2418282240,2418284543,US +2418284544,2418285055,CA +2418285056,2418285567,MX +2418285568,2418286335,US +2418286336,2418286591,MX +2418286592,2418287103,CA +2418287104,2418287295,US +2418287296,2418287359,GB +2418287360,2418291199,US +2418291200,2418292223,AR +2418292224,2418292735,PH +2418292736,2418294015,US +2418294016,2418294783,AR +2418294784,2418294911,US +2418294912,2418295039,GB +2418295040,2418295807,US +2418295808,2418295935,GB +2418295936,2418295947,US +2418295948,2418295951,GB +2418295952,2418296063,US +2418296064,2418296319,DE 2418296320,2418297343,IN -2418297344,2418305023,US -2418305024,2418305279,IN -2418305280,2418311167,US +2418297344,2418297855,US +2418297856,2418298367,BR +2418298368,2418298623,ZA +2418298624,2418301439,US +2418301440,2418301695,PH +2418301696,2418302463,US +2418302464,2418302719,PH +2418302720,2418302975,US +2418302976,2418303231,IN +2418303232,2418303487,ZA +2418303488,2418303871,US +2418303872,2418303879,GB +2418303880,2418304511,US +2418304512,2418304671,GB +2418304672,2418304767,US +2418304768,2418304895,DE +2418304896,2418305151,US +2418305152,2418305279,IN +2418305280,2418305535,ES +2418305536,2418306303,US +2418306304,2418306559,GB +2418306560,2418307327,MU +2418307328,2418307455,US +2418307456,2418307583,PH +2418307584,2418308095,LV +2418308096,2418308351,PH +2418308352,2418308383,GB +2418308384,2418308607,US +2418308608,2418309119,RO +2418309120,2418309631,PL +2418309632,2418310143,US +2418310144,2418310655,PH +2418310656,2418311167,US 2418311168,2418311679,IN -2418311680,2418312703,US +2418311680,2418312703,CZ 2418312704,2418313215,IN -2418313216,2418314239,US +2418313216,2418314239,PH 2418314240,2418314751,IN -2418314752,2418315263,US +2418314752,2418315007,PH +2418315008,2418315135,IN +2418315136,2418315263,US 2418315264,2418315775,IN -2418315776,2418316287,US +2418315776,2418316287,CN 2418316288,2418316799,IN -2418316800,2418323455,US +2418316800,2418317055,AU +2418317056,2418317311,JP +2418317312,2418317823,PH +2418317824,2418318079,US +2418318080,2418318335,IN +2418318336,2418319871,PH +2418319872,2418320127,KR +2418320128,2418320191,US +2418320192,2418320255,AU +2418320256,2418320319,IN +2418320320,2418320383,PH +2418320384,2418321407,US +2418321408,2418322431,PH +2418322432,2418322687,US +2418322688,2418322847,IN +2418322848,2418323455,US 2418323456,2418323711,IN 2418323712,2418323967,US -2418323968,2418324223,IN -2418324224,2418324991,US +2418323968,2418324479,IN +2418324480,2418324735,PH +2418324736,2418324799,IN +2418324800,2418324991,US 2418324992,2418326015,IN -2418326016,2418326527,US +2418326016,2418326527,PH 2418326528,2418327039,IN -2418327040,2418331135,US +2418327040,2418327423,US +2418327424,2418327487,PH +2418327488,2418328063,US +2418328064,2418328831,SK +2418328832,2418329599,US +2418329600,2418330367,SK +2418330368,2418331135,US 2418331136,2418331647,IN 2418331648,2418332159,US 2418332160,2418332671,IN -2418332672,2418333183,US +2418332672,2418333183,PH 2418333184,2418334207,IN -2418334208,2418334719,US +2418334208,2418334463,CN +2418334464,2418334719,PH 2418334720,2418339071,IN -2418339072,2418340863,US +2418339072,2418339839,MU +2418339840,2418340351,CN +2418340352,2418340863,US 2418340864,2418341375,IN -2418341376,2418341887,US +2418341376,2418341887,PH 2418341888,2418342911,IN -2418342912,2418343423,US +2418342912,2418343423,PH 2418343424,2418343935,IN 2418343936,2418606079,US 2418606080,2418671615,DE @@ -45708,13 +47085,16 @@ 2455265280,2455273471,US 2455273472,2455275519,AU 2455275520,2455279615,US -2455279616,2455281663,MO +2455279616,2455280127,MO +2455280128,2455280383,MY +2455280384,2455281663,MO 2455281664,2455285759,IN 2455285760,2455371775,US 2455371776,2455437311,GB 2455437312,2455830527,US 2455830528,2455896063,GB -2455896064,2456027135,US +2455896064,2455961599,US +2455961600,2456027135,JP 2456027136,2456092671,IT 2456092672,2456158207,GB 2456158208,2456223743,CZ @@ -45780,7 +47160,7 @@ 2459828224,2459860991,RU 2459860992,2459893759,ES 2459893760,2459959295,CH -2459959296,2460024831,US +2459959296,2460024831,JP 2460024832,2460090367,FI 2460090368,2460155903,GB 2460155904,2460221439,US @@ -46090,7 +47470,9 @@ 2486960128,2487025663,FR 2487025664,2487369727,US 2487369728,2487386111,PF -2487386112,2488205311,US +2487386112,2487418879,US +2487418880,2487549951,JP +2487549952,2488205311,US 2488205312,2488270847,GB 2488270848,2488336383,US 2488336384,2488401919,PL @@ -46132,10 +47514,9 @@ 2492989440,2493513727,US 2493513728,2493579263,SE 2493579264,2493644799,JP -2493644800,2493755391,US -2493755904,2493756415,US +2493644800,2493756415,US 2493756416,2493757439,CA -2493759488,2494103551,US +2493757440,2494103551,US 2494103552,2494169087,FR 2494169088,2494562303,US 2494562304,2494627839,GB @@ -46214,7 +47595,9 @@ 2500170752,2500170752,FI 2500170753,2500177935,US 2500177936,2500177943,PL -2500177944,2500188679,US +2500177944,2500180735,US +2500180736,2500180991,HR +2500180992,2500188679,US 2500188680,2500188687,CH 2500188688,2500196351,US 2500196352,2500198399,FI @@ -46339,12 +47722,14 @@ 2500728320,2500743215,US 2500743216,2500743223,GB 2500743224,2500984831,US -2500984832,2501001215,GB -2501001216,2501574655,US +2500984832,2501017599,GB +2501017600,2501574655,US 2501574656,2501640191,KZ -2501640192,2503016447,US -2503016448,2503081983,IL -2503081984,2503671807,US +2501640192,2502033407,US +2502033408,2502037503,LU +2502037504,2503016447,US +2503016448,2503147519,IL +2503147520,2503671807,US 2503671808,2503737343,NL 2503737344,2503868415,US 2503868416,2503876607,RU @@ -46367,7 +47752,9 @@ 2504482816,2504486911,ES 2504486912,2504491007,US 2504491008,2504499199,IT -2504499200,2504949759,US +2504499200,2504918642,US +2504918643,2504918643,IL +2504918644,2504949759,US 2504949760,2504982527,IL 2504982528,2505457663,US 2505457664,2505459711,IE @@ -46389,15 +47776,15 @@ 2505790464,2505791487,US 2505791488,2505792511,FR 2505792512,2505793535,US -2505793536,2505801727,ES -2505801728,2506293247,US +2505793536,2505803775,ES +2505803776,2506293247,US 2506293248,2506358783,CA 2506358784,2506359039,ES 2506359040,2506360831,US 2506360832,2506361087,ES 2506361088,2506401791,US -2506401792,2506402815,IT -2506402816,2506489855,US +2506401792,2506403839,IT +2506403840,2506489855,US 2506489856,2506498047,ES 2506498048,2506499071,FR 2506499072,2506506239,ES @@ -46486,7 +47873,39 @@ 2512912384,2512945151,HU 2512945152,2512977919,JO 2512977920,2513043455,DE -2513043456,2513108991,FR +2513043456,2513044691,FR +2513044692,2513044695,IT +2513044696,2513044703,FR +2513044704,2513044735,DE +2513044736,2513044751,FR +2513044752,2513044767,BE +2513044768,2513044799,ES +2513044800,2513044815,FR +2513044816,2513044831,IT +2513044832,2513045247,FR +2513045248,2513045255,CZ +2513045256,2513046591,FR +2513046592,2513046623,ES +2513046624,2513048047,FR +2513048048,2513048063,ES +2513048064,2513049375,FR +2513049376,2513049407,DE +2513049408,2513049551,FR +2513049552,2513049567,ES +2513049568,2513051487,FR +2513051488,2513051519,GB +2513051520,2513068207,FR +2513068208,2513068223,DE +2513068224,2513068287,NL +2513068288,2513070559,FR +2513070560,2513070591,ES +2513070592,2513070623,FR +2513070624,2513070655,ES +2513070656,2513079250,FR +2513079251,2513079254,ES +2513079255,2513081327,FR +2513081328,2513081343,ES +2513081344,2513108991,FR 2513108992,2513502207,DE 2513502208,2513567743,NO 2513567744,2513600511,GR @@ -46599,7 +48018,8 @@ 2524971008,2525036543,ES 2525036544,2525037567,IN 2525037568,2525038591,PK -2525038592,2525039615,HK +2525038592,2525039359,CN +2525039360,2525039615,HK 2525039616,2525040639,AU 2525040640,2525041151,BD 2525041152,2525041407,ID @@ -46730,23 +48150,31 @@ 2533097472,2533228543,US 2533228544,2533294079,PL 2533294080,2533359615,CN -2533359616,2533369855,UA -2533369856,2533371903,BG -2533371904,2533375999,UA +2533359616,2533367807,UA +2533367808,2533369855,BG +2533369856,2533375999,UA 2533376000,2533392383,HU 2533392384,2538602495,IT 2538602496,2538604967,FR 2538604968,2538604975,ES -2538604976,2538606027,FR +2538604976,2538605271,FR +2538605272,2538605279,ES +2538605280,2538606027,FR 2538606028,2538606031,DE 2538606032,2538606039,ES 2538606040,2538606043,FR 2538606044,2538606047,DE 2538606048,2538619359,FR 2538619360,2538619375,ES -2538619376,2538619903,FR +2538619376,2538619431,FR +2538619432,2538619435,DE +2538619436,2538619903,FR 2538619904,2538619911,ES -2538619912,2538634227,FR +2538619912,2538625527,FR +2538625528,2538625535,DE +2538625536,2538626687,FR +2538626688,2538626703,ES +2538626704,2538634227,FR 2538634228,2538634231,DE 2538634232,2538644015,FR 2538644016,2538644039,ES @@ -46762,7 +48190,9 @@ 2538646272,2538646399,BE 2538646400,2538646783,FR 2538646784,2538647039,CZ -2538647040,2538648591,FR +2538647040,2538648239,FR +2538648240,2538648255,DE +2538648256,2538648591,FR 2538648592,2538648623,BE 2538648624,2538649767,FR 2538649768,2538649775,DE @@ -46793,9 +48223,13 @@ 2538656516,2538656519,IT 2538656520,2538656959,FR 2538656960,2538656975,ES -2538656976,2538658347,FR +2538656976,2538657135,FR +2538657136,2538657139,RO +2538657140,2538658347,FR 2538658348,2538658351,DE -2538658352,2538664847,FR +2538658352,2538658623,FR +2538658624,2538658655,NL +2538658656,2538664847,FR 2538664848,2538664863,NL 2538664864,2538664895,DE 2538664896,2538668031,FR @@ -46842,8 +48276,10 @@ 2546039040,2547187711,US 2547187712,2547318783,GB 2547318784,2547515391,US -2547515392,2547548159,GB +2547523584,2547535871,GB +2547535872,2547548159,BG 2547548160,2547580927,NO +2547580928,2547646463,DE 2548039680,2548563967,GB 2548563968,2548826111,IR 2548826112,2548829695,AT @@ -46931,7 +48367,7 @@ 2549901312,2549903359,RU 2549903360,2549905407,ES 2549905408,2549907455,GB -2549907456,2549923839,DE +2549907456,2549923839,SE 2549923840,2549927935,BG 2549927936,2549929983,HR 2549929984,2549932031,DE @@ -47056,13 +48492,17 @@ 2570190848,2572681215,US 2572681216,2572746751,SE 2572746752,2572943359,US -2572943360,2572955647,DE +2572943360,2572951551,DE +2572951552,2572953599,US +2572953600,2572953855,BY +2572953856,2572955647,DE 2572955648,2572959743,BR 2572959744,2572968447,DE 2572968448,2572968959,CZ 2572968960,2572975103,BR -2572975104,2572976127,DE -2572976128,2572989439,NL +2572975104,2572975615,DE +2572975616,2572975871,SE +2572975872,2572989439,NL 2572989440,2572989951,GR 2572989952,2572991487,NL 2572991488,2573000703,BR @@ -47112,7 +48552,8 @@ 2584739904,2584740095,ZA 2584740096,2584740351,US 2584740352,2584740415,AU -2584740416,2584740607,ZA +2584740416,2584740479,DE +2584740480,2584740607,ZA 2584740608,2584740863,US 2584740864,2584740927,AU 2584740928,2584741119,ZA @@ -47124,7 +48565,8 @@ 2584741952,2584742143,ZA 2584742144,2584742399,US 2584742400,2584742463,AU -2584742464,2584742655,ZA +2584742464,2584742527,DE +2584742528,2584742655,ZA 2584742656,2584742911,US 2584742912,2584742975,KR 2584742976,2584743167,ZA @@ -47136,7 +48578,8 @@ 2584744000,2584744191,ZA 2584744192,2584744447,US 2584744448,2584744511,AU -2584744512,2584744703,ZA +2584744512,2584744575,ZA +2584744576,2584744703,DE 2584744704,2584744959,US 2584744960,2584745023,AU 2584745024,2584745215,ZA @@ -47249,10 +48692,8 @@ 2584763968,2584764159,ZA 2584764160,2584764415,US 2584764416,2584764671,ZA -2584764672,2584768511,US -2584768512,2584770559,ZA -2584770560,2584775423,US -2584775424,2584775679,ZA +2584764672,2584775423,US +2584775424,2584775679,KE 2584775680,2585001983,US 2585001984,2585067519,CA 2585067520,2585788415,US @@ -47263,7 +48704,9 @@ 2586484736,2586486783,GB 2586486784,2586510335,US 2586510336,2586511359,ES -2586511360,2586566655,US +2586511360,2586544127,US +2586544128,2586546175,SE +2586546176,2586566655,US 2586566656,2586566687,FR 2586566688,2586610431,US 2586610432,2586610687,GB @@ -47282,7 +48725,9 @@ 2586650880,2586651135,NL 2586651136,2586714879,US 2586714880,2586715135,NL -2586715136,2586733567,US +2586715136,2586716159,US +2586716160,2586716671,ES +2586716672,2586733567,US 2586733568,2586733823,LT 2586733824,2586734591,US 2586734592,2586735615,LT @@ -47294,8 +48739,10 @@ 2586804224,2586804479,ES 2586804480,2586828799,US 2586828800,2586829055,CH -2586829056,2586870783,US -2586870784,2586875903,ES +2586829056,2586869759,US +2586869760,2586870015,ES +2586870016,2586870271,US +2586870272,2586875903,ES 2586875904,2586876415,US 2586876416,2586876671,ES 2586876672,2586876927,US @@ -47313,7 +48760,9 @@ 2587018672,2587018687,IE 2587018688,2587019263,US 2587019264,2587019775,IE -2587019776,2587021823,US +2587019776,2587020287,US +2587020288,2587020799,IE +2587020800,2587021823,US 2587021824,2587022335,IE 2587022336,2587066879,US 2587066880,2587067135,GB @@ -47323,7 +48772,9 @@ 2587068416,2587068479,GB 2587068480,2587071759,US 2587071760,2587071775,GB -2587071776,2587131903,US +2587071776,2587128522,US +2587128523,2587128523,TR +2587128524,2587131903,US 2587131904,2587132159,FR 2587132160,2587197439,US 2587197440,2587197695,ES @@ -47331,7 +48782,9 @@ 2587240390,2587240390,FR 2587240391,2587249417,US 2587249418,2587249418,FR -2587249419,2587394047,US +2587249419,2587361791,US +2587361792,2587362047,MD +2587362048,2587394047,US 2587394048,2587394303,ES 2587394304,2587394815,US 2587394816,2587395071,ES @@ -47355,10 +48808,10 @@ 2587496448,2587508735,US 2587508736,2587525119,GB 2587525120,2587542527,US -2587542528,2587544063,ES -2587544064,2587545599,US -2587545600,2587546623,ES -2587546624,2587582463,US +2587542528,2587544575,ES +2587544576,2587545599,US +2587545600,2587547647,ES +2587547648,2587582463,US 2587582464,2587586559,NL 2587586560,2587592703,US 2587592704,2587594751,GB @@ -47394,6 +48847,7 @@ 2588042240,2588043263,SS 2588043264,2588044287,AO 2588044288,2588045311,LS +2588045312,2588046335,ZA 2588046336,2588047359,TD 2588047360,2588049407,MW 2588049408,2588053503,BJ @@ -47502,6 +48956,7 @@ 2590507008,2591031295,TN 2591031296,2591096831,GA 2591096832,2591162367,NG +2591162368,2591293439,ZA 2591293440,2591326207,GA 2591326208,2591358975,AO 2591358976,2591375359,GH @@ -47545,12 +49000,10 @@ 2592026624,2592026879,US 2592026880,2592027391,ZA 2592027392,2592027647,GB -2592027648,2592028159,US -2592028160,2592028415,CA -2592028416,2592028671,US +2592027648,2592028671,US 2592028672,2592028799,NG 2592028800,2592028927,KE -2592028928,2592029183,ZA +2592028928,2592029183,US 2592029184,2592029311,CI 2592029312,2592030207,ZA 2592030208,2592030335,GH @@ -47608,6 +49061,7 @@ 2605187072,2605252607,US 2605252608,2605318143,AT 2605318144,2606301183,US +2606301184,2606366719,AO 2606366720,2606448649,US 2606448650,2606448651,EU 2606448652,2606467071,US @@ -47682,7 +49136,9 @@ 2616885530,2616918015,DE 2616983552,2617049087,US 2617049088,2617114623,IT -2617114624,2617123839,US +2617114880,2617115135,US +2617115136,2617115647,CA +2617115648,2617123839,US 2617123840,2617124095,DE 2617124096,2617124863,US 2617124864,2617126911,NL @@ -47721,7 +49177,7 @@ 2617146880,2617147135,DE 2617147136,2617147391,AO 2617147392,2617149439,US -2617151488,2617155583,CA +2617149440,2617155583,CA 2617155584,2617163775,US 2617163776,2617164031,SK 2617164032,2617164287,MC @@ -47858,9 +49314,7 @@ 2625961984,2626027519,LU 2626027520,2626093055,US 2626093056,2626158591,CH -2626158592,2626224127,US -2626224128,2626289663,CZ -2626289664,2626879487,US +2626158592,2626879487,US 2626879488,2626945023,KR 2626945024,2627010559,IT 2627010560,2627076095,NZ @@ -47887,7 +49341,15 @@ 2637733152,2637733183,JP 2637733184,2637733375,US 2637733376,2637733407,SG -2637733408,2638020607,US +2637733408,2637997055,US +2637997056,2637997311,AU +2637997312,2637998591,US +2637998592,2637998847,AU +2637998848,2638000127,US +2638000128,2638000255,AU +2638000256,2638002175,US +2638002176,2638002687,AU +2638002688,2638020607,US 2638020608,2638086143,CN 2638086144,2638151679,US 2638151680,2639331327,JP @@ -48031,7 +49493,15 @@ 2655059968,2655125503,US 2655125504,2655191039,PL 2655191040,2655256575,EU -2655256576,2655715327,US +2655256576,2655323135,US +2655323136,2655323647,CA +2655323648,2655324671,US +2655324672,2655324799,CA +2655324800,2655325695,US +2655325696,2655325823,CA +2655325824,2655326207,US +2655326208,2655326463,CA +2655326464,2655715327,US 2655715328,2655780863,PL 2655780864,2656387071,US 2656387072,2656403455,CA @@ -48104,7 +49574,11 @@ 2662203392,2662662143,GB 2662662144,2662670335,KG 2662670336,2662674431,AZ -2662674432,2662686719,DE +2662674432,2662677087,DE +2662677088,2662677279,US +2662677280,2662677375,DE +2662677376,2662678527,US +2662678528,2662686719,DE 2662686720,2662694911,CH 2662694912,2662727679,KG 2662727680,2662793215,HK @@ -48121,7 +49595,11 @@ 2665086976,2665152511,GB 2665152512,2665218047,US 2665218048,2665283583,CH -2665283584,2665414655,US +2665283584,2665359359,US +2665359360,2665359871,MF +2665359872,2665375743,US +2665375744,2665377791,CA +2665377792,2665414655,US 2665414656,2665480191,GB 2665480192,2665545727,US 2665545728,2665611263,DE @@ -48284,11 +49762,17 @@ 2675245056,2675310591,NZ 2675310592,2675574239,US 2675574240,2675574271,IT -2675574272,2675577999,US -2675578000,2675578015,ES -2675578016,2675589119,US +2675574272,2675576703,US +2675576704,2675576711,JO +2675576712,2675578527,US +2675578528,2675578535,CO +2675578536,2675580063,US +2675580064,2675580095,AE +2675580096,2675589119,US 2675589120,2675605503,DE -2675605504,2675835135,US +2675605504,2675606271,US +2675606272,2675606527,IT +2675606528,2675835135,US 2675835136,2675835391,CA 2675835392,2675965951,US 2675965952,2676031487,CA @@ -48547,7 +50031,9 @@ 2689594112,2689594879,GB 2689594880,2689597439,US 2689597440,2689662975,IT -2689662976,2689802751,US +2689662976,2689801904,US +2689801905,2689801905,DE +2689801906,2689802751,US 2689802752,2689803263,TR 2689803264,2689803519,GB 2689803520,2689804799,US @@ -48605,17 +50091,17 @@ 2698903552,2698969087,AU 2698969088,2699034623,CA 2699034624,2699165695,AO +2699165696,2699198463,NG 2699231232,2699296767,US 2699296768,2699362303,FR 2699362304,2699624447,US 2699624448,2699689983,JP 2699755520,2700935167,JP 2700935168,2701066239,US -2701066240,2701074431,ZA -2701074432,2701099007,BG -2701099008,2701123583,ZA -2701123584,2701131775,BG -2701131776,2701139967,HN +2701066240,2701131775,BG +2701131776,2701132543,HN +2701132544,2701132559,CR +2701132560,2701139967,HN 2701139968,2701148159,NI 2701148160,2701149183,AR 2701149184,2701150207,HN @@ -48650,7 +50136,9 @@ 2702508032,2702573567,US 2702573568,2702581759,AR 2702581760,2702585855,VE -2702585856,2702587903,CW +2702585856,2702586111,CW +2702586112,2702586367,PA +2702586368,2702587903,CW 2702587904,2702589951,BR 2702589952,2702606335,GF 2702606336,2702639103,BO @@ -48695,7 +50183,9 @@ 2705522688,2705588223,ES 2705588224,2705596159,US 2705596160,2705596415,CA -2705596416,2705691647,US +2705596416,2705688319,US +2705688320,2705688575,DE +2705688576,2705691647,US 2705691648,2705692671,GB 2705692672,2705710079,US 2705710080,2705711103,IN @@ -48767,7 +50257,9 @@ 2714370800,2714370815,PH 2714370816,2714370895,US 2714370896,2714370911,CN -2714370912,2714386431,US +2714370912,2714373127,US +2714373128,2714373128,SG +2714373129,2714386431,US 2714386432,2714402815,JP 2714402816,2714697727,US 2714697728,2714763263,CN @@ -48887,7 +50379,7 @@ 2731792384,2731795455,US 2731795456,2731796479,DE 2731796480,2731797503,CA -2731797504,2731800575,US +2731798528,2731800575,US 2731800576,2731801599,CA 2731801600,2731804671,US 2731804672,2731805695,CA @@ -48937,8 +50429,8 @@ 2732201984,2732203007,VG 2732203008,2732204031,US 2732204032,2732206079,CA -2732206080,2732220159,US -2732220160,2732220400,CA +2732206080,2732220287,US +2732220288,2732220400,CA 2732220401,2732220401,US 2732220402,2732220415,CA 2732220416,2732227583,US @@ -49183,13 +50675,7 @@ 2734633984,2734635007,CA 2734635008,2734649343,US 2734649344,2734650367,CA -2734650368,2734655927,US -2734655928,2734655935,GB -2734655936,2734656127,US -2734656128,2734656255,GB -2734656256,2734656383,US -2734656384,2734656511,GB -2734656512,2734657535,US +2734650368,2734657535,US 2734657536,2734658559,VG 2734658560,2734659583,CA 2734659584,2734665727,US @@ -49217,11 +50703,12 @@ 2736848896,2736914431,US 2736914432,2736979967,NO 2736979968,2737438719,US -2737438720,2737602559,JP +2737438720,2737594367,JP +2737594368,2737602559,US 2737602560,2737610751,SG 2737610752,2737767423,JP 2737767424,2737768447,CN -2737768448,2737769471,AU +2737768448,2737769471,SG 2737769472,2737770495,IN 2737770496,2737771263,AU 2737771264,2737771519,JP @@ -49260,7 +50747,9 @@ 2737813504,2737815551,NZ 2737815552,2737816575,MY 2737816576,2737817599,AU -2737817600,2737818623,MY +2737817600,2737818111,MY +2737818112,2737818367,AU +2737818368,2737818623,MY 2737818624,2737819647,NZ 2737819648,2737821695,IN 2737821696,2737822719,AU @@ -49296,7 +50785,8 @@ 2738214912,2738215935,HK 2738215936,2738216959,CN 2738216960,2738217983,HK -2738217984,2738220031,AU +2738217984,2738219007,AU +2738219008,2738220031,NZ 2738220032,2738221055,PK 2738221056,2738222079,CN 2738222080,2738223103,MO @@ -49365,7 +50855,9 @@ 2750349312,2750414847,KR 2750414848,2750692863,US 2750692864,2750693375,EU -2750693376,2750873599,US +2750693376,2750739967,US +2750739968,2750740223,CN +2750740224,2750873599,US 2750873600,2750939135,CL 2750939136,2751070207,US 2751070208,2751135743,CL @@ -49593,7 +51085,9 @@ 2778333184,2778398719,CA 2778398720,2779054079,US 2779054080,2779119615,ZA -2779119616,2779906047,US +2779119616,2779316223,US +2779316224,2779381759,RE +2779381760,2779906047,US 2779906048,2779971583,CA 2779971584,2780037119,US 2780037120,2780102655,ZA @@ -49628,7 +51122,10 @@ 2780934912,2780935167,GB 2780935168,2780954623,US 2780954624,2781020159,KR -2781020160,2781478911,US +2781020160,2781206527,US +2781206528,2781207551,GB +2781207552,2781208575,DE +2781208576,2781478911,US 2781478912,2781544447,HK 2781544448,2781629951,US 2781629952,2781630207,EU @@ -49654,7 +51151,11 @@ 2783003648,2783003903,SE 2783003904,2783004159,US 2783004160,2783004671,CH -2783004672,2783010815,US +2783004672,2783005439,DE +2783005440,2783005695,US +2783005696,2783006719,FR +2783006720,2783007743,GB +2783007744,2783010815,US 2783010816,2783011327,HK 2783011328,2783011583,AU 2783011584,2783011839,US @@ -49674,10 +51175,10 @@ 2783399936,2783404031,FR 2783404032,2783408127,NL 2783408128,2783412223,NO -2783412224,2783416319,SC +2783412224,2783416319,SE 2783416320,2783420415,RU 2783420416,2783424511,EE -2783424512,2783428607,SC +2783424512,2783428607,JP 2783428608,2783436799,US 2783436800,2783440895,IT 2783440896,2783444991,IN @@ -49802,13 +51303,18 @@ 2809282653,2809282653,US 2809282654,2809286975,CA 2809286976,2809286991,US -2809286992,2809291823,CA +2809286992,2809291732,CA +2809291733,2809291733,US +2809291734,2809291823,CA 2809291824,2809291824,US 2809291825,2809291891,CA 2809291892,2809291892,US 2809291893,2809308599,CA 2809308600,2809308607,US -2809308608,2809331711,CA +2809308608,2809321007,CA +2809321008,2809321015,US +2809321016,2809323519,CA +2809323520,2809331711,FR 2809331712,2809397247,US 2809397248,2809462783,UY 2809462784,2809855999,US @@ -49828,7 +51334,9 @@ 2811559936,2811625471,CH 2811625472,2812084223,US 2812084224,2812149759,BO -2812149760,2812293119,US +2812149760,2812291071,US +2812291072,2812292095,DE +2812292096,2812293119,US 2812293120,2812295167,IN 2812295168,2812297215,GB 2812297216,2812411903,US @@ -49856,7 +51364,9 @@ 2815229952,2815295487,ID 2815295488,2815986943,US 2815986944,2815987199,GB -2815987200,2816159743,US +2815987200,2815988863,US +2815988864,2815988895,GB +2815988896,2816159743,US 2816159744,2816159999,IN 2816160000,2816262143,US 2816262144,2816263167,IE @@ -49871,7 +51381,8 @@ 2816272384,2816273407,JP 2816273408,2816274431,IN 2816274432,2816275455,AU -2816275456,2816278527,SG +2816275456,2816276479,CN +2816276480,2816278527,SG 2816278528,2816671743,US 2816671744,2816737279,CA 2816737280,2817059071,US @@ -50023,13 +51534,21 @@ 2834825216,2834956287,KR 2834956288,2835087359,US 2835087360,2835152895,AU +2835152896,2835161087,LR +2835161088,2835169279,ZW +2835169280,2835173375,ZA +2835177472,2835181567,DZ +2835181568,2835183615,NG +2835183616,2835185663,ZA +2835185664,2835202047,RE 2835202048,2835206143,ZA 2835206144,2835208191,NG 2835208192,2835210239,ZA 2835210240,2835218431,MW 2835218432,2835283967,US 2835283968,2835349503,MX -2835349504,2837446655,US +2835349504,2835480575,ZA +2835480576,2837446655,US 2837446656,2837839871,CH 2837839872,2837905407,US 2837905408,2837970943,CH @@ -50042,15 +51561,19 @@ 2838757376,2838822911,CH 2838822912,2838865599,US 2838865600,2838865615,KR -2838865616,2838881055,US +2838865616,2838871295,US +2838871296,2838871311,CA +2838871312,2838881055,US 2838881056,2838881087,AT -2838881088,2838904831,US +2838881088,2838887871,US +2838887872,2838887887,EC +2838887888,2838904831,US 2838904832,2838921215,CA -2838921216,2838938991,US +2838921216,2838930495,US +2838930496,2838930511,HK +2838930512,2838938991,US 2838938992,2838939007,AU -2838939008,2838939615,US -2838939616,2838939647,IE -2838939648,2838942527,US +2838939008,2838942527,US 2838942528,2838942559,AU 2838942560,2838943263,US 2838943264,2838943279,GB @@ -50058,17 +51581,29 @@ 2838946432,2838946447,CA 2838946448,2838946735,US 2838946736,2838946751,CA -2838946752,2839085055,US +2838946752,2838958927,US +2838958928,2838958943,AF +2838958944,2838962111,US +2838962112,2838962127,BR +2838962128,2838962527,US +2838962528,2838962543,GB +2838962544,2838964047,US +2838964048,2838964063,PE +2838964064,2839085055,US 2839085056,2839117823,MX -2839117824,2839150591,US +2839117824,2839150591,BR 2839150592,2839543807,CH 2839543808,2843803647,US 2843803648,2843869183,ZA 2843869184,2844524543,US 2844524544,2844590079,KR -2844590080,2844884991,US +2844590080,2844783615,US +2844783616,2844784639,EU +2844784640,2844884991,US 2844884992,2844885247,FR -2844885248,2845704191,US +2844885248,2844902655,US +2844902656,2844902911,AP +2844902912,2845704191,US 2845704192,2845755391,CU 2845755392,2845755647,EU 2845755648,2845769727,CU @@ -50084,7 +51619,17 @@ 2848587776,2848653311,ZA 2848653312,2848980991,US 2848980992,2850029567,KR -2850029568,2851995647,US +2850029568,2851012607,US +2851012608,2851013631,TZ +2851013632,2851015679,ZA +2851015680,2851016703,CV +2851016704,2851017727,NG +2851017728,2851018751,SC +2851018752,2851019775,ZW +2851019776,2851020799,ZA +2851020800,2851021823,AO +2851021824,2851022847,EG +2851078144,2851995647,US 2852061184,2852062207,ZA 2852062208,2852063231,CM 2852063232,2852064255,KE @@ -50107,7 +51652,7 @@ 2852083712,2852084735,AO 2852084736,2852085759,TN 2852085760,2852086783,KE -2852086784,2852087807,SD +2852086784,2852087807,SS 2852087808,2852088831,KE 2852088832,2852089855,LY 2852089856,2852090879,TZ @@ -50128,6 +51673,16 @@ 2852107264,2852108287,NG 2852108288,2852109311,TZ 2852109312,2852110335,CD +2852110336,2852112383,ZA +2852112384,2852113407,KE +2852113408,2852114431,CD +2852114432,2852115455,NG +2852115456,2852116479,KE +2852116480,2852118527,ZA +2852118528,2852119551,NG +2852119552,2852121599,ZA +2852121600,2852122623,NG +2852122624,2852126719,ZA 2852126720,2853306367,US 2853306368,2853371903,CL 2853371904,2853765119,US @@ -50195,51 +51750,161 @@ 2867593216,2867724287,CH 2867855360,2868117503,US 2868379648,2868380159,IN -2868380160,2868382719,US +2868380160,2868380671,BR +2868380672,2868380927,US +2868380928,2868381055,MX +2868381056,2868381183,IN +2868381184,2868381695,MX +2868381696,2868382463,US +2868382464,2868382719,CL 2868382720,2868383231,IN -2868383232,2868390399,US +2868383232,2868383743,US +2868383744,2868384255,PH +2868384256,2868384767,BR +2868384768,2868390143,US +2868390144,2868390399,GB 2868390400,2868390911,IN 2868390912,2868391423,US 2868391424,2868391935,IN -2868391936,2868414975,US +2868391936,2868399615,US +2868399616,2868399871,BR +2868399872,2868400127,US +2868400128,2868400639,BR +2868400640,2868401151,US +2868401152,2868401663,BR +2868401664,2868401919,PH +2868401920,2868402175,AR +2868402176,2868410367,US +2868410368,2868410879,BR +2868410880,2868411391,AR +2868411392,2868411903,PL +2868411904,2868414719,US +2868414720,2868414975,MU 2868414976,2868415487,IN -2868415488,2868420607,US +2868415488,2868415999,US +2868416000,2868416255,AU +2868416256,2868416767,US +2868416768,2868417023,PL +2868417024,2868417535,JP +2868417536,2868418815,US +2868418816,2868419071,TR +2868419072,2868419327,PH +2868419328,2868419583,IN +2868419584,2868420607,PH 2868420608,2868423679,IN 2868423680,2868428287,US 2868428288,2868428799,IN -2868428800,2868578815,US +2868428800,2868432895,US +2868432896,2868433407,AR +2868433408,2868437503,US +2868437504,2868437759,BR +2868437760,2868576255,US +2868576256,2868578303,IN +2868578304,2868578815,BR 2868578816,2868579327,IN 2868579328,2868581375,US 2868581376,2868581887,IN -2868581888,2868586495,US +2868581888,2868582143,US +2868582144,2868582399,RO +2868582400,2868585471,US +2868585472,2868585727,GB +2868585728,2868585983,PH +2868585984,2868586495,GB 2868586496,2868588543,IN -2868588544,2868591615,US -2868591616,2868592127,IN -2868592128,2868599295,US +2868588544,2868589055,PH +2868589056,2868591615,US +2868591616,2868592383,IN +2868592384,2868592447,DE +2868592448,2868592511,IN +2868592512,2868592639,US +2868592640,2868593663,NL +2868593664,2868593919,IN +2868593920,2868595711,US +2868595712,2868596223,FR +2868596224,2868596735,ES +2868596736,2868597759,DE +2868597760,2868598271,PH +2868598272,2868599295,US 2868599296,2868599807,IN -2868599808,2868604415,US +2868599808,2868600319,FR +2868600320,2868600831,AU +2868600832,2868601343,FR +2868601344,2868601855,CR +2868601856,2868602367,ES +2868602368,2868602623,US +2868602624,2868603007,ES +2868603008,2868603071,IN +2868603072,2868603135,ES +2868603136,2868603391,PH +2868603392,2868603647,US +2868603648,2868604159,DE +2868604160,2868604415,PH 2868604416,2868604927,IN -2868604928,2868612607,US +2868604928,2868605183,PH +2868605184,2868605951,SE +2868605952,2868606207,PL +2868606208,2868609023,ES +2868609024,2868610047,AU +2868610048,2868611327,US +2868611328,2868611583,AU +2868611584,2868611839,US +2868611840,2868612095,IN +2868612096,2868612607,US 2868612608,2868613119,IN -2868613120,2868614399,US +2868613120,2868613631,US +2868613632,2868614143,PH +2868614144,2868614399,US 2868614400,2868615167,IN 2868615168,2868615679,US 2868615680,2868616703,IN -2868616704,2868619775,US +2868616704,2868617215,US +2868617216,2868617471,PH +2868617472,2868617727,AU +2868617728,2868618239,US +2868618240,2868618367,PH +2868618368,2868618431,US +2868618432,2868618751,PH +2868618752,2868619263,US +2868619264,2868619775,PH 2868619776,2868620287,IN 2868620288,2868620799,US -2868620800,2868621311,IN -2868621312,2868658175,US -2868658176,2868658431,GB -2868658432,2868660223,US +2868620800,2868621503,IN +2868621504,2868621567,ES +2868621568,2868621823,ID +2868621824,2868621855,IN +2868621856,2868621919,US +2868621920,2868621951,IN +2868621952,2868622335,US +2868622336,2868622847,DE +2868622848,2868623359,US +2868623360,2868623871,PH +2868623872,2868624383,IN +2868624384,2868625407,ES +2868625408,2868649983,US +2868649984,2868651263,DE +2868651264,2868651391,US +2868651392,2868652031,DE +2868652032,2868658175,US +2868658176,2868660223,GB 2868660224,2868660479,EU -2868660480,2868662271,US +2868660480,2868662271,GB 2868662272,2868662527,EU -2868662528,2868674336,US +2868662528,2868664319,DE +2868664320,2868667903,GB +2868667904,2868668927,US +2868668928,2868669439,GB +2868669440,2868669951,US +2868669952,2868670975,GB +2868670976,2868671487,US +2868671488,2868674336,GB 2868674337,2868674337,SE -2868674338,2868682752,US +2868674338,2868674559,GB +2868674560,2868682752,PH 2868682753,2868682753,AP -2868682754,2868772863,US +2868682754,2868689151,PH +2868689152,2868689663,AU +2868689664,2868690943,PH +2868690944,2868772863,US 2868838400,2868903935,BE 2868903936,2869035007,SG 2869035008,2869166079,JP @@ -50333,10 +51998,77 @@ 2885681152,2886667007,US 2886667008,2886667263,DE 2886667264,2886729727,US -2887778304,2890414079,US -2890414080,2890415103,ZA -2890415104,2890924031,US -2894069760,2894921727,US +2887778304,2891034623,US +2891034624,2891036671,CA +2891036672,2891120639,US +2891251712,2891272191,US +2891272192,2891274239,CA +2891274240,2891282431,US +2891282432,2891283455,PR +2891283456,2891284479,CA +2891284480,2891364351,US +2891364352,2891374591,CA +2891374592,2891378687,US +2891378688,2891380735,CA +2891380736,2891403263,US +2891403264,2891407359,CA +2891407360,2891796479,US +2891796480,2891800575,CA +2891800576,2891807743,US +2891807744,2891808767,CA +2891808768,2891841535,US +2891841536,2891842303,SE +2891842304,2891843327,GB +2891843328,2891843839,SE +2891843840,2891844095,GB +2891844096,2891845119,FR +2891845120,2891845631,DE +2891845632,2891848959,US +2891848960,2891849471,BN +2891849472,2891857919,US +2891857920,2891858175,ES +2891858176,2891858431,TR +2891858432,2891858687,RO +2891858688,2891871231,US +2891871232,2891871487,CA +2891871488,2891974655,US +2891974656,2891976703,CA +2891976704,2891982847,US +2891982848,2891984895,CA +2891984896,2892021759,US +2892021760,2892038143,CA +2892038144,2892040191,US +2892040192,2892042239,CA +2892042240,2892050431,US +2892050432,2892052479,CA +2892052480,2892053503,US +2892053504,2892054527,CA +2892054528,2892068863,US +2892068864,2892069887,CA +2892069888,2892070911,US +2892070912,2892103679,CA +2892103680,2892140543,US +2892140544,2892144895,CA +2892144896,2892145407,US +2892145408,2892145663,CA +2892145664,2892171263,US +2892171264,2892172287,CA +2892172288,2892174335,US +2892174336,2892177407,CA +2892177408,2892369919,US +2892369920,2892374015,CA +2892374016,2892423167,US +2892423168,2892424191,VI +2892424192,2892425215,CA +2892425216,2892443647,US +2892443648,2892447743,CA +2892447744,2892464127,VG +2892464128,2892496895,CA +2892496896,2892906495,US +2892906496,2892910591,CA +2892910592,2893676543,US +2893676544,2893807615,CA +2893807616,2894921727,US 2894921728,2895118335,GB 2895118336,2895301887,US 2895301888,2895302143,AR @@ -50345,7 +52077,9 @@ 2895708160,2896035839,US 2896035840,2896101375,DE 2896101376,2896166911,GB -2896166912,2896429280,US +2896166912,2896301499,US +2896301500,2896301500,DE +2896301501,2896429280,US 2896429281,2896429281,CA 2896429282,2897018879,US 2897018880,2897149951,DE @@ -50366,7 +52100,9 @@ 2899574784,2899902463,GB 2899902464,2899967999,US 2899968000,2900099071,CA -2900099072,2902458367,US +2900099072,2901740455,US +2901740456,2901740463,CA +2901740464,2902458367,US 2902458368,2902462463,A1 2902462464,2902476543,US 2902476544,2902476799,CW @@ -50392,15 +52128,9 @@ 2905346816,2905347071,JP 2905347072,2905348863,US 2905348864,2905349119,NZ -2905349120,2905379071,US -2905379072,2905379327,CA -2905379328,2905380607,US -2905380608,2905380863,CA -2905380864,2905387519,US +2905349120,2905387519,US 2905387520,2905388031,CA -2905388032,2905394175,US -2905394176,2905394687,CA -2905394688,2905401855,US +2905388032,2905401855,US 2905401856,2905402111,CA 2905402112,2905405679,US 2905405680,2905405687,CN @@ -50429,7 +52159,8 @@ 2915250176,2915254271,CA 2915254272,2915516415,US 2915516416,2915516671,NL -2915516672,2915517183,US +2915516672,2915516927,CA +2915516928,2915517183,US 2915517184,2915517439,RU 2915517440,2915518463,DK 2915518464,2915520511,GB @@ -50637,8 +52368,8 @@ 2918621184,2918653951,US 2918653952,2918662143,CA 2918662144,2918678527,US -2918678528,2918679039,CA -2918679040,2918699007,US +2918678528,2918686719,CA +2918686720,2918699007,US 2918699008,2918703103,CA 2918703104,2918760447,US 2918760448,2918776831,CA @@ -50729,9 +52460,7 @@ 2926575616,2927099903,CA 2927099904,2927242751,US 2927242752,2927243263,AE -2927243264,2927254783,US -2927254784,2927255039,AE -2927255040,2927581183,US +2927243264,2927581183,US 2927581184,2927581439,SG 2927581440,2927981567,US 2927981568,2927982591,SG @@ -50759,9 +52488,7 @@ 2928336896,2928455679,US 2928455680,2928459775,CA 2928459776,2928541695,US -2928541696,2928570671,CA -2928570672,2928570687,FR -2928570688,2928607231,CA +2928541696,2928607231,CA 2928607232,2928633199,US 2928633200,2928633215,CA 2928633216,2936012799,US @@ -50815,7 +52542,9 @@ 2942304256,2942566399,TW 2942566400,2942599167,KH 2942599168,2942608383,IN -2942608384,2942609407,HK +2942608384,2942608639,HK +2942608640,2942608895,US +2942608896,2942609407,HK 2942609408,2942615551,IN 2942615552,2942619647,HK 2942619648,2942631935,JP @@ -51001,7 +52730,9 @@ 2954830524,2954830527,DE 2954830528,2954830735,FR 2954830736,2954830751,NL -2954830752,2954831247,FR +2954830752,2954830879,FR +2954830880,2954830887,BE +2954830888,2954831247,FR 2954831248,2954831251,ES 2954831252,2954831807,FR 2954831808,2954831823,ES @@ -51028,13 +52759,17 @@ 2954834984,2954834991,IT 2954834992,2954835039,FR 2954835040,2954835043,DE -2954835044,2954835295,FR +2954835044,2954835067,FR +2954835068,2954835071,FI +2954835072,2954835295,FR 2954835296,2954835299,ES 2954835300,2954835443,FR 2954835444,2954835447,ES 2954835448,2954835451,FR 2954835452,2954835455,ES -2954835456,2954837071,FR +2954835456,2954835619,FR +2954835620,2954835620,ES +2954835621,2954837071,FR 2954837072,2954837075,ES 2954837076,2954837615,FR 2954837616,2954837619,IT @@ -51113,7 +52848,9 @@ 2954859872,2954859903,ES 2954859904,2954861623,FR 2954861624,2954861631,IT -2954861632,2954861875,FR +2954861632,2954861867,FR +2954861868,2954861871,CZ +2954861872,2954861875,FR 2954861876,2954861879,CH 2954861880,2954862415,FR 2954862416,2954862419,ES @@ -51126,7 +52863,9 @@ 2954870844,2954870847,ES 2954870848,2954870903,FR 2954870904,2954870907,ES -2954870908,2954875879,FR +2954870908,2954874431,FR +2954874432,2954874447,GB +2954874448,2954875879,FR 2954875880,2954875883,ES 2954875884,2954876871,FR 2954876872,2954876875,ES @@ -51557,7 +53296,7 @@ 2960160768,2960162815,UA 2960162816,2960175103,RU 2960175104,2960179199,SK -2960179200,2960187391,EU +2960179200,2960187391,IR 2960187392,2960211967,RU 2960220160,2960224255,RO 2960224256,2960228351,RU @@ -51694,11 +53433,11 @@ 2960916480,2960924671,UA 2960932864,2960933887,IR 2960933888,2960934655,GB -2960934656,2960934911,DE +2960934656,2960934911,NL 2960934912,2960941055,RO 2960941056,2960943103,AM 2960943104,2960945151,RO -2960945152,2960945663,LI +2960945152,2960945663,GB 2960945664,2960949247,RU 2960949248,2960951295,UA 2960951296,2960951807,RU @@ -51734,10 +53473,11 @@ 2961057792,2961061887,RU 2961061888,2961062911,PL 2961062912,2961063935,UA -2961063936,2961072127,DE +2961063936,2961072127,NL 2961072128,2961088511,UA 2961088512,2961088767,SE -2961088768,2961089535,UA +2961088768,2961089023,RU +2961089024,2961089535,UA 2961089536,2961090559,KG 2961090560,2961096703,RO 2961096704,2961097471,GB @@ -51800,7 +53540,9 @@ 2967435008,2967441407,RO 2967441408,2967445503,MD 2967445504,2967446015,GB -2967446016,2967470079,RO +2967446016,2967446783,RO +2967446784,2967447039,DE +2967447040,2967470079,RO 2967470080,2967601151,SA 2967601152,2967633919,HU 2967633920,2967666687,RU @@ -52068,7 +53810,9 @@ 2988444672,2988444679,ES 2988444680,2988446719,FR 2988446720,2988446723,DE -2988446724,2988448607,FR +2988446724,2988446871,FR +2988446872,2988446872,IE +2988446873,2988448607,FR 2988448608,2988448639,ES 2988448640,2988448799,FR 2988448800,2988448815,ES @@ -52088,7 +53832,9 @@ 2988459688,2988459691,PL 2988459692,2988459863,FR 2988459864,2988459867,ES -2988459868,2988460575,FR +2988459868,2988460063,FR +2988460064,2988460095,PT +2988460096,2988460575,FR 2988460576,2988460591,PT 2988460592,2988460651,FR 2988460652,2988460655,ES @@ -52107,9 +53853,7 @@ 2988464624,2988464627,ES 2988464628,2988465215,FR 2988465216,2988465219,ES -2988465220,2988465279,FR -2988465280,2988465295,DE -2988465296,2988465559,FR +2988465220,2988465559,FR 2988465560,2988465563,ES 2988465564,2988476415,FR 2988476416,2988478463,IT @@ -52153,11 +53897,15 @@ 2988487236,2988487239,NL 2988487240,2988487303,FR 2988487304,2988487311,NL -2988487312,2988487883,FR +2988487312,2988487407,FR +2988487408,2988487415,IT +2988487416,2988487883,FR 2988487884,2988487887,NL 2988487888,2988487919,FR 2988487920,2988487923,DE -2988487924,2988489479,FR +2988487924,2988488971,FR +2988488972,2988488975,MT +2988488976,2988489479,FR 2988489480,2988489483,DE 2988489484,2988489675,FR 2988489676,2988489679,ES @@ -52169,7 +53917,9 @@ 2988490688,2988490719,ES 2988490720,2988491151,FR 2988491152,2988491155,NL -2988491156,2988492799,FR +2988491156,2988491251,FR +2988491252,2988491252,ES +2988491253,2988492799,FR 2988492800,2988494847,PL 2988494848,2988499535,FR 2988499536,2988499551,ES @@ -52247,7 +53997,9 @@ 2988525888,2988525951,GB 2988525952,2988526415,FR 2988526416,2988526423,ES -2988526424,2988527527,FR +2988526424,2988527447,FR +2988527448,2988527455,NL +2988527456,2988527527,FR 2988527528,2988527531,NL 2988527532,2988527723,FR 2988527724,2988527727,ES @@ -52262,7 +54014,9 @@ 2988529360,2988529375,FR 2988529376,2988529383,GB 2988529384,2988529387,ES -2988529388,2988531275,FR +2988529388,2988530087,FR +2988530088,2988530091,NL +2988530092,2988531275,FR 2988531276,2988531279,PT 2988531280,2988535807,FR 2988535808,2988537855,ES @@ -52336,7 +54090,9 @@ 2988557508,2988557511,ES 2988557512,2988557539,FR 2988557540,2988557543,ES -2988557544,2988558203,FR +2988557544,2988557983,FR +2988557984,2988557999,IT +2988558000,2988558203,FR 2988558204,2988558207,DE 2988558208,2988558623,FR 2988558624,2988558655,NL @@ -52584,7 +54340,8 @@ 2997522944,2997523199,NO 2997523200,2997523455,NL 2997523456,2997524479,DE -2997524480,2997526527,NL +2997524480,2997525503,NL +2997525504,2997526527,TR 2997526528,2997583871,RU 2997583872,2997616639,SY 2997616640,2997649407,SI @@ -52953,7 +54710,11 @@ 3002826752,3002828799,SE 3002828800,3002830847,RU 3002830848,3002834943,FI -3002834944,3002836991,LU +3002834944,3002835063,BE +3002835064,3002835067,LU +3002835068,3002836319,BE +3002836320,3002836335,LU +3002836336,3002836991,BE 3002836992,3002841087,GB 3002841088,3002843135,CZ 3002843136,3002845183,NL @@ -53117,17 +54878,15 @@ 3005888256,3005890047,PA 3005890048,3005890303,CO 3005890304,3005890559,PA -3005890560,3005891327,CO -3005891328,3005893119,PA +3005890560,3005891583,CO +3005891584,3005893119,PA 3005893120,3005893631,CO 3005893632,3005893887,PA 3005893888,3005894911,CO 3005894912,3005895167,PA 3005895168,3005895423,CO 3005895424,3005896703,PA -3005896704,3005896959,CO -3005896960,3005897215,PA -3005897216,3005897727,CO +3005896704,3005897727,CO 3005897728,3005897983,PA 3005897984,3005898239,CO 3005898240,3005899007,PA @@ -53190,8 +54949,8 @@ 3006284544,3006284799,PA 3006284800,3006285055,CR 3006285056,3006285311,PA -3006285312,3006286079,CR -3006286080,3006286847,PA +3006285312,3006286335,CR +3006286336,3006286847,PA 3006286848,3006287615,CR 3006287616,3006287871,PA 3006287872,3006288127,CR @@ -53229,8 +54988,8 @@ 3006322432,3006323199,CR 3006323200,3006323455,PA 3006323456,3006323711,CR -3006323712,3006324223,PA -3006324224,3006324479,CR +3006323712,3006323967,PA +3006323968,3006324479,CR 3006324480,3006328831,PA 3006328832,3006330623,NI 3006330624,3006330879,PA @@ -53336,12 +55095,11 @@ 3007155200,3007155215,CL 3007155216,3007155231,DE 3007155232,3007155327,CL -3007155328,3007155455,US -3007155456,3007155711,GB +3007155328,3007155711,US 3007155712,3007155727,CL 3007155728,3007155743,DE 3007155744,3007155967,CL -3007155968,3007156223,DE +3007155968,3007156223,US 3007156224,3007156239,CL 3007156240,3007156255,DE 3007156256,3007156351,CL @@ -53525,12 +55283,12 @@ 3007168768,3007169023,CL 3007169024,3007169151,US 3007169152,3007169279,CL -3007169280,3007169535,US -3007169536,3007170047,CL +3007169280,3007169791,US +3007169792,3007170047,CL 3007170048,3007170303,MX 3007170304,3007170559,CL 3007170560,3007171071,DE -3007171072,3007171327,CL +3007171072,3007171327,US 3007171328,3007171583,ES 3007171584,3007171855,CL 3007171856,3007171871,US @@ -53538,7 +55296,8 @@ 3007171874,3007171875,CL 3007171876,3007171903,BR 3007171904,3007172607,CL -3007172608,3007175679,BR +3007172608,3007172863,US +3007172864,3007175679,BR 3007175680,3007175935,GB 3007175936,3007183359,BR 3007183360,3007183615,AU @@ -53567,10 +55326,8 @@ 3007280640,3007280895,PA 3007280896,3007281151,CR 3007281152,3007281919,PA -3007281920,3007283455,CR -3007283456,3007283711,PA -3007283712,3007283967,CR -3007283968,3007284479,PA +3007281920,3007283199,CR +3007283200,3007284479,PA 3007284480,3007285759,CR 3007285760,3007286271,PA 3007286272,3007286783,CR @@ -53611,12 +55368,16 @@ 3024879616,3025141759,CN 3025141760,3025403903,KR 3025403904,3025600511,CN -3025600512,3025603071,IN +3025600512,3025602047,IN +3025602048,3025602303,HK +3025602304,3025603071,IN 3025603072,3025603091,HK 3025603092,3025603095,CN 3025603096,3025603103,IN 3025603104,3025603215,HK -3025603216,3025603839,IN +3025603216,3025603327,IN +3025603328,3025603335,GU +3025603336,3025603839,IN 3025603840,3025604095,HK 3025604096,3025604607,IN 3025604608,3025606655,SG @@ -53636,14 +55397,16 @@ 3025612832,3025612895,IN 3025612896,3025613063,SG 3025613064,3025616895,IN -3025616896,3025617423,SG -3025617424,3025618943,IN -3025618944,3025619487,SG -3025619488,3025620991,IN +3025616896,3025617439,SG +3025617440,3025618943,IN +3025618944,3025619519,SG +3025619520,3025620991,IN 3025620992,3025621247,PH 3025621248,3025621503,IN 3025621504,3025621759,PH -3025621760,3025623295,IN +3025621760,3025623055,IN +3025623056,3025623087,SG +3025623088,3025623295,IN 3025623296,3025623551,JP 3025623552,3025625343,IN 3025625344,3025625375,SG @@ -53653,8 +55416,8 @@ 3025625400,3025625407,TH 3025625408,3025625471,SG 3025625472,3025625503,MY -3025625504,3025625519,SG -3025625520,3025625535,IN +3025625504,3025625527,SG +3025625528,3025625535,IN 3025625536,3025625599,CA 3025625600,3025625855,SG 3025625856,3025626111,IN @@ -53670,8 +55433,8 @@ 3025630976,3025631239,IN 3025631240,3025631247,AU 3025631248,3025631747,IN -3025631748,3025631759,HK -3025631760,3025632255,IN +3025631748,3025631767,HK +3025631768,3025632255,IN 3025632256,3025632271,SG 3025632272,3025632287,IN 3025632288,3025632383,SG @@ -53682,7 +55445,9 @@ 3025633792,3025633807,AU 3025633808,3025633823,IN 3025633824,3025633855,AU -3025633856,3025637151,IN +3025633856,3025633919,IN +3025633920,3025634047,MY +3025634048,3025637151,IN 3025637152,3025637183,MY 3025637184,3025637375,IN 3025637376,3025637631,HK @@ -53922,8 +55687,7 @@ 3034456064,3034464255,JP 3034464256,3034466303,NZ 3034466304,3034472447,JP -3034472448,3034478591,IN -3034478592,3034480639,JP +3034472448,3034480639,IN 3034480640,3034482687,SG 3034482688,3034483967,AF 3034483968,3034484223,US @@ -53983,7 +55747,9 @@ 3039166464,3039231999,PA 3039232000,3039297535,EC 3039297536,3039363071,PY -3039363072,3039411199,BZ +3039363072,3039379455,BZ +3039379456,3039395839,GY +3039395840,3039411199,BZ 3039411200,3039412223,US 3039412224,3039412735,CL 3039412736,3039414015,BR @@ -54000,9 +55766,7 @@ 3039416740,3039416831,CL 3039416832,3039417599,BR 3039417600,3039417855,CL -3039417856,3039418879,BR -3039418880,3039419135,CL -3039419136,3039420415,BR +3039417856,3039420415,BR 3039420416,3039428607,AR 3039428608,3039559679,CL 3039559680,3039821823,AR @@ -54103,192 +55867,164 @@ 3050569728,3050635263,CL 3050635264,3050700799,BR 3050700800,3050700815,JP -3050700816,3050700831,CL -3050700832,3050700832,BR -3050700833,3050700835,CL -3050700836,3050700847,BR -3050700848,3050701055,CL +3050700816,3050701055,BR 3050701056,3050701311,US 3050701312,3050701327,IE 3050701328,3050701343,US -3050701344,3050701344,BR -3050701345,3050701567,CL +3050701344,3050701567,BR 3050701568,3050701823,US 3050701824,3050701839,SG -3050701840,3050702079,CL +3050701840,3050702079,BR 3050702080,3050702335,US 3050702336,3050702351,DK -3050702352,3050702591,CL +3050702352,3050702591,BR 3050702592,3050702847,US 3050702848,3050702863,FR -3050702864,3050703103,CL +3050702864,3050703103,BR 3050703104,3050703359,US 3050703360,3050703375,AT -3050703376,3050703871,CL +3050703376,3050703615,BR +3050703616,3050703871,US 3050703872,3050703887,PE -3050703888,3050704127,CL +3050703888,3050704127,BR 3050704128,3050704383,US 3050704384,3050704399,KR -3050704400,3050704639,CL +3050704400,3050704639,BR 3050704640,3050704895,US 3050704896,3050704911,IT -3050704912,3050705151,CL +3050704912,3050705151,BR 3050705152,3050705407,US 3050705408,3050705423,JP -3050705424,3050705663,CL +3050705424,3050705663,BR 3050705664,3050705919,US 3050705920,3050705935,AU -3050705936,3050706175,CL +3050705936,3050706175,BR 3050706176,3050706431,US 3050706432,3050706447,NL -3050706448,3050706687,CL +3050706448,3050706687,BR 3050706688,3050706943,US 3050706944,3050706959,HK -3050706960,3050707199,CL +3050706960,3050707199,BR 3050707200,3050707455,US 3050707456,3050707471,IT -3050707472,3050707711,CL +3050707472,3050707711,BR 3050707712,3050707967,US 3050707968,3050707983,CH -3050707984,3050708223,CL +3050707984,3050708223,BR 3050708224,3050708479,US 3050708480,3050708495,FR -3050708496,3050708735,CL +3050708496,3050708735,BR 3050708736,3050708991,US 3050708992,3050709007,AT -3050709008,3050709023,BR -3050709024,3050709247,CL +3050709008,3050709247,BR 3050709248,3050709375,DE -3050709376,3050709503,CL +3050709376,3050709503,BR 3050709504,3050709519,TH -3050709520,3050709759,CL +3050709520,3050709759,BR 3050709760,3050710015,NL 3050710016,3050710031,ES -3050710032,3050710271,CL +3050710032,3050710271,BR 3050710272,3050710527,US 3050710528,3050710543,FR -3050710544,3050710783,CL +3050710544,3050710783,BR 3050710784,3050711039,US 3050711040,3050711055,AU -3050711056,3050711295,CL +3050711056,3050711295,BR 3050711296,3050711551,US 3050711552,3050711567,EE -3050711568,3050711807,CL +3050711568,3050711807,BR 3050711808,3050712063,US 3050712064,3050712079,FR -3050712080,3050712319,CL +3050712080,3050712319,BR 3050712320,3050712575,US 3050712576,3050712591,PL -3050712592,3050712831,CL +3050712592,3050712831,BR 3050712832,3050713087,US 3050713088,3050713103,LV -3050713104,3050713343,CL +3050713104,3050713343,BR 3050713344,3050713599,US 3050713600,3050713855,NL -3050713856,3050714367,CL +3050713856,3050714111,BR +3050714112,3050714367,US 3050714368,3050714623,GB 3050714624,3050714879,BR 3050714880,3050715135,ES -3050715136,3050715647,CL -3050715648,3050725375,US -3050725376,3050733567,CL -3050733568,3050760959,US -3050760960,3050764287,CL -3050764288,3050766335,US +3050715136,3050715647,BR +3050715648,3050766335,US 3050766336,3050766351,NO -3050766352,3050766591,CL +3050766352,3050766591,BR 3050766592,3050766847,US 3050766848,3050766863,KR -3050766864,3050767359,CL +3050766864,3050767359,BR 3050767360,3050767375,AT -3050767376,3050767615,CL +3050767376,3050767615,BR 3050767616,3050767871,US 3050767872,3050767887,MY -3050767888,3050768127,CL +3050767888,3050768127,BR 3050768128,3050768383,US 3050768384,3050768399,AT -3050768400,3050768639,CL +3050768400,3050768639,BR 3050768640,3050768895,US 3050768896,3050768911,CZ -3050768912,3050769151,CL +3050768912,3050769151,BR 3050769152,3050769407,US 3050769408,3050769423,AU -3050769424,3050769663,CL +3050769424,3050769663,BR 3050769664,3050769919,US 3050769920,3050769935,MY -3050769936,3050770175,CL +3050769936,3050770175,BR 3050770176,3050770431,US 3050770432,3050770447,LV -3050770448,3050770687,CL +3050770448,3050770687,BR 3050770688,3050770943,US 3050770944,3050770959,HK -3050770960,3050771199,CL +3050770960,3050771199,BR 3050771200,3050771455,US 3050771456,3050771471,SG -3050771472,3050771711,CL +3050771472,3050771711,BR 3050771712,3050771967,US 3050771968,3050771983,EE -3050771984,3050772223,CL +3050771984,3050772223,BR 3050772224,3050772479,US 3050772480,3050772495,MY -3050772496,3050772735,CL +3050772496,3050772735,BR 3050772736,3050772991,US 3050772992,3050773007,HK -3050773008,3050773247,CL +3050773008,3050773247,BR 3050773248,3050773503,US 3050773504,3050773519,NL -3050773520,3050773759,CL +3050773520,3050773759,BR 3050773760,3050774015,US 3050774016,3050774031,TR -3050774032,3050774271,CL +3050774032,3050774271,BR 3050774272,3050774527,US 3050774528,3050774543,ES -3050774544,3050774783,CL +3050774544,3050774783,BR 3050774784,3050775039,US 3050775040,3050775055,KR -3050775056,3050775295,CL +3050775056,3050775295,BR 3050775296,3050775551,US 3050775552,3050775567,FR -3050775568,3050775807,CL +3050775568,3050775807,BR 3050775808,3050776063,US 3050776064,3050776079,MY -3050776080,3050776319,CL +3050776080,3050776319,BR 3050776320,3050776575,US 3050776576,3050776591,TH -3050776592,3050776831,CL +3050776592,3050776831,BR 3050776832,3050777087,US 3050777088,3050777103,AU -3050777104,3050777343,CL +3050777104,3050777343,BR 3050777344,3050777599,US 3050777600,3050777615,HK -3050777616,3050777855,CL +3050777616,3050777855,BR 3050777856,3050778111,US 3050778112,3050778127,KR -3050778128,3050778367,CL +3050778128,3050778367,BR 3050778368,3050778623,US 3050778624,3050778639,TR -3050778640,3050778879,CL -3050778880,3050788863,US -3050788864,3050788991,CL -3050788992,3050789119,US -3050789120,3050789247,CL -3050789248,3050789375,US -3050789376,3050789503,CL -3050789504,3050789631,US -3050789632,3050789759,CL -3050789760,3050789887,US -3050789888,3050790015,CL -3050790016,3050790143,US -3050790144,3050790271,CL -3050790272,3050790399,US -3050790400,3050790527,CL -3050790528,3050790655,US -3050790656,3050790783,CL -3050790784,3050825215,US -3050825216,3050825471,CL -3050825472,3050826751,US -3050826752,3050827007,CL -3050827008,3050831871,US +3050778640,3050778879,BR +3050778880,3050831871,US 3050831872,3051356159,BR 3051356160,3051372543,CR 3051372544,3051372799,PA @@ -54414,14 +56150,12 @@ 3056772096,3056773119,JP 3056773120,3056774143,WS 3056774144,3056775167,JP -3056775168,3056779007,AF -3056779008,3056779263,AU +3056775168,3056779263,AF 3056779264,3056791551,JP 3056791552,3056795647,ID 3056795648,3056861183,CN 3056861184,3056992255,TH 3056992256,3057025023,CN -3057025024,3057033215,PH 3057033216,3057037311,NZ 3057037312,3057041407,JP 3057041408,3057049599,MY @@ -54487,7 +56221,6 @@ 3068723200,3068919807,TW 3068919808,3068948479,JP 3068948480,3068949503,VN -3068949504,3068950527,AU 3068950528,3068952575,NZ 3068952576,3068985343,CN 3068985344,3068986367,HK @@ -54516,7 +56249,6 @@ 3070170112,3070171135,MY 3070171136,3070172159,HK 3070172160,3070173183,AU -3070173184,3070181375,PH 3070181376,3070185471,JP 3070185472,3070197759,AU 3070197760,3070230527,KR @@ -54759,7 +56491,7 @@ 3098107136,3098107391,FR 3098107392,3098107647,EU 3098107648,3098107903,SE -3098107904,3098108159,ES +3098107904,3098108159,US 3098108160,3098108415,IL 3098108416,3098108671,US 3098108672,3098108927,SG @@ -54768,17 +56500,15 @@ 3098109440,3098109695,HK 3098109696,3098110719,QA 3098110720,3098111743,IT -3098111744,3098112767,US -3098112768,3098113791,AU -3098113792,3098148863,US +3098111744,3098113023,US +3098113024,3098113535,AU +3098113536,3098148863,US 3098148864,3098165247,JM 3098165248,3098181631,US 3098181632,3098185727,CA 3098185728,3098263551,US 3098263552,3098271743,CA -3098271744,3098278847,US -3098278848,3098278911,CA -3098278912,3098411007,US +3098271744,3098411007,US 3098411008,3098415103,PK 3098415104,3098476543,US 3098476544,3098492927,CA @@ -54828,6 +56558,9 @@ 3103860992,3103861247,RU 3103861248,3103861503,PL 3103861504,3103861759,AT +3103861760,3103862015,ME +3103862016,3103862271,MD +3103862272,3103862527,IT 3103916032,3103917055,CH 3103917056,3103918079,IT 3103918080,3103919103,DE @@ -54920,7 +56653,7 @@ 3104004864,3104005119,EU 3104005120,3104006143,GB 3104006144,3104007167,DE -3104007168,3104008191,GB +3104007168,3104008191,GG 3104008192,3104009215,NL 3104009216,3104010239,IT 3104010240,3104011263,PL @@ -55017,6 +56750,7 @@ 3104103424,3104104447,IR 3104104448,3104105471,TR 3104105472,3104106495,FI +3104106496,3104107519,DE 3104107520,3104108543,UA 3104108544,3104109567,GB 3104109568,3104110591,ES @@ -55292,7 +57026,9 @@ 3104401408,3104403455,DE 3104403456,3104404479,SK 3104404480,3104405503,CZ -3104405504,3104406527,KZ +3104405504,3104405759,KZ +3104405760,3104406015,RU +3104406016,3104406527,KZ 3104406528,3104407551,PL 3104407552,3104408575,DE 3104408576,3104409599,AT @@ -55302,7 +57038,7 @@ 3104412672,3104413695,IT 3104413696,3104414719,FR 3104414720,3104415743,TR -3104415744,3104416767,UA +3104415744,3104416767,RU 3104416768,3104417791,SE 3104417792,3104418815,US 3104418816,3104419839,GB @@ -55337,22 +57073,15 @@ 3104451584,3104452607,RU 3104452608,3104453631,NL 3104453632,3104454655,CH -3104454656,3104454660,NL -3104454661,3104454782,SE -3104454783,3104455050,NL -3104455051,3104455082,SE -3104455083,3104455146,NL -3104455147,3104455162,SE -3104455163,3104455294,NL -3104455295,3104455423,SE -3104455424,3104455679,NL +3104454656,3104455294,NL +3104455295,3104455298,SE +3104455299,3104455679,NL 3104455680,3104456703,RU 3104456704,3104457727,IL 3104457728,3104458751,DE 3104458752,3104459775,IR 3104459776,3104460799,IT -3104460800,3104461823,ES -3104461824,3104462847,CZ +3104460800,3104462847,ES 3104462848,3104463871,GB 3104463872,3104464895,DE 3104464896,3104465919,NL @@ -55371,6 +57100,7 @@ 3104478208,3104479231,DE 3104479232,3104480255,RU 3104480256,3104483327,NL +3104483328,3104484351,ES 3104484352,3104485375,RU 3104485376,3104486399,FR 3104486400,3104488447,RU @@ -56339,7 +58069,8 @@ 3105517568,3105518591,RU 3105518592,3105519615,RS 3105519616,3105520639,RU -3105520640,3105521663,FR +3105520640,3105521151,LU +3105521152,3105521663,FR 3105521664,3105522687,NO 3105522688,3105523711,LT 3105523712,3105524735,ES @@ -56747,11 +58478,7 @@ 3105932288,3105933311,SE 3105933312,3105933351,GB 3105933352,3105933359,IT -3105933360,3105933463,GB -3105933464,3105933471,IT -3105933472,3105933871,GB -3105933872,3105933879,IT -3105933880,3105934215,GB +3105933360,3105934215,GB 3105934216,3105934223,IT 3105934224,3105934231,GB 3105934232,3105934239,IT @@ -56793,7 +58520,9 @@ 3105966080,3105967103,FI 3105967104,3105968127,GB 3105968128,3105969151,HU -3105969152,3105970175,GB +3105969152,3105969663,GB +3105969664,3105969695,DE +3105969696,3105970175,GB 3105970176,3105971199,FR 3105971200,3105972223,GB 3105972224,3105973247,FI @@ -56938,7 +58667,7 @@ 3106108416,3106110463,RU 3106110464,3106111487,GB 3106111488,3106112511,RU -3106112512,3106113535,CZ +3106112512,3106113535,DE 3106113536,3106114559,NL 3106114560,3106115583,ES 3106115584,3106116607,DE @@ -57173,7 +58902,17 @@ 3106351104,3106352127,ES 3106352128,3106353151,NL 3106353152,3106354175,DE -3106354176,3106355199,NL +3106354176,3106354316,NL +3106354317,3106354317,BE +3106354318,3106354943,NL +3106354944,3106354951,GB +3106354952,3106354959,AT +3106354960,3106355023,NL +3106355024,3106355031,GB +3106355032,3106355039,AT +3106355040,3106355051,NL +3106355052,3106355103,GB +3106355104,3106355199,NL 3106355200,3106356223,DE 3106356224,3106357247,ES 3106357248,3106358271,DE @@ -57260,7 +58999,6 @@ 3106449408,3106450431,AT 3106450432,3106451455,DE 3106451456,3106452479,AZ -3106452480,3106453503,UA 3106453504,3106454527,SE 3106454528,3106455551,ME 3106455552,3106456575,PS @@ -57420,7 +59158,8 @@ 3106599936,3106601983,CH 3106601984,3106603007,DE 3106603008,3106604031,BE -3106604032,3106606079,RU +3106604032,3106605055,DE +3106605056,3106606079,RU 3106606080,3106607103,AT 3106607104,3106608127,IT 3106608128,3106609151,NL @@ -57478,7 +59217,8 @@ 3106661376,3106662399,TR 3106662400,3106663423,IE 3106663424,3106664447,UA -3106664448,3106666495,FR +3106664448,3106665471,FR +3106665472,3106666495,CH 3106666496,3106667519,UA 3106667520,3106668543,ES 3106668544,3106669567,RU @@ -57545,7 +59285,8 @@ 3106731008,3106732031,NL 3106732032,3106735167,GB 3106735168,3106735199,IE -3106735200,3106736127,GB +3106735200,3106735231,DE +3106735232,3106736127,GB 3106736128,3106737151,IE 3106737152,3106738175,RO 3106738176,3106739199,DE @@ -57571,7 +59312,6 @@ 3106758656,3106759679,GB 3106759680,3106760703,RU 3106760704,3106761727,IE -3106761728,3106762751,GB 3106762752,3106763775,DE 3106763776,3106764799,NL 3106764800,3106765823,SE @@ -57662,8 +59402,7 @@ 3106850816,3106851839,GB 3106851840,3106852863,PL 3106852864,3106853887,GB -3106853888,3106854015,EU -3106854016,3106854143,NL +3106853888,3106854143,NL 3106854144,3106854911,CH 3106854912,3106855935,IR 3106855936,3106856959,UA @@ -57685,7 +59424,7 @@ 3106873344,3106874367,ES 3106874368,3106875391,RU 3106875392,3106876415,NO -3106876416,3106877439,CZ +3106876416,3106877439,DE 3106877440,3106878463,IR 3106878464,3106879487,RU 3106879488,3106880511,MK @@ -57862,8 +59601,8 @@ 3107067904,3107068927,RU 3107068928,3107069951,HU 3107069952,3107070975,FR -3107070976,3107071487,SE -3107071488,3107071999,IR +3107070976,3107071231,SE +3107071232,3107071999,IR 3107072000,3107073023,SE 3107073024,3107074047,ES 3107074048,3107075071,PL @@ -57891,7 +59630,9 @@ 3107097600,3107098623,DE 3107098624,3107099647,ES 3107099648,3107099903,UA -3107099904,3107101695,CZ +3107099904,3107100159,CZ +3107100160,3107100415,RU +3107100416,3107101695,CZ 3107101696,3107102719,RU 3107102720,3107103743,GB 3107103744,3107104767,PL @@ -57972,6 +59713,7 @@ 3107183616,3107184639,IQ 3107184640,3107185663,SE 3107185664,3107186687,CZ +3107186688,3107187711,NO 3107187712,3107188735,MT 3107188736,3107189759,CZ 3107189760,3107190783,NL @@ -58236,7 +59978,9 @@ 3107473408,3107474431,IL 3107474432,3107475455,ES 3107475456,3107476479,NL -3107476480,3107477503,BG +3107476480,3107476765,BG +3107476766,3107476766,US +3107476767,3107477503,BG 3107477504,3107478527,AE 3107478528,3107480575,IR 3107480576,3107481599,DK @@ -58268,14 +60012,15 @@ 3107496320,3107496447,NL 3107496448,3107496463,CL 3107496464,3107496479,ES -3107496480,3107496511,GB +3107496480,3107496495,RO +3107496496,3107496511,IN 3107496512,3107496703,NL 3107496704,3107496719,PE 3107496720,3107496735,PK 3107496736,3107496751,FJ 3107496752,3107496783,PA -3107496784,3107496799,AQ -3107496800,3107496815,MX +3107496784,3107496799,BE +3107496800,3107496815,IL 3107496816,3107496831,CN 3107496832,3107496847,BR 3107496848,3107496863,KP @@ -58600,7 +60345,9 @@ 3107827712,3107828735,FR 3107828736,3107829759,IT 3107829760,3107830783,FR -3107830784,3107831807,GB +3107830784,3107831639,GB +3107831640,3107831643,FR +3107831644,3107831807,GB 3107831808,3107832831,RU 3107832832,3107833855,NL 3107833856,3107834879,PS @@ -58642,7 +60389,8 @@ 3107874816,3107875839,CH 3107875840,3107876863,CZ 3107876864,3107877887,RS -3107877888,3107878911,NL +3107877888,3107878143,GB +3107878144,3107878911,NL 3107878912,3107879935,IL 3107879936,3107880959,DE 3107880960,3107881983,HU @@ -58731,7 +60479,7 @@ 3107971072,3107972095,UZ 3107972096,3107973119,IT 3107973120,3107974143,SA -3107974144,3107976191,IR +3107974144,3107975167,IR 3107976192,3107977215,NL 3107977216,3107978239,AT 3107978240,3107979263,NL @@ -58761,7 +60509,8 @@ 3108002816,3108003839,RO 3108003840,3108004863,DE 3108004864,3108005887,RU -3108005888,3108006911,LT +3108005888,3108006910,US +3108006911,3108006911,LT 3108006912,3108007935,NL 3108007936,3108008959,DE 3108008960,3108009983,CH @@ -58842,8 +60591,7 @@ 3108092928,3108093951,SE 3108093952,3108095999,DE 3108096000,3108096511,LT -3108096512,3108096767,RU -3108096768,3108097023,ES +3108096512,3108097023,RU 3108097024,3108098047,TR 3108098048,3108099071,DE 3108099072,3108100095,NL @@ -59017,7 +60765,7 @@ 3108278272,3108279295,RU 3108279296,3108280319,FR 3108280320,3108281343,RU -3108281344,3108282367,CZ +3108281344,3108282367,DE 3108282368,3108283391,NL 3108283392,3108284415,CZ 3108284416,3108285439,NO @@ -59180,7 +60928,7 @@ 3108457472,3108459519,RU 3108459520,3108460543,DE 3108460544,3108461567,RO -3108461568,3108462591,GB +3108461568,3108462591,DE 3108462592,3108463615,RU 3108463616,3108464639,GB 3108464640,3108465663,HU @@ -59236,7 +60984,7 @@ 3108517888,3108518911,BG 3108518912,3108519935,SI 3108519936,3108520959,CH -3108520960,3108521983,CZ +3108520960,3108521983,DE 3108521984,3108523007,AT 3108523008,3108524031,IT 3108524032,3108525055,FR @@ -59523,7 +61271,9 @@ 3108846592,3108847615,BE 3108847616,3108847639,GB 3108847640,3108847647,IT -3108847648,3108848639,GB +3108847648,3108847959,GB +3108847960,3108847967,IT +3108847968,3108848639,GB 3108848640,3108849663,CH 3108849664,3108850687,GB 3108850688,3108851711,PL @@ -59654,7 +61404,7 @@ 3108969472,3108970495,ES 3108970496,3108971519,PL 3108971520,3108972543,ES -3108972544,3108973567,MD +3108972544,3108973567,NL 3108973568,3108974591,DE 3108974592,3108975615,RU 3108975616,3108976639,IT @@ -59774,7 +61524,7 @@ 3109098496,3109099519,HU 3109099520,3109100543,RU 3109100544,3109101567,SI -3109101568,3109102591,CY +3109101568,3109102591,TR 3109102592,3109103615,DK 3109103616,3109104639,IR 3109104640,3109105663,FR @@ -59799,7 +61549,29 @@ 3109124096,3109126143,ES 3109126144,3109127167,LV 3109127168,3109128191,ES -3109128192,3109129215,NL +3109128192,3109128207,NL +3109128208,3109128215,GB +3109128216,3109128223,AT +3109128224,3109128231,DK +3109128232,3109128239,SE +3109128240,3109128247,IS +3109128248,3109128503,NL +3109128504,3109128511,IE +3109128512,3109128719,NL +3109128720,3109128727,GB +3109128728,3109128735,AT +3109128736,3109128743,DK +3109128744,3109128751,SE +3109128752,3109128759,IE +3109128760,3109128760,IT +3109128761,3109128975,NL +3109128976,3109128983,DK +3109128984,3109128991,SE +3109128992,3109128999,IT +3109129000,3109129007,DK +3109129008,3109129015,SE +3109129016,3109129023,IE +3109129024,3109129215,NL 3109129216,3109130239,LB 3109130240,3109131263,RU 3109131264,3109132287,DE @@ -60100,7 +61872,8 @@ 3109455872,3109456895,FR 3109456896,3109457919,PS 3109457920,3109458943,RU -3109458944,3109459967,SE +3109458944,3109459711,SE +3109459712,3109459967,GB 3109459968,3109460991,TR 3109460992,3109462015,DE 3109462016,3109463039,LB @@ -60272,7 +62045,8 @@ 3109640192,3109641215,IQ 3109641216,3109642239,NO 3109642240,3109643263,US -3109643264,3109644287,UA +3109643264,3109643775,EU +3109643776,3109644287,UA 3109644288,3109646335,RU 3109646336,3109647359,IR 3109647360,3109648383,CZ @@ -60460,7 +62234,9 @@ 3109846016,3109847039,GB 3109847040,3109848063,IE 3109848064,3109849087,BG -3109849088,3109852159,RU +3109849088,3109850111,UA +3109850112,3109851135,RU +3109851136,3109852159,UA 3109852160,3109853183,NL 3109853184,3109854207,DE 3109854208,3109855231,PL @@ -60481,7 +62257,9 @@ 3109869568,3109870591,CZ 3109870592,3109871615,NL 3109871616,3109872639,AZ -3109872640,3109874687,SI +3109872640,3109872895,SI +3109872896,3109873151,SE +3109873152,3109874687,SI 3109874688,3109875711,ES 3109875712,3109876735,DK 3109876736,3109877759,ES @@ -60553,7 +62331,9 @@ 3109946368,3109947391,CZ 3109947392,3109948415,CH 3109948416,3109949439,SE -3109949440,3109950463,GB +3109949440,3109949695,IT +3109949696,3109950207,GB +3109950208,3109950463,DE 3109950464,3109951487,IT 3109951488,3109952511,DE 3109952512,3109952767,US @@ -60561,15 +62341,25 @@ 3109953024,3109953279,CA 3109953280,3109953280,GB 3109953281,3109953281,US -3109953282,3109953319,GB +3109953282,3109953284,GB +3109953285,3109953285,IT +3109953286,3109953288,GB +3109953289,3109953289,US +3109953290,3109953319,GB 3109953320,3109953320,MX 3109953321,3109953359,GB 3109953360,3109953360,SG -3109953361,3109953379,GB +3109953361,3109953375,GB +3109953376,3109953376,US +3109953377,3109953379,GB 3109953380,3109953380,US -3109953381,3109953483,GB +3109953381,3109953471,GB +3109953472,3109953472,HK +3109953473,3109953483,GB 3109953484,3109953484,AU -3109953485,3109953531,GB +3109953485,3109953491,GB +3109953492,3109953492,AU +3109953493,3109953531,GB 3109953532,3109953532,CA 3109953533,3109953535,GB 3109953536,3109954559,RU @@ -60794,14 +62584,16 @@ 3110193152,3110194175,RU 3110194176,3110195199,FR 3110195200,3110196223,HU -3110196224,3110197247,NL +3110196224,3110196479,LT +3110196480,3110196735,GB +3110196736,3110197247,NL 3110197248,3110199295,IT 3110199296,3110200319,DE 3110200320,3110201343,NL 3110201344,3110202367,IT 3110202368,3110203391,IE 3110203392,3110204415,DE -3110204416,3110205439,LU +3110204416,3110205439,BE 3110205440,3110206463,EE 3110206464,3110207487,RU 3110207488,3110208511,BA @@ -60826,7 +62618,8 @@ 3110226944,3110231039,RU 3110231040,3110232063,DE 3110232064,3110233087,DK -3110233088,3110235135,NL +3110233088,3110234111,NL +3110234112,3110235135,EU 3110235136,3110236159,GB 3110236160,3110237183,IR 3110237184,3110238207,FR @@ -60854,7 +62647,671 @@ 3110263808,3110265855,JO 3110265856,3110266879,FI 3110266880,3110267903,ES -3110267904,3110268927,DE +3110267904,3110269951,DE +3110269952,3110270975,SE +3110270976,3110271999,PT +3110272000,3110273023,TR +3110273024,3110274047,BA +3110274048,3110277119,RU +3110277120,3110278143,LB +3110278144,3110279167,TR +3110279168,3110279183,PL +3110279184,3110279199,GB +3110279200,3110279215,DE +3110279216,3110279423,GB +3110279424,3110279439,ES +3110279440,3110279455,GB +3110279456,3110279471,NL +3110279472,3110279679,GB +3110279680,3110279695,ES +3110279696,3110279711,GB +3110279712,3110279727,NL +3110279728,3110279935,GB +3110279936,3110279951,PL +3110279952,3110279967,GB +3110279968,3110279983,DE +3110279984,3110280191,GB +3110280192,3110281215,RU +3110281216,3110282239,LB +3110282240,3110283263,SE +3110284288,3110285311,PS +3110285312,3110286335,BE +3110286336,3110288383,DE +3110288384,3110289407,ES +3110289408,3110291455,CZ +3110291456,3110292479,AT +3110292480,3110293503,GB +3110293504,3110294527,AT +3110294528,3110295551,GB +3110295552,3110296575,RO +3110296576,3110297599,RU +3110297600,3110298623,NL +3110298624,3110299647,RO +3110299648,3110300671,PL +3110300672,3110301695,IE +3110301696,3110302719,FR +3110302720,3110303743,CZ +3110303744,3110304767,DK +3110304768,3110305791,KZ +3110305792,3110306815,NL +3110306816,3110307071,NZ +3110307072,3110307839,BY +3110307840,3110308863,IE +3110308864,3110309887,RS +3110309888,3110310911,DE +3110310912,3110311935,FR +3110311936,3110315007,RU +3110315008,3110316031,GB +3110316032,3110317055,RU +3110317056,3110318079,PL +3110318080,3110319103,CZ +3110319104,3110320127,US +3110320128,3110321151,NL +3110321152,3110322175,SE +3110322176,3110323199,PL +3110323200,3110324223,IT +3110324224,3110325247,GB +3110325248,3110326271,NL +3110326272,3110327295,DE +3110327296,3110328319,IR +3110328320,3110329343,FR +3110329344,3110330367,LB +3110330368,3110331391,IT +3110331392,3110332415,DE +3110332416,3110333439,PT +3110333440,3110334463,GB +3110334464,3110335487,ES +3110335488,3110336511,GB +3110336512,3110337535,GE +3110337536,3110338559,PT +3110338560,3110339583,CH +3110339584,3110340607,FR +3110340608,3110341631,DE +3110341632,3110343679,IT +3110343680,3110344703,IQ +3110344704,3110345727,RU +3110345728,3110346751,FR +3110346752,3110347775,IT +3110347776,3110348799,NL +3110348800,3110349823,US +3110349824,3110350847,IR +3110350848,3110351871,DE +3110351872,3110353919,RU +3110353920,3110354943,GB +3110354944,3110355967,RU +3110355968,3110356991,GB +3110356992,3110358015,ES +3110358016,3110359039,GE +3110359040,3110360063,IT +3110360064,3110360575,RO +3110360576,3110361087,FI +3110361088,3110362111,ES +3110362112,3110363135,CZ +3110363136,3110364159,KW +3110364160,3110366207,RU +3110366208,3110371327,IT +3110371328,3110372351,NL +3110372352,3110373375,LU +3110373376,3110374399,ES +3110374400,3110375423,NL +3110375424,3110376447,AT +3110376448,3110377471,GB +3110377472,3110378495,SA +3110378496,3110379519,RU +3110379520,3110380543,DE +3110380544,3110381567,IT +3110381568,3110382591,LB +3110382592,3110383615,GB +3110383616,3110384639,IT +3110384640,3110385663,ES +3110385664,3110386687,FR +3110386688,3110387711,GB +3110387712,3110388735,NL +3110388736,3110389759,CZ +3110389760,3110390783,LB +3110390784,3110391807,NO +3110391808,3110392831,AE +3110392832,3110393855,GB +3110393856,3110394879,LB +3110394880,3110395903,DE +3110395904,3110396927,KZ +3110396928,3110397951,PL +3110397952,3110398975,NL +3110398976,3110399999,IT +3110400000,3110401023,AT +3110401024,3110402047,MK +3110402048,3110403071,GB +3110403072,3110404095,IT +3110404096,3110405119,NO +3110405120,3110406143,DE +3110406144,3110407167,LI +3110407168,3110408191,GB +3110408192,3110409215,LB +3110409216,3110411263,RU +3110411264,3110412287,FR +3110412288,3110413311,NO +3110413312,3110414335,IT +3110414336,3110415359,NL +3110415360,3110416383,GB +3110416384,3110417407,LI +3110417408,3110418431,DE +3110418432,3110419455,SE +3110419456,3110420479,NL +3110420480,3110421503,FR +3110421504,3110422527,RU +3110422528,3110423551,PL +3110423552,3110425599,GB +3110425600,3110426623,IE +3110426624,3110427647,DK +3110427648,3110428671,DE +3110428672,3110429695,NL +3110429696,3110430719,DE +3110430720,3110431743,RO +3110431744,3110432767,NL +3110432768,3110433791,DE +3110433792,3110434815,CH +3110434816,3110435839,GB +3110435840,3110436863,IS +3110436864,3110437887,PL +3110437888,3110438911,DE +3110438912,3110439935,GE +3110439936,3110440959,SK +3110440960,3110441983,BE +3110441984,3110443007,GB +3110443008,3110444031,DK +3110444032,3110445055,CH +3110445056,3110447103,ES +3110447104,3110448127,RO +3110448128,3110449151,DE +3110449152,3110450175,PT +3110450176,3110451199,FR +3110451200,3110452223,DE +3110452224,3110453247,PL +3110453248,3110454271,GB +3110454272,3110455295,NL +3110455296,3110457343,RU +3110457344,3110458367,FR +3110458368,3110459391,IT +3110459392,3110460415,RU +3110460416,3110461439,CZ +3110461440,3110462463,GB +3110462464,3110463487,IR +3110463488,3110464511,PL +3110464512,3110465535,RU +3110465536,3110466559,IE +3110466560,3110467583,RU +3110467584,3110468607,DE +3110468608,3110469631,RU +3110469632,3110470655,IL +3110470656,3110472703,RU +3110472704,3110473727,AT +3110473728,3110474751,SE +3110474752,3110475775,CZ +3110475776,3110476799,NL +3110476800,3110477823,NO +3110477824,3110478847,SE +3110478848,3110479871,TR +3110479872,3110480895,IT +3110480896,3110481919,NL +3110481920,3110482943,RO +3110482944,3110483967,NO +3110483968,3110487039,DE +3110487040,3110488063,NL +3110488064,3110489087,KZ +3110489088,3110490111,CZ +3110490112,3110491135,FR +3110491136,3110492159,GB +3110492160,3110493183,UA +3110493184,3110494207,DE +3110494208,3110495231,CZ +3110495232,3110496255,SE +3110496256,3110497279,DE +3110497280,3110498303,NO +3110498304,3110501375,RU +3110501376,3110502399,RS +3110502400,3110503423,RU +3110503424,3110504447,GB +3110504448,3110505471,RU +3110505472,3110506495,IT +3110506496,3110507519,GE +3110507520,3110508543,GB +3110508544,3110509567,DE +3110509568,3110510591,RO +3110510592,3110511615,FR +3110511616,3110512639,UA +3110512640,3110514687,NL +3110514688,3110515711,FR +3110515712,3110516735,RU +3110516736,3110517759,UA +3110517760,3110518783,PL +3110518784,3110521855,GB +3110521856,3110523903,ES +3110523904,3110524927,SE +3110524928,3110525951,US +3110525952,3110526975,GB +3110526976,3110527999,DE +3110528000,3110529023,AT +3110529024,3110530047,FI +3110530048,3110531071,RS +3110531072,3110532095,DE +3110532096,3110534143,GB +3110534144,3110535167,DE +3110535168,3110536191,LU +3110536192,3110537215,GB +3110537216,3110538239,ES +3110538240,3110539263,LB +3110539264,3110540287,NL +3110540288,3110541311,LB +3110541312,3110542335,RU +3110542336,3110543359,HK +3110543360,3110545407,NL +3110545408,3110546431,UA +3110546432,3110547455,DE +3110547456,3110548479,SE +3110548480,3110549503,IT +3110549504,3110550527,NL +3110550528,3110551551,RU +3110551552,3110552575,FR +3110552576,3110553599,RU +3110553600,3110554623,DE +3110554624,3110555647,NL +3110555648,3110556671,IT +3110556672,3110557695,IR +3110557696,3110558719,LB +3110558720,3110559743,DE +3110559744,3110560767,GB +3110560768,3110561791,RU +3110561792,3110562815,IE +3110562816,3110563839,RU +3110563840,3110564863,IT +3110564864,3110565887,GB +3110565888,3110566911,DK +3110566912,3110567935,ES +3110567936,3110568959,IR +3110568960,3110569983,RU +3110569984,3110571007,RS +3110571008,3110572031,FR +3110572032,3110573055,SK +3110573056,3110574079,ES +3110574080,3110575103,PL +3110575104,3110576127,LU +3110576128,3110578175,RU +3110578176,3110579199,KZ +3110579200,3110580223,NL +3110580224,3110581247,KZ +3110581248,3110582271,ES +3110582272,3110583295,KZ +3110583296,3110584319,SE +3110584320,3110585343,DE +3110585344,3110586367,TR +3110586368,3110587391,NL +3110587392,3110588415,ES +3110588416,3110590463,SE +3110590464,3110591487,HR +3110591488,3110592511,GB +3110592512,3110593535,DE +3110593536,3110594303,GB +3110594304,3110594559,SE +3110594560,3110595583,DE +3110595584,3110596607,NL +3110596608,3110597631,SE +3110597632,3110600703,RU +3110600704,3110601727,GR +3110601728,3110602751,RU +3110602752,3110603775,NL +3110603776,3110604799,RU +3110604800,3110605823,CH +3110605824,3110606847,TR +3110606848,3110607871,IT +3110607872,3110608895,NL +3110608896,3110611967,RO +3110611968,3110612991,GB +3110612992,3110615039,RO +3110615040,3110616063,QA +3110616064,3110617087,ES +3110617088,3110618111,PL +3110618112,3110619135,LB +3110619136,3110620159,DE +3110620160,3110621183,FR +3110621184,3110622207,GB +3110622208,3110623231,CH +3110623232,3110624255,DE +3110624256,3110625279,RU +3110625280,3110626303,GB +3110626304,3110627327,NL +3110627328,3110628351,RU +3110628352,3110629375,LU +3110629376,3110630399,UA +3110630400,3110631423,IT +3110631424,3110632447,GB +3110632448,3110633471,BG +3110633472,3110636543,NL +3110636544,3110637567,DE +3110637568,3110638591,GR +3110638592,3110639615,RU +3110639616,3110640639,ES +3110640640,3110641663,IQ +3110641664,3110642687,DE +3110642688,3110643711,ES +3110643712,3110644735,RO +3110644736,3110645759,RU +3110645760,3110646783,LT +3110646784,3110647807,RO +3110647808,3110648831,GB +3110648832,3110649855,NL +3110649856,3110650879,IR +3110650880,3110651903,RO +3110651904,3110652927,GG +3110652928,3110653951,DE +3110653952,3110654975,NO +3110654976,3110655999,UA +3110656000,3110657023,GB +3110657024,3110658047,GI +3110658048,3110659071,AT +3110659072,3110660095,IR +3110660096,3110661119,RU +3110661120,3110662143,ES +3110662144,3110663167,RU +3110663168,3110664191,LB +3110664192,3110665215,RU +3110665216,3110666239,LB +3110666240,3110667263,DK +3110667264,3110668287,RO +3110668288,3110669311,PL +3110669312,3110671359,ES +3110671360,3110672383,AT +3110672384,3110673407,ES +3110673408,3110674431,FR +3110674432,3110676479,RO +3110676480,3110677503,DE +3110677504,3110679551,RU +3110679552,3110680575,BE +3110680576,3110681599,GB +3110681600,3110682623,SE +3110682624,3110683647,GB +3110683648,3110684671,TR +3110684672,3110685695,GB +3110685696,3110686719,NL +3110686720,3110687743,BE +3110687744,3110688767,RO +3110688768,3110689791,RU +3110689792,3110690815,BG +3110690816,3110691839,GB +3110691840,3110692863,RU +3110692864,3110693887,HU +3110693888,3110694911,UA +3110694912,3110695935,DE +3110695936,3110696959,RU +3110696960,3110697983,IR +3110697984,3110699007,GB +3110699008,3110700031,HU +3110700032,3110701055,CH +3110701056,3110702079,FR +3110702080,3110703103,PL +3110703104,3110704127,CH +3110704128,3110705151,GE +3110705152,3110706175,FR +3110706176,3110707199,BE +3110707200,3110708223,CZ +3110708224,3110709247,GB +3110709248,3110710271,RU +3110710272,3110711295,CY +3110711296,3110712319,IL +3110712320,3110713343,CZ +3110713344,3110714367,IR +3110714368,3110715391,RO +3110715392,3110716415,NL +3110716416,3110717439,AZ +3110717440,3110718463,BE +3110718464,3110719487,NL +3110719488,3110720511,IT +3110720512,3110721535,CZ +3110721536,3110723583,NL +3110723584,3110724607,RU +3110724608,3110725631,TJ +3110725632,3110726655,ES +3110726656,3110727679,IR +3110727680,3110728703,IT +3110728704,3110729727,SE +3110729728,3110730751,NL +3110730752,3110731775,DE +3110731776,3110733823,ES +3110733824,3110734847,DE +3110734848,3110735871,IQ +3110735872,3110736895,GR +3110736896,3110737919,TR +3110737920,3110738943,LU +3110738944,3110739967,IQ +3110739968,3110740991,IL +3110740992,3110742015,ES +3110742016,3110743039,RU +3110743040,3110744063,ES +3110744064,3110745087,AT +3110745088,3110746111,NL +3110746112,3110747135,IT +3110747136,3110748159,CZ +3110748160,3110749183,CH +3110749184,3110750207,BE +3110750208,3110751231,NL +3110751232,3110752255,DE +3110752256,3110753279,RO +3110753280,3110754303,DE +3110754304,3110755327,IE +3110755328,3110756351,RU +3110756352,3110757375,HU +3110757376,3110758399,CY +3110758400,3110759423,RU +3110759424,3110760447,AT +3110760448,3110761471,HU +3110761472,3110762495,IQ +3110762496,3110763007,NL +3110763008,3110763263,RO +3110763264,3110763519,NL +3110763520,3110764543,AD +3110764544,3110765567,RU +3110765568,3110766591,PL +3110766592,3110767615,RU +3110767616,3110768639,RS +3110768640,3110769663,RU +3110769664,3110770687,DE +3110770688,3110771711,NL +3110771712,3110772735,KZ +3110772736,3110773759,AT +3110773760,3110774783,DE +3110774784,3110775807,RE +3110775808,3110776831,RU +3110776832,3110777855,GB +3110777856,3110778879,SE +3110778880,3110779903,DE +3110779904,3110780927,AT +3110780928,3110781951,PS +3110781952,3110782975,RU +3110782976,3110783999,IR +3110784000,3110785023,RU +3110785024,3110786047,TR +3110786048,3110787071,AT +3110787072,3110788095,FR +3110788096,3110790143,NL +3110790144,3110791167,IR +3110791168,3110792191,DE +3110792192,3110793215,BE +3110793216,3110794239,NL +3110794240,3110795263,DE +3110795264,3110796287,AT +3110796288,3110797311,DE +3110797312,3110798335,ES +3110798336,3110799359,DE +3110799360,3110800383,GB +3110800384,3110801407,DK +3110801408,3110802431,ES +3110802432,3110803455,DE +3110803456,3110804479,NL +3110804480,3110805503,RU +3110805504,3110806527,IR +3110806528,3110809599,NL +3110809600,3110810623,LB +3110810624,3110811647,DE +3110811648,3110812671,NL +3110812672,3110813695,IS +3110813696,3110814719,PL +3110814720,3110815743,NL +3110815744,3110816767,RU +3110816768,3110817791,QA +3110817792,3110818815,NL +3110818816,3110819839,FR +3110819840,3110821887,NL +3110821888,3110822911,DE +3110822912,3110823935,NL +3110823936,3110825983,ES +3110825984,3110829055,NL +3110829056,3110831103,RU +3110831104,3110832127,TR +3110832128,3110833151,RU +3110833152,3110834175,PL +3110834176,3110836223,IT +3110836224,3110837247,ES +3110837248,3110838271,RU +3110838272,3110839295,ES +3110839296,3110840319,RU +3110840320,3110841343,DK +3110841344,3110842367,KZ +3110842368,3110843391,DK +3110843392,3110845439,IT +3110845440,3110846463,NL +3110846464,3110847487,DE +3110847488,3110848511,GB +3110848512,3110849535,DK +3110849536,3110850559,IT +3110850560,3110851583,BE +3110851584,3110852607,NL +3110852608,3110853631,MK +3110853632,3110854655,DE +3110854656,3110855679,NL +3110855680,3110856703,GB +3110856704,3110857727,KW +3110857728,3110858751,IT +3110858752,3110859775,RU +3110859776,3110861823,IR +3110861824,3110864895,RU +3110864896,3110865919,DE +3110865920,3110866943,GB +3110866944,3110868991,RU +3110868992,3110870015,PS +3110870016,3110871039,CZ +3110871040,3110872063,FR +3110872064,3110873087,ES +3110873088,3110874111,IE +3110874112,3110875135,GB +3110875136,3110876159,PL +3110876160,3110878207,GB +3110878208,3110879231,CZ +3110879232,3110880255,LV +3110880256,3110881279,PL +3110881280,3110883327,DE +3110883328,3110884351,IL +3110884352,3110886399,RU +3110886400,3110887423,GB +3110887424,3110888447,IR +3110888448,3110889471,DK +3110889472,3110890495,PT +3110890496,3110891519,DK +3110891520,3110892543,RO +3110892544,3110893567,NL +3110893568,3110894591,CZ +3110894592,3110895615,TR +3110895616,3110896639,IE +3110896640,3110897663,GB +3110897664,3110898687,ES +3110898688,3110899711,BG +3110899712,3110900735,ES +3110900736,3110901759,TR +3110901760,3110902783,ES +3110902784,3110903807,TR +3110903808,3110905855,RU +3110905856,3110906879,GB +3110906880,3110907903,DE +3110907904,3110908927,GB +3110908928,3110909951,ES +3110909952,3110910975,DE +3110910976,3110911999,BG +3110912000,3110914047,RU +3110914048,3110915071,AT +3110915072,3110916095,ES +3110916096,3110918143,RU +3110918144,3110919167,DE +3110919168,3110920191,RU +3110920192,3110921215,NL +3110921216,3110922239,DE +3110922240,3110923263,GB +3110923264,3110924287,FR +3110924288,3110925311,SA +3110925312,3110926335,CH +3110926336,3110927359,LU +3110927360,3110928383,DK +3110928384,3110929407,CH +3110929408,3110930431,IE +3110930432,3110931455,GB +3110931456,3110932479,DK +3110932480,3110933503,IE +3110933504,3110934527,RU +3110934528,3110935551,IT +3110935552,3110936575,TR +3110936576,3110937599,DE +3110937600,3110938623,CH +3110938624,3110941695,GB +3110941696,3110942719,UA +3110942720,3110943743,IT +3110943744,3110944767,IR +3110944768,3110945791,DK +3110945792,3110946815,IT +3110946816,3110947839,IR +3110947840,3110948863,DK +3110948864,3110949887,IR +3110949888,3110950911,SE +3110950912,3110951935,DK +3110951936,3110952959,GB +3110952960,3110953983,NL +3110953984,3110955007,IS +3110955008,3110956031,GB +3110956032,3110957055,DE +3110957056,3110958079,RU +3110958080,3110959103,GB +3110959104,3110960127,JO +3110960128,3110961151,GB +3110961152,3110962175,IR +3110962176,3110963199,DK +3110963200,3110965247,GB +3110965248,3110966271,NL +3110966272,3110967295,IL +3110967296,3110968319,PT +3110968320,3110969343,DE +3110969344,3110970367,NL +3110970368,3110971391,CH +3110971392,3110972415,GB +3110972416,3110973439,FR +3110973440,3110974463,SA +3110974464,3110975487,DE +3110975488,3110977535,IT +3110977536,3110978559,JO +3110978560,3110979583,DE +3110979584,3110980607,FR +3110980608,3110982655,RU +3110982656,3110983679,RO +3110983680,3110984703,PL +3110984704,3110985727,IT +3110985728,3110986751,IE +3110986752,3110987775,GB +3110987776,3110988799,NL +3110988800,3110989823,DE +3110989824,3110990847,CH +3110990848,3110992895,IR +3110992896,3110993919,RO +3110993920,3110994943,GB +3110994944,3110995967,PL +3110995968,3110996991,RU +3110996992,3110998015,DE +3110998016,3110999039,ES +3110999040,3111000063,IT 3113710318,3113710318,CA 3120562176,3120594943,CO 3120594944,3120599039,AR @@ -60876,7 +63333,9 @@ 3120693248,3120726015,BO 3120726016,3120734207,HN 3120734208,3120735999,RU -3120736000,3120738303,BZ +3120736000,3120736255,BZ +3120736256,3120736511,EC +3120736512,3120738303,BZ 3120738304,3120742399,CW 3120742400,3120754687,PY 3120754688,3120755711,CR @@ -61226,7 +63685,7 @@ 3158861056,3158861311,UA 3158861312,3158861567,IE 3158861568,3158861823,AE -3158861824,3158862079,IN +3158861824,3158862079,DE 3158862080,3158862335,GB 3158862336,3158862591,NL 3158862592,3158862847,FR @@ -61434,7 +63893,11 @@ 3161948160,3161964543,RO 3161964544,3161980927,ES 3161980928,3161989119,SK -3161989120,3161997311,RU +3161989120,3161989631,TR +3161989632,3161990143,NL +3161990144,3161991167,TR +3161991168,3161993215,NL +3161993216,3161997311,RU 3161997312,3162005503,DK 3162005504,3162013695,RS 3162013696,3162021887,IL @@ -61481,7 +63944,9 @@ 3162316800,3162324991,PL 3162324992,3162327039,IE 3162327040,3162329087,CH -3162329088,3162331135,IR +3162329088,3162329225,IR +3162329226,3162329226,IE +3162329227,3162331135,IR 3162331136,3162333183,GB 3162333184,3162341375,IT 3162341376,3162349567,PL @@ -61511,7 +63976,7 @@ 3162636288,3162669055,FR 3162669056,3162681343,RU 3162681344,3162682367,UA -3162682368,3162682879,RU +3162682368,3162682879,MD 3162682880,3162683135,IE 3162683136,3162683391,ES 3162683392,3162685439,RU @@ -61593,9 +64058,7 @@ 3164947068,3164947071,IT 3164947072,3164947579,FR 3164947580,3164947583,IT -3164947584,3164949135,FR -3164949136,3164949151,NL -3164949152,3164950695,FR +3164947584,3164950695,FR 3164950696,3164950703,NL 3164950704,3164951663,FR 3164951664,3164951671,PL @@ -61684,8 +64147,7 @@ 3165388800,3165417471,MT 3165417472,3165421567,DE 3165421568,3165425663,IE -3165425664,3165429759,GB -3165429760,3165437951,RO +3165425664,3165437951,GB 3165437952,3165439487,AT 3165439488,3165439743,GB 3165439744,3165439999,AT @@ -61702,7 +64164,10 @@ 3165444096,3165444351,BR 3165444352,3165444607,ZA 3165444608,3165444863,IT -3165444864,3165454335,AT +3165444864,3165445119,NL +3165445120,3165445375,AT +3165445376,3165445631,CA +3165445632,3165454335,AT 3165454336,3165519871,RO 3165519872,3165585407,DE 3165585408,3165650943,CZ @@ -61776,8 +64241,8 @@ 3167843328,3167844351,RO 3167844352,3167846399,GB 3167846400,3167866879,IR -3167866880,3167868927,RO -3167868928,3167879167,MD +3167866880,3167870975,RO +3167870976,3167879167,MD 3167879168,3167895551,DE 3167895552,3167899647,IR 3167899648,3167902719,RO @@ -61813,7 +64278,9 @@ 3168002048,3168005887,RO 3168005888,3168006143,NL 3168006144,3168008191,SE -3168008192,3168011775,RO +3168008192,3168011263,RO +3168011264,3168011519,MD +3168011520,3168011775,RO 3168011776,3168012287,IR 3168012288,3168014335,MD 3168014336,3168015359,ES @@ -61826,7 +64293,8 @@ 3168018688,3168020479,RO 3168020480,3168022527,MD 3168022528,3168034815,IR -3168034816,3168039935,RO +3168034816,3168038911,RO +3168038912,3168039935,MD 3168039936,3168040959,BE 3168040960,3168050431,RO 3168050432,3168050687,MD @@ -61851,7 +64319,8 @@ 3168108544,3168110335,RO 3168110336,3168110591,GB 3168110592,3168110847,IT -3168110848,3168111615,RO +3168110848,3168111359,RO +3168111360,3168111615,IT 3168111616,3168112639,FR 3168112640,3168116735,IR 3168116736,3168120831,RO @@ -61869,13 +64338,20 @@ 3168131840,3168135679,RO 3168135680,3168136191,CZ 3168136192,3168137471,RO -3168137472,3168137983,EU +3168137472,3168137727,MD +3168137728,3168137983,EU 3168137984,3168138239,NL 3168138240,3168139263,RO 3168139264,3168141311,GB -3168141312,3168147455,RO +3168141312,3168143615,RO +3168143616,3168143871,UA +3168143872,3168145151,RO +3168145152,3168145407,UA +3168145408,3168147455,RO 3168147456,3168147967,FR -3168147968,3168156671,RO +3168147968,3168155135,RO +3168155136,3168155391,IT +3168155392,3168156671,RO 3168156672,3168157695,MD 3168157696,3168161791,IR 3168161792,3168164351,RO @@ -61910,14 +64386,20 @@ 3168212736,3168212991,FR 3168212992,3168215551,RO 3168215552,3168215807,TH -3168215808,3168237567,RO +3168215808,3168223743,RO +3168223744,3168224255,MD +3168224256,3168237567,RO 3168237568,3168239615,PS 3168239616,3168243711,IR 3168243712,3168247807,RO 3168247808,3168264191,IR -3168264192,3168268287,RO +3168264192,3168265983,RO +3168265984,3168266239,GR +3168266240,3168268287,RO 3168268288,3168269311,MD -3168269312,3168272383,RO +3168269312,3168270591,RO +3168270592,3168270847,MD +3168270848,3168272383,RO 3168272384,3168534527,IT 3168534528,3168796671,GB 3168796672,3168829439,FR @@ -61954,9 +64436,7 @@ 3169648640,3169714175,MD 3169714176,3169779711,FI 3169779712,3169845247,UA -3169845248,3169854463,RO -3169854464,3169855487,IR -3169855488,3169863167,RO +3169845248,3169863167,RO 3169863168,3169863423,MD 3169863424,3169869823,RO 3169869824,3169878015,MD @@ -61965,11 +64445,15 @@ 3169886208,3169894399,GB 3169894400,3169895423,ES 3169895424,3169895679,IR -3169895680,3169899263,RO +3169895680,3169897471,RO +3169897472,3169898495,ES +3169898496,3169899263,RO 3169899264,3169899391,CN 3169899392,3169899519,TW 3169899520,3169899775,IR -3169899776,3169913855,RO +3169899776,3169905663,RO +3169905664,3169906687,ES +3169906688,3169913855,RO 3169913856,3169914111,GB 3169914112,3169921023,RO 3169921024,3169923071,GB @@ -62051,9 +64535,12 @@ 3187826688,3187834879,AR 3187834880,3187843071,CW 3187843072,3187845119,AW -3187845120,3187851263,CW +3187845120,3187849215,CW +3187849216,3187849471,CO +3187849472,3187851263,CW 3187851264,3187855359,PY -3187855360,3187857407,PA +3187855360,3187855871,CY +3187855872,3187857407,PA 3187857408,3187859455,CR 3187859456,3187863551,PA 3187863552,3187908607,AR @@ -62070,7 +64557,9 @@ 3187935608,3187935615,HN 3187935616,3187936047,GT 3187936048,3187936063,HN -3187936064,3187936711,GT +3187936064,3187936583,GT +3187936584,3187936591,HN +3187936592,3187936711,GT 3187936712,3187936719,HN 3187936720,3187937799,GT 3187937800,3187937807,HN @@ -62088,11 +64577,17 @@ 3187943128,3187943135,HN 3187943136,3187943399,GT 3187943400,3187943403,HN -3187943404,3187944671,GT +3187943404,3187943551,GT +3187943552,3187943679,HN +3187943680,3187944383,GT +3187944384,3187944399,HN +3187944400,3187944671,GT 3187944672,3187944679,HN 3187944680,3187944773,GT 3187944774,3187944774,HN -3187944775,3187945971,GT +3187944775,3187944831,GT +3187944832,3187944835,HN +3187944836,3187945971,GT 3187945972,3187945975,HN 3187945976,3187946111,GT 3187946112,3187946239,HN @@ -62154,10 +64649,11 @@ 3188240384,3188241407,CO 3188241408,3188242431,EC 3188242432,3188244479,AR -3188244480,3188260863,CO +3188244480,3188248575,CO +3188248576,3188248703,CL +3188248704,3188260863,CO 3188260864,3188269055,AR -3188269056,3188269311,MX -3188269312,3188269439,VE +3188269056,3188269439,MX 3188269440,3188269567,CO 3188269568,3188269823,MX 3188269824,3188270079,VE @@ -62246,9 +64742,7 @@ 3191108640,3191108959,PE 3191108960,3191108991,CO 3191108992,3191109119,PE -3191109120,3191109631,MX -3191109632,3191110655,PE -3191110656,3191111167,MX +3191109120,3191111167,MX 3191111168,3191111679,PE 3191111680,3191128063,PY 3191128064,3191132159,EC @@ -62319,8 +64813,8 @@ 3191696384,3191701503,US 3191701504,3191702527,CL 3191702528,3191703039,US -3191703040,3191704063,CO -3191704064,3191704575,US +3191703040,3191703551,CO +3191703552,3191704575,US 3191704576,3191704831,CO 3191704832,3191705343,US 3191705344,3191705599,CO @@ -62407,7 +64901,9 @@ 3193735168,3193735679,US 3193735680,3193736191,AR 3193736192,3193736447,US -3193736448,3193737215,AR +3193736448,3193736703,AR +3193736704,3193736959,US +3193736960,3193737215,AR 3193737216,3193739007,US 3193739008,3193739263,AR 3193739264,3193740799,US @@ -62497,7 +64993,8 @@ 3194077184,3194085375,CO 3194085376,3194093567,VE 3194093568,3194126335,SR -3194126336,3194127359,GT +3194126336,3194127103,GT +3194127104,3194127359,BR 3194127360,3194128383,PE 3194128384,3194129407,NI 3194129408,3194129663,AR @@ -62789,7 +65286,9 @@ 3195768832,3195772927,AR 3195772928,3195781119,VE 3195781120,3195785215,PA -3195785216,3195789311,HN +3195785216,3195786991,HN +3195786992,3195787007,CA +3195787008,3195789311,HN 3195789312,3195793407,PA 3195793408,3195801599,AR 3195801600,3195803647,HN @@ -62826,7 +65325,9 @@ 3196583936,3196690687,AR 3196690688,3196690943,UY 3196690944,3196846079,AR -3196846080,3196977151,PA +3196846080,3196874431,PA +3196874432,3196874447,PG +3196874448,3196977151,PA 3196977152,3197042687,VE 3197042688,3197075455,CO 3197075456,3197108223,GT @@ -62876,7 +65377,9 @@ 3199782912,3199784959,AR 3199784960,3199785983,EC 3199785984,3199795199,AR -3199795200,3199819775,CW +3199795200,3199815679,CW +3199815680,3199817727,SX +3199817728,3199819775,CW 3199819776,3199820799,CR 3199820800,3199822847,AR 3199822848,3199827967,HN @@ -62983,9 +65486,9 @@ 3203566592,3203566847,PA 3203566848,3203568639,CO 3203568640,3203569663,SV -3203569664,3203570609,CO -3203570610,3203570610,CR -3203570611,3203661823,CO +3203569664,3203570431,CO +3203570432,3203570687,CR +3203570688,3203661823,CO 3203661824,3203923967,AR 3203923968,3204448255,CO 3204448256,3208642559,BR @@ -63023,7 +65526,9 @@ 3210744080,3210744319,CL 3210744320,3210744575,US 3210744576,3210744591,BE -3210744592,3210745343,CL +3210744592,3210744831,BR +3210744832,3210745087,CL +3210745088,3210745343,US 3210745344,3210745359,RU 3210745360,3210745375,US 3210745376,3210745599,CL @@ -63031,15 +65536,17 @@ 3210745856,3210745871,IT 3210745872,3210746367,BR 3210746368,3210746383,SE -3210746384,3210746879,CL +3210746384,3210746623,CL +3210746624,3210746879,US 3210746880,3210746895,CH 3210746896,3210747135,CL 3210747136,3210747903,US 3210747904,3210748159,BR 3210748160,3210748175,JP 3210748176,3210748415,BR -3210748416,3210749951,CL -3210749952,3210752255,US +3210748416,3210748927,US +3210748928,3210749439,CL +3210749440,3210752255,US 3210752256,3210752511,CL 3210752512,3210755839,US 3210755840,3210755855,MY @@ -63050,27 +65557,35 @@ 3210756864,3210757119,RU 3210757120,3210758911,US 3210758912,3210759167,GH -3210759168,3210759423,US -3210759424,3210762495,CL -3210762496,3210762751,US -3210762752,3210763007,CL -3210763008,3210764031,US +3210759168,3210764031,US 3210764032,3210764047,IE 3210764048,3210764063,US 3210764064,3210764287,CL -3210764288,3210764543,US -3210764544,3210765055,CL +3210764288,3210764799,US +3210764800,3210765055,CL 3210765056,3210765071,SE 3210765072,3210765311,BR -3210765312,3210768383,CL +3210765312,3210765567,CL +3210765568,3210766079,US +3210766080,3210766335,CL +3210766336,3210766591,US +3210766592,3210766847,CL +3210766848,3210767103,US +3210767104,3210767359,CL +3210767360,3210768127,US +3210768128,3210768383,CL 3210768384,3210768639,NL 3210768640,3210769151,CL 3210769152,3210769407,NL -3210769408,3210769919,CL -3210769920,3210770175,US -3210770176,3210771199,CL +3210769408,3210769663,CL +3210769664,3210770431,US +3210770432,3210770687,CL +3210770688,3210770943,US +3210770944,3210771199,CL 3210771200,3210771215,TH -3210771216,3210772991,CL +3210771216,3210771711,CL +3210771712,3210771967,US +3210771968,3210772991,CL 3210772992,3210773247,US 3210773248,3210773503,BR 3210773504,3210773519,PL @@ -63083,15 +65598,22 @@ 3210775040,3210775295,US 3210775296,3210775311,CH 3210775312,3210775551,BR -3210775552,3210776319,CL +3210775552,3210775807,US +3210775808,3210776319,CL 3210776320,3210776575,US 3210776576,3210776831,CL 3210776832,3210777087,US -3210777088,3210778367,CL +3210777088,3210777599,CL +3210777600,3210777855,US +3210777856,3210778367,CL 3210778368,3210778623,US -3210778624,3210779903,CL -3210779904,3210780159,US -3210780160,3210782719,CL +3210778624,3210779135,CL +3210779136,3210779391,US +3210779392,3210779647,CL +3210779648,3210780927,US +3210780928,3210781183,CL +3210781184,3210781439,US +3210781440,3210782719,CL 3210782720,3210782975,US 3210782976,3210782991,TR 3210782992,3210783487,CL @@ -63100,7 +65622,9 @@ 3210784000,3210784015,JP 3210784016,3210784511,CL 3210784512,3210784527,BE -3210784528,3210785791,CL +3210784528,3210785279,CL +3210785280,3210785535,US +3210785536,3210785791,CL 3210785792,3210786047,BR 3210786048,3210786063,AU 3210786064,3210786303,CL @@ -63115,28 +65639,26 @@ 3210789376,3210790143,CL 3210790144,3210790399,US 3210790400,3210790655,CL -3210790656,3210790911,US -3210790912,3210791679,CL +3210790656,3210791423,US +3210791424,3210791679,CL 3210791680,3210791935,US 3210791936,3210792447,CL 3210792448,3210792703,US -3210792704,3210794239,CL -3210794240,3210794751,US +3210792704,3210793471,CL +3210793472,3210793727,US +3210793728,3210793983,CL +3210793984,3210794751,US 3210794752,3210796287,CL 3210796288,3210797055,US 3210797056,3210797311,CL -3210797312,3210797567,US -3210797568,3210797823,CL -3210797824,3210798079,US +3210797312,3210798079,US 3210798080,3210798847,CL 3210798848,3210799103,ES 3210799104,3210799359,US 3210799360,3210799615,CL 3210799616,3210800639,US 3210800640,3210800895,CL -3210800896,3210801151,US -3210801152,3210801663,CL -3210801664,3210802431,US +3210800896,3210802431,US 3210802432,3210802687,CL 3210802688,3210802943,US 3210802944,3210803071,CL @@ -63183,28 +65705,28 @@ 3211072058,3211072511,US 3211072512,3211073023,NL 3211073024,3211073279,GB -3211073280,3211073791,US +3211073280,3211073535,FR +3211073536,3211073791,US 3211073792,3211074047,LT 3211074048,3211074303,NL 3211074304,3211074559,ES 3211074560,3211074815,NL -3211074816,3211075327,DK +3211074816,3211075071,US +3211075072,3211075327,DK 3211075328,3211075583,NL 3211075584,3211075839,US 3211075840,3211076095,CL 3211076096,3211076607,LT -3211076608,3211078655,US -3211078656,3211079167,CL -3211079168,3211079423,NL -3211079424,3211079679,CL +3211076608,3211079679,US 3211079680,3211079935,GB 3211079936,3211080191,NG -3211080192,3211080703,CL +3211080192,3211080447,CL +3211080448,3211080703,US 3211080704,3211080959,GB 3211080960,3211081215,CL 3211081216,3211081727,CH -3211081728,3211082239,US -3211082240,3211082751,GB +3211081728,3211082495,US +3211082496,3211082751,GB 3211082752,3211083007,SG 3211083008,3211083519,US 3211083520,3211083775,HK @@ -63215,10 +65737,10 @@ 3211083872,3211084031,CL 3211084032,3211084287,DE 3211084288,3211084303,NL -3211084304,3211084351,CL +3211084304,3211084351,DE 3211084352,3211084367,GB -3211084368,3211084383,DE -3211084384,3211084559,CL +3211084368,3211084543,DE +3211084544,3211084559,CL 3211084560,3211084575,DE 3211084576,3211084671,CL 3211084672,3211084799,BY @@ -63256,10 +65778,7 @@ 3211087120,3211087135,DE 3211087136,3211087359,CL 3211087360,3211087375,GB -3211087376,3211087391,DE -3211087392,3211087631,CL -3211087632,3211087647,DE -3211087648,3211087871,CL +3211087376,3211087871,DE 3211087872,3211087887,ES 3211087888,3211087903,DE 3211087904,3211087999,CL @@ -63369,35 +65888,26 @@ 3211099776,3211099903,GB 3211099904,3211099919,CL 3211099920,3211099935,DE -3211099936,3211101183,CL -3211101184,3211101951,US +3211099936,3211100159,CL +3211100160,3211101951,US 3211101952,3211102207,AR 3211102208,3211104767,AU -3211104768,3211105791,CL +3211104768,3211105791,US 3211105792,3211106303,ES -3211106304,3211108351,US -3211108352,3211113471,CL +3211106304,3211112959,US +3211112960,3211113471,CL 3211113472,3211113727,GB 3211113728,3211113983,LT -3211113984,3211114495,CL -3211114496,3211114751,IT -3211114752,3211115007,US -3211115008,3211115263,NO -3211115264,3211115519,BE -3211115520,3211115775,DK -3211115776,3211116287,RU -3211116288,3211116543,US -3211116544,3211116799,CL -3211116800,3211117055,US -3211117056,3211117567,CL -3211117568,3211122687,US -3211122688,3211124735,CL -3211124736,3211128831,US -3211128832,3211129343,CL +3211113984,3211114239,US +3211114240,3211114495,CL +3211114496,3211116031,US +3211116032,3211116287,RU +3211116288,3211129087,US +3211129088,3211129343,CL 3211129344,3211129599,SG 3211129600,3211129855,NL -3211129856,3211130367,CL -3211130368,3211132927,US +3211129856,3211130111,CL +3211130112,3211132927,US 3211132928,3211137023,CO 3211137024,3211141119,AR 3211141120,3211142143,CL @@ -63822,7 +66332,7 @@ 3223473232,3223474175,CA 3223474176,3223477247,US 3223477248,3223478271,CA -3223480320,3223481087,US +3223478272,3223481087,US 3223481088,3223481343,SE 3223481344,3223483391,US 3223483392,3223483647,NL @@ -63899,7 +66409,9 @@ 3223610880,3223611135,NO 3223611136,3223611647,SE 3223611648,3223611903,GB -3223611904,3223615999,SE +3223611904,3223612927,SE +3223612928,3223613183,FR +3223613184,3223615999,SE 3223616000,3223616767,GB 3223616768,3223617535,SE 3223617536,3223617791,NO @@ -63910,7 +66422,8 @@ 3223627776,3223628031,DE 3223628032,3223628287,SE 3223628288,3223628543,ES -3223628544,3223630591,SE +3223628544,3223630079,SE +3223630080,3223630591,FR 3223630592,3223630847,GB 3223630848,3223634431,SE 3223634432,3223634687,US @@ -63924,7 +66437,8 @@ 3223640832,3223641087,GB 3223641088,3223644415,SE 3223644416,3223644671,DE -3223644672,3223646207,SE +3223644672,3223644927,FR +3223644928,3223646207,SE 3223646208,3223646463,IT 3223646464,3223646975,SE 3223646976,3223647231,IT @@ -63956,7 +66470,7 @@ 3223902464,3223902719,CA 3223902720,3223905279,US 3223905280,3223905535,FI -3223905536,3223905791,US +3223905536,3223906303,US 3223906304,3223909375,CA 3223909376,3223911935,US 3223911936,3223912191,CA @@ -64028,9 +66542,7 @@ 3224030720,3224030975,CA 3224030976,3224038655,US 3224038656,3224038911,AU -3224038912,3224042751,US -3224042752,3224043007,DE -3224043008,3224084991,US +3224038912,3224084991,US 3224084992,3224087551,SE 3224087552,3224088063,US 3224088064,3224088319,AU @@ -64485,7 +66997,7 @@ 3225747712,3225747967,CA 3225747968,3225757695,US 3225757696,3225758719,CA -3225759232,3225763839,US +3225758720,3225763839,US 3225763840,3225764095,BE 3225764096,3225764863,US 3225764864,3225765887,CA @@ -64540,13 +67052,24 @@ 3225882368,3225882623,DE 3225882624,3225882879,SE 3225882880,3225883391,DE -3225883392,3225885183,SE +3225883392,3225884927,SE +3225884928,3225885183,NL 3225885184,3225885695,AT -3225885696,3225887999,SE +3225885696,3225886719,SE +3225886720,3225886975,NO +3225886976,3225887231,SE +3225887232,3225887487,DK +3225887488,3225887999,SE 3225888000,3225888255,GB -3225888256,3225894399,SE +3225888256,3225892351,SE +3225892352,3225892863,FR +3225892864,3225894399,SE 3225894400,3225895423,GB -3225895424,3225905407,SE +3225895424,3225902335,SE +3225902336,3225902591,NL +3225902592,3225902847,SE +3225902848,3225903103,NL +3225903104,3225905407,SE 3225905408,3225905663,IT 3225905664,3225913855,SE 3225913856,3225914111,DE @@ -64622,7 +67145,9 @@ 3226141696,3226141951,US 3226141952,3226143487,CA 3226143488,3226143743,US -3226143744,3226156543,CA +3226143744,3226146559,CA +3226146560,3226146815,FR +3226146816,3226156543,CA 3226156544,3226156799,US 3226156800,3226157567,CA 3226157568,3226157823,US @@ -64784,7 +67309,7 @@ 3226658304,3226658559,AU 3226658560,3226661119,US 3226661120,3226661375,NL -3226661888,3226664959,US +3226661376,3226664959,US 3226664960,3226690815,FI 3226690816,3226691071,CA 3226691072,3226691327,NL @@ -64810,7 +67335,7 @@ 3226716672,3226716927,GB 3226716928,3226718207,US 3226720768,3226721279,JP -3226721280,3226721791,US +3226721280,3226722047,US 3226722048,3226722303,NL 3226722304,3226722559,AU 3226722560,3226723583,US @@ -65138,7 +67663,9 @@ 3227461960,3227461963,US 3227461964,3227464447,CA 3227464448,3227464575,US -3227464576,3227465147,CA +3227464576,3227464663,CA +3227464664,3227464667,US +3227464668,3227465147,CA 3227465148,3227465151,US 3227465152,3227466135,CA 3227466136,3227466143,US @@ -65220,7 +67747,9 @@ 3227756506,3227756506,US 3227756507,3227762655,CA 3227762656,3227762671,US -3227762672,3227765503,CA +3227762672,3227765480,CA +3227765481,3227765482,US +3227765483,3227765503,CA 3227765504,3227765759,US 3227765760,3227777759,CA 3227777760,3227777763,US @@ -65363,7 +67892,7 @@ 3227932672,3227932927,US 3227932928,3227933183,DE 3227933184,3227933695,US -3227933696,3227933951,AU +3227933696,3227933951,NZ 3227933952,3227934463,US 3227934464,3227934719,CH 3227934720,3227947519,US @@ -65454,7 +67983,9 @@ 3228100608,3228101119,AU 3228101120,3228102143,US 3228102144,3228102399,NL -3228102400,3228103935,US +3228102400,3228103423,US +3228103424,3228103679,CA +3228103680,3228103935,US 3228103936,3228104191,FR 3228104192,3228104703,AU 3228104704,3228104959,DK @@ -65490,6 +68021,7 @@ 3228264448,3228264703,NI 3228264704,3228265983,US 3228265984,3228266239,IE +3228266240,3228266495,PR 3228266496,3228267007,AU 3228267008,3228267263,NL 3228267264,3228269055,US @@ -65570,10 +68102,11 @@ 3228368896,3228380415,DE 3228380416,3228380671,US 3228380672,3228380927,DE -3228381184,3228388095,DE +3228381184,3228387839,DE 3228388096,3228388351,US -3228388352,3228393727,DE -3228393984,3228394239,DE +3228388352,3228392447,DE +3228392448,3228392959,US +3228392960,3228393727,DE 3228394240,3228394495,US 3228394752,3228395263,DE 3228395264,3228395775,US @@ -65593,7 +68126,7 @@ 3228424704,3228424959,US 3228425216,3228430847,DE 3228430848,3228431103,MU -3228431104,3228434431,DE +3228431360,3228434431,DE 3228434432,3228456191,US 3228456192,3228456447,CA 3228456448,3228457471,US @@ -65689,7 +68222,9 @@ 3229160960,3229161471,DE 3229161472,3229161727,SE 3229161728,3229161983,GB -3229161984,3229164287,SE +3229161984,3229163263,SE +3229163264,3229163519,ES +3229163520,3229164287,SE 3229164288,3229164543,DK 3229164544,3229165055,GB 3229165056,3229165311,NO @@ -65697,15 +68232,23 @@ 3229167104,3229167615,IT 3229167616,3229171711,SE 3229171712,3229172223,GB -3229172224,3229182463,SE +3229172224,3229173503,SE +3229173504,3229173759,IT +3229173760,3229182463,SE 3229182464,3229182975,GB 3229182976,3229183999,SE 3229184000,3229184511,GB -3229184512,3229186815,SE +3229184512,3229186559,SE +3229186560,3229186815,IT 3229186816,3229187327,ES -3229187328,3229187583,SE +3229187328,3229187583,IT 3229187584,3229187839,DK -3229187840,3229195263,SE +3229187840,3229192959,SE +3229192960,3229193727,FR +3229193728,3229194239,SE +3229194240,3229194495,FR +3229194496,3229195007,SE +3229195008,3229195263,NL 3229195264,3229196287,DE 3229196288,3229196799,SE 3229196800,3229197311,NL @@ -65720,12 +68263,21 @@ 3229200896,3229201151,DE 3229201152,3229201663,SE 3229201664,3229201919,DK -3229201920,3229202943,SE -3229202944,3229203199,NL +3229201920,3229202431,SE +3229202432,3229202687,ES +3229202688,3229203199,NL 3229203200,3229203967,GB -3229203968,3229205503,SE +3229203968,3229204223,SE +3229204224,3229204479,IT +3229204480,3229205503,SE 3229205504,3229206015,GB -3229206016,3229220863,SE +3229206016,3229211647,SE +3229211648,3229211903,IT +3229211904,3229212927,SE +3229212928,3229213183,DE +3229213184,3229219583,SE +3229219584,3229219839,DE +3229219840,3229220863,SE 3229220864,3229221119,US 3229221120,3229245439,GB 3229245440,3229246463,US @@ -65783,7 +68335,8 @@ 3229415168,3229415679,NL 3229415680,3229415935,CA 3229415936,3229483007,DE -3229483008,3229499647,FI +3229483008,3229483263,US +3229483264,3229499647,FI 3229499648,3229614847,US 3229614848,3229615103,GB 3229615104,3229679103,US @@ -65872,11 +68425,11 @@ 3229939456,3229940735,KR 3229940736,3229940991,CH 3229940992,3229941247,AU -3229941248,3229941503,US +3229941248,3229941759,US 3229941760,3229942271,CA 3229942272,3229944319,US 3229944320,3229944575,AU -3229944576,3229945087,US +3229944576,3229945343,US 3229945344,3229945599,AU 3229945600,3229945855,NL 3229945856,3229947135,US @@ -65966,7 +68519,7 @@ 3230120192,3230120447,NL 3230120448,3230120703,US 3230120704,3230120959,PT -3230120960,3230125567,US +3230120960,3230125823,US 3230125824,3230126335,AU 3230126336,3230126591,US 3230126592,3230126847,AU @@ -65982,7 +68535,7 @@ 3230132992,3230137599,US 3230137600,3230137855,NL 3230137856,3230138111,PL -3230138368,3230140159,US +3230138112,3230140159,US 3230140160,3230140415,MT 3230140416,3230140671,US 3230140672,3230140927,FI @@ -66005,6 +68558,7 @@ 3230151168,3230151423,US 3230151424,3230151679,NL 3230151680,3230151935,PT +3230151936,3230152191,CA 3230152192,3230152447,FR 3230152448,3230153215,BF 3230153216,3230153471,FR @@ -66013,12 +68567,12 @@ 3230153984,3230154239,NL 3230154240,3230156543,US 3230156544,3230164735,FI -3230164736,3230167295,US +3230164736,3230167551,US 3230167552,3230168063,CA 3230168064,3230177791,US 3230177792,3230178303,GB 3230178304,3230178559,CH -3230178816,3230210047,US +3230178560,3230210047,US 3230210048,3230210303,CA 3230210304,3230211839,US 3230211840,3230212095,CN @@ -66081,7 +68635,7 @@ 3230267136,3230267903,CA 3230267904,3230269695,US 3230269696,3230271743,GB -3230272000,3230291455,US +3230271744,3230291455,US 3230291456,3230291711,NL 3230291712,3230295039,US 3230295040,3230295295,AU @@ -66097,7 +68651,7 @@ 3230316800,3230317311,CA 3230317312,3230317567,US 3230317568,3230317823,AU -3230318080,3230318591,US +3230317824,3230318591,US 3230318592,3230318847,NL 3230318848,3230321663,US 3230321664,3230321919,PT @@ -66109,18 +68663,41 @@ 3230332928,3230333183,GB 3230333184,3230333695,US 3230333696,3230333951,AU -3230333952,3230334975,US -3230334976,3230354943,CA +3230333952,3230335231,US +3230335232,3230335743,CA +3230335744,3230335999,US +3230336000,3230336255,CA +3230336256,3230336511,US +3230336512,3230339583,CA +3230339584,3230339839,US +3230339840,3230340095,CA +3230340096,3230340351,US +3230340352,3230350847,CA +3230350848,3230351103,US +3230351104,3230354943,CA 3230354944,3230355199,FR 3230355200,3230365183,CA 3230365184,3230365439,US -3230365440,3230368767,CA -3230368768,3230370303,US +3230365440,3230367743,CA +3230367744,3230367999,US +3230368000,3230368511,CA +3230368512,3230370303,US 3230370304,3230370559,CA -3230370816,3230400511,CA +3230370560,3230370815,US +3230370816,3230372607,CA +3230372608,3230372863,US +3230372864,3230383359,CA +3230383360,3230383615,US +3230383616,3230384127,CA +3230384128,3230384383,MF +3230384384,3230387455,CA +3230387456,3230387711,US +3230387712,3230400255,CA +3230400256,3230400767,US 3230681088,3230683135,FR 3230785536,3230823679,US 3230823680,3230823935,NL +3230823936,3230824191,US 3230824192,3230824447,NL 3230824448,3230825215,US 3230825216,3230825471,GB @@ -66147,10 +68724,11 @@ 3230840576,3230840831,US 3230840832,3230841087,AU 3230841088,3230841343,NL +3230841344,3230841599,US 3230841600,3230841855,NL 3230841856,3230842111,US 3230842112,3230842367,AU -3230842624,3230843135,US +3230842368,3230843135,US 3230843136,3230843391,NL 3230843392,3230844927,US 3230844928,3230845183,AU @@ -66171,14 +68749,13 @@ 3230855680,3230855935,NL 3230855936,3230857983,US 3230857984,3230858751,AU -3230858752,3230859007,US -3230859264,3230865151,US +3230858752,3230865151,US 3230865152,3230865407,GB 3230865408,3230867967,US 3230867968,3230868223,NL 3230868224,3230868479,US 3230868480,3230868735,NL -3230868992,3230870015,US +3230868736,3230870015,US 3230870016,3230870271,NL 3230870272,3230878719,US 3230878720,3230879487,PT @@ -66205,6 +68782,7 @@ 3230915584,3230917631,US 3230917632,3230917887,NL 3230917888,3230918399,US +3230918400,3230918655,LC 3230918656,3230919423,US 3230919424,3230919679,AU 3230919680,3230922239,US @@ -66214,18 +68792,16 @@ 3230923520,3230923775,EU 3230923776,3230924031,US 3230924032,3230924287,AU -3230924288,3230924543,US -3230924800,3230933247,US +3230924288,3230933247,US 3230933248,3230948607,SE 3230948608,3230951167,US 3230951168,3230951423,NL -3230951424,3230953471,US -3230953472,3230954495,CA +3230951424,3230953215,US +3230953216,3230954495,CA 3230954496,3230967295,AU 3230967296,3230967551,RU 3230967552,3230967807,ES -3230967808,3230969087,US -3230969344,3230969599,US +3230967808,3230969599,US 3230969600,3230969855,MX 3230969856,3230970111,US 3230970112,3230972671,GB @@ -66239,23 +68815,22 @@ 3230976256,3230980095,ES 3230980096,3230980351,GB 3230980352,3230980607,CA -3230980608,3230980863,US +3230980608,3230981119,US 3230981120,3230981375,NL 3230981376,3230981631,AU 3230981632,3230981887,US 3230981888,3230983935,AU -3230983936,3230990335,US -3230990592,3230991103,US +3230983936,3230991103,US 3230991104,3230991359,PL 3230991360,3230991615,US 3230991616,3230991871,FI 3230991872,3230994175,US 3230994176,3230994431,NL -3230994432,3230994687,US -3230994944,3230995199,US +3230994432,3230995199,US 3230995200,3230995455,NL 3230995456,3230995711,AU 3230995712,3230996223,US +3230996224,3230996479,CA 3230996480,3230997247,US 3230997248,3230997503,NL 3230997504,3230997759,US @@ -66263,31 +68838,31 @@ 3230999040,3230999295,US 3230999296,3230999551,NL 3230999552,3230999807,AU -3230999808,3231000319,US -3231000576,3231000831,US +3230999808,3231000831,US 3231000832,3231001087,FR 3231001088,3231003903,US 3231003904,3231004159,CA 3231004160,3231004415,AU -3231004672,3231004927,US +3231004416,3231004927,US 3231004928,3231005183,GB +3231005184,3231005439,US 3231005440,3231005695,FR 3231005696,3231005951,GB -3231005952,3231009791,US +3231005952,3231010047,US 3231010048,3231010303,FR 3231010304,3231010815,NO 3231010816,3231011071,CA -3231011328,3231012863,US -3231013120,3231013375,US +3231011328,3231013375,US 3231013376,3231013887,CA -3231013888,3231014911,US -3231015168,3231015423,US +3231013888,3231015423,US 3231015424,3231015679,CA 3231015680,3231015935,US 3231015936,3231016191,NO 3231016192,3231016447,US 3231016448,3231016703,NO -3231016704,3231018495,US +3231016704,3231016959,US +3231016960,3231017215,CA +3231017216,3231018495,US 3231018496,3231018751,NL 3231018752,3231019007,GB 3231019008,3231020287,US @@ -66304,12 +68879,11 @@ 3231042048,3231042303,GU 3231042304,3231043839,US 3231043840,3231044095,AU -3231044352,3231048447,US +3231044096,3231048447,US 3231048448,3231048703,NL 3231048704,3231049727,US 3231049728,3231049983,AT -3231049984,3231050239,US -3231050496,3231051263,US +3231049984,3231051263,US 3231051264,3231051519,GB 3231051520,3231051775,AU 3231051776,3231057151,US @@ -66318,13 +68892,16 @@ 3231057920,3231058175,EU 3231058176,3231060991,US 3231060992,3231061247,EU -3231061248,3231070463,US -3231070720,3231075327,SE +3231061248,3231070719,US +3231070720,3231074559,SE +3231074560,3231075071,US +3231075072,3231075327,SE 3231075328,3231075583,NL +3231075584,3231075839,US 3231075840,3231077119,SE 3231077120,3231077375,PL 3231077376,3231077631,SE -3231078144,3231078655,US +3231077632,3231078655,US 3231078656,3231078911,NL 3231078912,3231079423,CA 3231079424,3231079679,NL @@ -66344,8 +68921,7 @@ 3231088384,3231088895,US 3231088896,3231091711,AU 3231091712,3231091967,NL -3231091968,3231092223,US -3231092480,3231092735,US +3231091968,3231092735,US 3231092736,3231092991,AU 3231092992,3231093247,US 3231093248,3231093503,NL @@ -66366,11 +68942,10 @@ 3231107840,3231108095,AT 3231108096,3231108351,GB 3231108352,3231108607,RU -3231108608,3231108863,US +3231108608,3231109119,US 3231109120,3231109375,GB 3231109376,3231109631,NO -3231109632,3231109887,US -3231110144,3231111679,US +3231109632,3231111679,US 3231111680,3231112191,NZ 3231112448,3231112959,US 3231112960,3231113215,NO @@ -66387,7 +68962,7 @@ 3231120384,3231120639,NO 3231120640,3231120895,US 3231120896,3231121151,NO -3231121408,3231149311,US +3231121152,3231149311,US 3231149312,3231149567,CA 3231149568,3231154431,US 3231154432,3231154687,AU @@ -66421,19 +68996,23 @@ 3231203328,3231204351,US 3231204352,3231204607,FI 3231204608,3231204863,AU -3231204864,3231207935,US +3231204864,3231207167,US +3231207168,3231207423,CA +3231207424,3231207935,US 3231207936,3231208191,DE 3231208192,3231208959,US 3231208960,3231209471,AU -3231209472,3231211775,US +3231209472,3231210239,US +3231210240,3231210495,CA +3231210496,3231211775,US 3231211776,3231212031,CA 3231212032,3231212287,CH 3231212288,3231214335,US 3231214336,3231214591,CA -3231214592,3231215103,US +3231214592,3231215359,US 3231215360,3231215615,NO 3231215616,3231215871,GB -3231215872,3231217151,US +3231215872,3231217407,US 3231217408,3231217663,AU 3231217664,3231218175,US 3231218176,3231218431,GB @@ -66449,6 +69028,7 @@ 3231225600,3231225855,DE 3231225856,3231226879,US 3231226880,3231227135,GB +3231227392,3231227647,CA 3231227648,3231228927,US 3231228928,3231229183,PR 3231229184,3231229439,CA @@ -66464,7 +69044,8 @@ 3231237376,3231237631,AU 3231237632,3231241215,US 3231241216,3231241471,AU -3231241984,3231248639,US +3231241472,3231241727,CA +3231241728,3231248639,US 3231248640,3231248895,NL 3231248896,3231249407,US 3231249408,3231249663,GB @@ -66473,13 +69054,13 @@ 3231250688,3231251711,US 3231251712,3231251967,GB 3231251968,3231252223,AT -3231252736,3231252991,US +3231252224,3231252991,US 3231252992,3231253503,NL 3231253504,3231254783,US 3231254784,3231255039,AU 3231255040,3231255551,US 3231255808,3231256063,PT -3231256320,3231257087,US +3231256064,3231257087,US 3231257088,3231257599,HU 3231257600,3231275007,US 3231275008,3231275263,BR @@ -66490,7 +69071,7 @@ 3231276800,3231281919,JP 3231281920,3231282175,US 3231282176,3231282431,HU -3231282688,3231282943,US +3231282432,3231282943,US 3231282944,3231283199,CL 3231283200,3231283455,BR 3231283456,3231284991,US @@ -66509,7 +69090,9 @@ 3231296256,3231296511,NL 3231296512,3231296767,US 3231296768,3231299327,AT -3231299328,3231300607,US +3231299328,3231300095,US +3231300096,3231300351,CA +3231300352,3231300607,US 3231300608,3231301119,NL 3231301120,3231302143,US 3231302144,3231302399,NL @@ -66523,7 +69106,9 @@ 3231308800,3231309055,CA 3231309824,3231316735,US 3231316736,3231316991,AU -3231316992,3231322111,US +3231316992,3231321343,US +3231321344,3231321599,CA +3231321600,3231322111,US 3231322112,3231324671,SG 3231324672,3231325183,US 3231325184,3231326207,CA @@ -66532,8 +69117,11 @@ 3231358976,3231369215,US 3231369216,3231369471,TW 3231369472,3231383551,US -3231383552,3231385599,NO -3231385600,3231423999,US +3231383552,3231383807,CA +3231383808,3231385343,NO +3231385344,3231401215,US +3231401216,3231401471,CA +3231401472,3231423999,US 3231424000,3231424511,PR 3231424512,3231477759,US 3231477760,3231478015,CA @@ -66542,18 +69130,18 @@ 3231483136,3231484927,US 3231484928,3231487999,JP 3231488512,3231488767,JP +3231489280,3231489535,US 3231489536,3231489791,JP 3231489792,3231490047,AU 3231490048,3231490559,US 3231490560,3231490815,GB -3231490816,3231491071,US +3231490816,3231491327,US 3231491328,3231491583,AU 3231491584,3231491839,US 3231491840,3231492095,GB 3231492096,3231493631,US 3231493632,3231493887,CH -3231493888,3231499263,US -3231499520,3231500031,US +3231493888,3231500031,US 3231500032,3231500287,BM 3231500288,3231502079,US 3231502080,3231502591,AU @@ -66563,20 +69151,19 @@ 3231503616,3231503871,IT 3231503872,3231504383,US 3231504640,3231504895,NL -3231505152,3231505407,US +3231504896,3231505407,US 3231505408,3231505663,AU 3231505664,3231506687,US 3231506688,3231506943,AU 3231506944,3231507199,US 3231507200,3231507455,BE -3231507456,3231510015,US +3231507456,3231510271,US 3231510272,3231510527,NL 3231510528,3231512575,US 3231512576,3231512831,LU 3231512832,3231513087,AU -3231513088,3231513343,US -3231513600,3231514623,US -3231514624,3231515647,NO +3231513088,3231514879,US +3231514880,3231515647,NO 3231515648,3231516671,US 3231516672,3231519231,SE 3231519232,3231526911,US @@ -66640,8 +69227,8 @@ 3231635456,3231641855,US 3231641856,3231642111,SG 3231642112,3231649791,US -3231649792,3231653887,SG -3231653888,3231663615,US +3231649792,3231653631,SG +3231653632,3231663615,US 3231663616,3231663871,NL 3231663872,3231664127,CA 3231664128,3231664383,US @@ -66652,7 +69239,7 @@ 3231667200,3231667711,NL 3231667712,3231668735,US 3231668736,3231668991,BE -3231669248,3231669503,US +3231668992,3231669759,US 3231669760,3231670015,CA 3231670016,3231670271,NL 3231670272,3231671039,US @@ -66666,8 +69253,9 @@ 3231674368,3231675391,US 3231675392,3231675903,BR 3231675904,3231676159,NL -3231676416,3231677439,NL -3231677440,3231694847,US +3231676160,3231676671,US +3231676672,3231677183,NL +3231677184,3231694847,US 3231694848,3231711231,CA 3231711232,3231713023,US 3231713024,3231713279,CA @@ -66692,17 +69280,19 @@ 3231720704,3231720959,NL 3231720960,3231722751,US 3231722752,3231723007,BR -3231723008,3231723519,US -3231723776,3231724031,US +3231723008,3231724031,US 3231724032,3231724287,BR 3231724288,3231727871,US 3231727872,3231728127,NL +3231728128,3231728383,US 3231728384,3231728639,NL 3231728640,3231729407,US 3231729408,3231729663,AU 3231729664,3231735551,US 3231735552,3231736063,CH -3231736064,3231738367,US +3231736064,3231737343,US +3231737344,3231737599,CA +3231737600,3231738367,US 3231738368,3231738623,NL 3231738624,3231739135,US 3231739136,3231739647,NL @@ -66747,10 +69337,13 @@ 3231770368,3231770879,AT 3231770880,3231771135,RU 3231771136,3231773951,US -3231773952,3231775743,PT +3231773952,3231775231,PT +3231775232,3231775487,KY +3231775488,3231775743,PT 3231775744,3231775999,NL 3231776000,3231776511,US -3231776768,3231793151,US +3231776512,3231777023,CA +3231777024,3231793151,US 3231793152,3231793663,NL 3231793664,3231800319,US 3231800320,3231801343,CN @@ -66825,18 +69418,25 @@ 3232047360,3232048639,GB 3232048640,3232049151,SE 3232049152,3232049407,GB -3232049408,3232051967,SE +3232049408,3232051199,SE +3232051200,3232051455,AT +3232051456,3232051967,SE 3232051968,3232052991,GB 3232052992,3232053247,US 3232053248,3232056063,SE 3232056064,3232056319,IT 3232056320,3232060415,SE 3232060416,3232060671,IE -3232060672,3232065791,SE +3232060672,3232060927,IT +3232060928,3232065791,SE 3232065792,3232066303,GB 3232066304,3232066559,SE 3232066560,3232066815,NO -3232066816,3232070399,SE +3232066816,3232067839,SE +3232067840,3232068095,PL +3232068096,3232069887,SE +3232069888,3232070143,CH +3232070144,3232070399,SE 3232070400,3232070655,ES 3232070656,3232079871,SE 3232079872,3232080895,GB @@ -66894,8 +69494,8 @@ 3232309248,3232311807,SG 3232311808,3232407039,US 3232407040,3232407551,SG -3232407552,3232432127,US -3232432128,3232433663,EU +3232407552,3232432383,US +3232432384,3232433663,EU 3232433920,3232440319,US 3232440320,3232448511,CA 3232448512,3232461311,US @@ -66907,16 +69507,18 @@ 3232555264,3232555775,US 3232555776,3232557055,JP 3232557056,3232557311,AU +3232557312,3232557567,US 3232557568,3232560127,JP 3232560896,3232561663,US 3232561664,3232561919,CA 3232561920,3232562431,US 3232562432,3232562687,NL 3232562688,3232562943,CA +3232562944,3232563199,US 3232563200,3232564479,GB -3232564736,3232567295,US +3232564480,3232567295,US 3232567296,3232569599,NZ -3232569856,3232570367,US +3232569600,3232570367,US 3232570368,3232571391,CA 3232571392,3232595967,US 3232595968,3232598015,GB @@ -66924,7 +69526,7 @@ 3232629760,3232630783,CA 3232630784,3232645119,US 3232645120,3232646399,AT -3232646656,3232661503,US +3232646400,3232661503,US 3232661504,3232694271,JP 3232694272,3232695807,US 3232695808,3232696319,CA @@ -66941,15 +69543,21 @@ 3232727040,3232759807,US 3232759808,3232765951,SE 3232765952,3232766207,NO -3232766208,3232774911,SE +3232766208,3232766463,SE +3232766464,3232766719,NO +3232766720,3232767231,DE +3232767232,3232774911,SE 3232774912,3232775167,IE -3232775168,3232794879,SE +3232775168,3232792319,SE +3232792320,3232792575,DK +3232792576,3232794879,SE 3232794880,3232795135,DE 3232795136,3232802559,SE 3232802560,3232802815,DK 3232802816,3232803071,SE 3232803072,3232803327,IE -3232803328,3232804607,SE +3232803328,3232804351,SE +3232804352,3232804607,DK 3232804608,3232804863,IT 3232804864,3232812031,SE 3232812032,3232812543,GB @@ -66962,26 +69570,20 @@ 3233288192,3233292287,CA 3233292288,3233431551,US 3233431552,3233447935,CA -3233447936,3233449095,US -3233449096,3233449103,GB -3233449104,3233449207,US -3233449208,3233449215,GB -3233449216,3233449359,US -3233449360,3233449367,GB -3233449368,3233450199,US -3233450200,3233450207,GB -3233450208,3233451519,US +3233447936,3233451519,US 3233451520,3233451775,GB 3233451776,3233453567,US -3233453568,3233453823,IT -3233453824,3233456127,US -3233456128,3233456383,LV -3233456384,3233456639,UA +3233453568,3233453631,IT +3233453632,3233456191,US +3233456192,3233456255,LV +3233456256,3233456383,US +3233456384,3233456447,UA +3233456448,3233456639,US 3233456640,3233457151,CA 3233457152,3233458687,US 3233458688,3233458943,HU -3233458944,3233459199,BG -3233459200,3233484799,US +3233458944,3233459007,BG +3233459008,3233484799,US 3233484800,3233487359,ES 3233487360,3233487871,US 3233487872,3233488895,CA @@ -67000,10 +69602,11 @@ 3233564416,3233564671,AU 3233564672,3233564927,US 3233564928,3233566719,JP -3233567744,3233568767,JP +3233567744,3233567999,US +3233568000,3233568767,JP 3233568768,3233569791,AU 3233569792,3233570047,JP -3233570048,3233570559,US +3233570048,3233570815,US 3233570816,3233571071,GB 3233571072,3233572095,US 3233572096,3233572351,AU @@ -67031,7 +69634,7 @@ 3233583360,3233583615,NL 3233583616,3233584895,US 3233584896,3233585151,AU -3233585152,3233586175,US +3233585152,3233586431,US 3233586432,3233586943,GB 3233586944,3233588223,US 3233588224,3233589247,GA @@ -67055,18 +69658,19 @@ 3233608192,3233609727,HU 3233609728,3233611775,US 3233612032,3233612287,NL -3233612544,3233613823,US +3233612288,3233613823,US 3233613824,3233614847,GB -3233615104,3233615359,US +3233614848,3233615359,US 3233615360,3233615615,NL -3233615616,3233617151,US +3233615616,3233617407,US 3233617408,3233617663,CA 3233617664,3233617919,NL 3233617920,3233618175,AU -3233618432,3233620479,US +3233618176,3233620479,US 3233620480,3233620735,AU 3233620736,3233620991,US 3233620992,3233622015,CA +3233622016,3233622271,US 3233622272,3233622527,NL 3233622528,3233624831,US 3233624832,3233625343,NL @@ -67096,6 +69700,7 @@ 3233649664,3233649919,AU 3233649920,3233650431,US 3233650432,3233650687,NL +3233650688,3233651199,US 3233651200,3233651455,NL 3233651456,3233651967,US 3233651968,3233652223,NL @@ -67112,8 +69717,7 @@ 3233668864,3233669119,AU 3233669120,3233670399,US 3233670400,3233670655,AU -3233671168,3233675263,US -3233675520,3233676031,US +3233671168,3233676031,US 3233676032,3233676287,NL 3233676288,3233684991,US 3233684992,3233685247,MX @@ -67322,8 +69926,8 @@ 3234227712,3234228223,US 3234228224,3234228351,CA 3234228352,3234230015,US -3234230016,3234230271,ES -3234230272,3234232319,US +3234230016,3234230207,ES +3234230208,3234232319,US 3234232320,3234232575,EG 3234232576,3234238975,US 3234238976,3234239231,MY @@ -67401,8 +70005,7 @@ 3234752000,3234752255,AU 3234752256,3234753535,US 3234753536,3234753791,AU -3234753792,3234754047,US -3234754560,3234755839,US +3234753792,3234755839,US 3234755840,3234756095,AU 3234756096,3234762751,US 3234762752,3234764799,CA @@ -67598,7 +70201,7 @@ 3236200448,3236233215,MY 3236233216,3236237567,US 3236237568,3236237936,EU -3236237937,3236238591,US +3236237937,3236239359,US 3236239360,3236241407,CA 3236241408,3236291071,US 3236291072,3236291327,GB @@ -67621,8 +70224,7 @@ 3236384000,3236384255,AU 3236384256,3236385279,US 3236385280,3236385535,NL -3236385536,3236385791,US -3236386304,3236387071,US +3236385536,3236387071,US 3236387072,3236387327,CA 3236387328,3236387839,US 3236387840,3236389375,PR @@ -67664,7 +70266,7 @@ 3236425216,3236427519,US 3236427520,3236427775,CA 3236427776,3236428031,AU -3236428800,3236429311,US +3236428288,3236429311,US 3236429312,3236429567,MU 3236429824,3236438015,US 3236446208,3236447487,US @@ -67697,7 +70299,7 @@ 3236638720,3236642815,BB 3236642816,3236659199,US 3236659200,3236691967,CA -3236691968,3236694271,US +3236691968,3236695039,US 3236695040,3236696063,CA 3236696064,3236757503,US 3236757504,3236765695,CA @@ -67747,12 +70349,16 @@ 3237050368,3237051903,US 3237051904,3237052159,TR 3237052160,3237052287,CA -3237052288,3237154815,US +3237052288,3237125295,US +3237125296,3237125311,CR +3237125312,3237154815,US 3237154816,3237155839,ES 3237155840,3237156863,AU 3237156864,3237182463,US 3237182464,3237183487,NL -3237183488,3237216255,US +3237183488,3237205247,US +3237205504,3237206015,CA +3237206016,3237216255,US 3237216256,3237281791,JP 3237281792,3237284607,US 3237284608,3237284863,AU @@ -67783,8 +70389,9 @@ 3237320704,3237320959,UA 3237320960,3237321471,US 3237321472,3237321727,AU -3237321728,3237321983,US -3237322752,3237325055,US +3237321728,3237322751,US +3237322752,3237323263,CA +3237323264,3237325055,US 3237325056,3237325311,NL 3237325312,3237325823,US 3237325824,3237326079,CA @@ -67832,7 +70439,7 @@ 3237576704,3237609471,CA 3237609472,3237613567,US 3237613568,3237614591,CA -3237615104,3237615615,US +3237614592,3237615615,US 3237615616,3237616895,CA 3237617152,3237622015,US 3237622016,3237622271,AP @@ -67840,7 +70447,9 @@ 3237634602,3237634603,EU 3237634604,3237647103,US 3237647104,3237647359,AU -3237647360,3237681663,US +3237647360,3237655039,US +3237655040,3237655551,IN +3237655552,3237681663,US 3237681664,3237682943,CA 3237682944,3237684991,US 3237684992,3237685247,CL @@ -67860,6 +70469,7 @@ 3237724928,3237725183,AU 3237725184,3237725439,CA 3237725440,3237725695,US +3237725696,3237726207,CA 3237726464,3237726719,AU 3237726720,3237726975,GH 3237726976,3237727231,US @@ -67873,12 +70483,14 @@ 3237781504,3237785599,CA 3237785600,3237797887,US 3237797888,3237801983,CA -3237801984,3237857535,US +3237801984,3237858303,US 3237858304,3237863423,CA 3237863424,3237867519,US 3237867520,3237867775,HK 3237867776,3237868031,GB -3237868032,3237869311,US +3237868032,3237868159,US +3237868160,3237868287,AU +3237868288,3237869311,US 3237869312,3237869439,KR 3237869440,3237869567,JP 3237869568,3237869823,AU @@ -68001,36 +70613,33 @@ 3238541568,3238541823,PL 3238541824,3238542591,CH 3238542592,3238542847,PL -3238542848,3238543103,CH 3238543360,3238545407,CH 3238545920,3238546431,RU 3238546432,3238546943,CH 3238546944,3238547455,UA -3238548480,3238548991,CH 3238548992,3238549503,CZ -3238549504,3238559231,CH +3238549504,3238557695,CH 3238559232,3238559487,SE -3238559744,3238562559,CH +3238559744,3238562303,CH 3238562560,3238562815,IR 3238562816,3238573567,CH 3238573568,3238574079,PL -3238574080,3238574591,CH 3238575104,3238575615,DE 3238575616,3238578431,CH 3238578432,3238578687,UA -3238578688,3238578943,CH 3238578944,3238579199,RU 3238579200,3238579455,CH -3238580224,3238589951,CH +3238580224,3238588415,CH +3238589696,3238589951,CH 3238589952,3238590207,LT -3238590208,3238590719,CH +3238590464,3238590719,CH 3238590976,3238591231,SA 3238591232,3238592511,CH 3238592512,3238594559,GB 3238594560,3238595583,BE 3238595584,3238595839,SI 3238595840,3238596095,EU -3238596096,3238596607,GB +3238596096,3238596351,GB 3238596608,3238596863,BG 3238596864,3238597119,RU 3238597120,3238597375,DE @@ -68193,7 +70802,6 @@ 3239120896,3239121663,DE 3239121664,3239121919,FR 3239121920,3239123967,DE -3239124992,3239127039,DE 3239127296,3239127551,PL 3239127552,3239127807,IL 3239127808,3239128063,RU @@ -68376,7 +70984,6 @@ 3239506432,3239506687,RU 3239506688,3239506943,GB 3239507200,3239507455,GB -3239507456,3239507967,DE 3239507968,3239508223,BG 3239508224,3239508479,SA 3239508480,3239508735,NO @@ -68555,7 +71162,8 @@ 3239740416,3239740671,DK 3239740928,3239741183,UA 3239741184,3239741439,RU -3239741440,3239759871,DE +3239741440,3239744511,DE +3239747584,3239759871,DE 3239760128,3239760383,UA 3239761408,3239761663,RU 3239761920,3239762175,BG @@ -68705,14 +71313,13 @@ 3239899136,3239901695,DE 3239901696,3239901951,BG 3239901952,3239902207,DE -3239902464,3239902719,RU 3239902720,3239902975,EE 3239903232,3239904255,DE 3239904512,3239904767,GB 3239905536,3239905791,DE 3239907328,3239907583,UA 3239908096,3239908351,RU -3239908352,3239910399,DE +3239908864,3239910399,DE 3239912960,3239913215,DE 3239913216,3239913471,LT 3239914240,3239914495,DE @@ -68749,7 +71356,6 @@ 3239968512,3239968767,PL 3239968768,3239969023,NO 3239969536,3239970047,DE -3239970816,3239971839,DE 3239972864,3239974911,DE 3239974912,3239975935,GB 3239975936,3239976191,RO @@ -68790,7 +71396,7 @@ 3240034560,3240035327,DE 3240036096,3240037375,DE 3240037888,3240038143,AT -3240038400,3240040447,DE +3240038912,3240039423,DE 3240049664,3240050687,DE 3240054784,3240058879,DE 3240067072,3240083455,DE @@ -68829,7 +71435,9 @@ 3240116224,3240116479,DE 3240116480,3240116735,DK 3240116736,3240117247,GB -3240117248,3240118271,EU +3240117248,3240117260,EU +3240117261,3240117261,UA +3240117262,3240118271,EU 3240118272,3240120319,ES 3240120320,3240120831,IR 3240120832,3240121343,GB @@ -69164,7 +71772,8 @@ 3240595456,3240607743,GB 3240609792,3240611839,DE 3240611840,3240613887,GB -3240615936,3240622079,GB +3240615936,3240620031,GB +3240621824,3240622079,GB 3240622080,3240622591,RU 3240622848,3240623103,GB 3240624128,3240689663,EE @@ -69198,7 +71807,6 @@ 3240710912,3240711167,FR 3240711168,3240711679,IT 3240711680,3240711935,RU -3240711936,3240712191,DE 3240712192,3240712447,UA 3240712448,3240712703,SI 3240712704,3240712959,CH @@ -69249,7 +71857,6 @@ 3240742656,3240742911,AT 3240742912,3240743423,IL 3240743424,3240743935,PL -3240743936,3240744447,DE 3240744448,3240744959,SE 3240744960,3240745471,RO 3240745472,3240745983,UA @@ -69433,12 +72040,11 @@ 3241078016,3241078271,PL 3241078272,3241078527,ES 3241078528,3241078783,DE -3241078784,3241082879,AT +3241080832,3241082879,AT 3241082880,3241083135,FR 3241083136,3241084927,CH 3241084928,3241085183,AP 3241085184,3241091071,CH -3241099264,3241100287,CH 3241101056,3241101311,DK 3241101312,3241101567,RO 3241101568,3241101823,DE @@ -69521,7 +72127,6 @@ 3241499648,3241499903,BE 3241499904,3241500159,DE 3241500160,3241500671,GB -3241500672,3241501439,BE 3241501440,3241501440,GB 3241501441,3241501695,EU 3241501696,3241501696,GB @@ -69530,21 +72135,18 @@ 3241503232,3241503487,RS 3241503488,3241508095,BE 3241508096,3241508351,NL -3241508352,3241508607,BE 3241508864,3241539839,BE -3241540864,3241541119,BE 3241541376,3241541631,PL 3241541632,3241689087,FR 3241693184,3241699327,FR 3241699840,3241700095,SE 3241700352,3241721855,FR 3241722112,3241722367,FR -3241724160,3241724415,FR 3241724416,3241724671,RU -3241724672,3241724927,FR 3241725952,3241742335,FR 3241743360,3241743615,DE -3241744128,3241763071,FR +3241744384,3241745407,FR +3241746432,3241763071,FR 3241763072,3241763327,DE 3241764864,3241803775,FR 3241803776,3241803823,CY @@ -69557,7 +72159,6 @@ 3241822208,3241824255,CZ 3241824256,3241840639,BE 3241841664,3241842175,BE -3241842688,3241843455,BE 3241843456,3241843711,CH 3241843712,3241848831,BE 3241852928,3241854463,SK @@ -69678,7 +72279,6 @@ 3243565056,3243569151,GB 3243570432,3243570687,CZ 3243570688,3243570943,PL -3243571456,3243571711,CZ 3243571968,3243572223,GR 3243572224,3243572479,CZ 3243572992,3243573247,RU @@ -69916,7 +72516,6 @@ 3244862720,3244862975,RO 3244862976,3244863231,DE 3244863232,3244863487,GB -3244863488,3244863743,KZ 3244863744,3244863999,RU 3244864000,3244864255,UA 3244864256,3244864511,GB @@ -70015,7 +72614,6 @@ 3244890880,3244891135,RU 3244891392,3244891647,PL 3244891648,3244891903,UA -3244891904,3244892159,RO 3244892160,3244892415,PL 3244892416,3244892671,NL 3244892672,3244892927,ES @@ -70064,7 +72662,6 @@ 3244904448,3244904703,GR 3244904960,3244905215,BY 3244905216,3244905471,MD -3244905472,3244905727,GB 3244905728,3244905983,GR 3244905984,3244906239,AT 3244906240,3244906495,DE @@ -70127,7 +72724,6 @@ 3244922368,3244922623,GB 3244922880,3244923135,UA 3244923136,3244923391,AT -3244923392,3244923647,EU 3244923648,3244923903,LV 3244923904,3244924159,RU 3244924160,3244924927,CZ @@ -70182,7 +72778,6 @@ 3244938752,3244939007,AT 3244939008,3244939263,NL 3244939264,3244939519,UA -3244939520,3244939775,FR 3244939776,3244940031,GB 3244940032,3244940287,UA 3244940288,3244940543,DK @@ -70221,8 +72816,7 @@ 3244951552,3244952575,FI 3244952576,3244953599,GB 3244953600,3244954623,DE -3244955648,3244956671,UA -3244956672,3244957695,LT +3244955648,3244957695,UA 3244958720,3244959743,FR 3244959744,3244960767,RU 3244960768,3244961791,RO @@ -71090,7 +73684,7 @@ 3248603136,3248603391,BG 3248603392,3248603647,RU 3248603648,3248604159,NO -3248606208,3248619519,NO +3248606976,3248619519,NO 3248619520,3248624383,DK 3248624384,3248624639,US 3248624640,3248624895,DK @@ -71295,9 +73889,7 @@ 3249279744,3249279999,EU 3249280000,3249313279,NL 3249313280,3249313535,EU -3249313536,3249369855,NL -3249369856,3249370111,EU -3249370112,3249405951,NL +3249313536,3249405951,NL 3249405952,3249521279,DE 3249521280,3249521343,UA 3249521344,3249537023,DE @@ -71315,8 +73907,6 @@ 3249574912,3249590527,NL 3249590528,3249590783,FR 3249592320,3249598463,NL -3249598976,3249599743,NL -3249600000,3249600255,NL 3249600256,3249600511,AT 3249600512,3249601535,UA 3249601536,3249601791,RU @@ -71328,7 +73918,7 @@ 3249677056,3249677311,SE 3249678336,3249678847,IE 3249679104,3249679359,CH -3249679360,3249682431,IE +3249681664,3249681919,IE 3249683456,3249684479,SE 3249684480,3249696767,IE 3249697280,3249697535,IE @@ -71408,7 +73998,8 @@ 3249829888,3249830143,GB 3249830144,3249830399,SE 3249830400,3249830655,IT -3249830656,3249844479,SE +3249830656,3249830911,DK +3249830912,3249844479,SE 3249844480,3249844735,AT 3249844736,3249844991,AU 3249844992,3249845759,SE @@ -71431,7 +74022,9 @@ 3249863680,3249863935,ES 3249863936,3249865471,SE 3249865472,3249865727,GB -3249865728,3249868543,SE +3249865728,3249868031,SE +3249868032,3249868287,DK +3249868288,3249868543,SE 3249868544,3249868799,DE 3249868800,3249869823,NL 3249869824,3249871103,SE @@ -71442,13 +74035,16 @@ 3249872384,3249872639,GB 3249872640,3249910271,SE 3249910272,3249910783,NL -3249910784,3249926143,SE +3249910784,3249924607,SE +3249924608,3249924863,NO +3249924864,3249926143,SE 3249926144,3249926399,AU 3249926400,3249926655,SE 3249926656,3249926911,BE 3249926912,3249929471,SE 3249929472,3249929983,CA -3249929984,3249931263,SE +3249929984,3249930239,NO +3249930240,3249931263,SE 3249931264,3249931775,NL 3249931776,3249932287,SE 3249932288,3249934335,US @@ -71557,7 +74153,8 @@ 3250245632,3250245887,TR 3250245888,3250246143,AT 3250246144,3250246399,GB -3250246656,3250257663,AT +3250246656,3250257151,AT +3250257408,3250257663,AT 3250257664,3250257919,PL 3250257920,3250258175,EU 3250258432,3250271231,AT @@ -71581,7 +74178,6 @@ 3250324992,3250325247,AE 3250325248,3250325503,MA 3250326528,3250327039,BH -3250327040,3250327295,SA 3250331648,3250335743,MT 3250335744,3250339839,KW 3250339840,3250348031,JO @@ -71636,7 +74232,8 @@ 3250413568,3250414079,UA 3250414080,3250414591,RO 3250414592,3250415103,SE -3250415104,3250415615,NL +3250415104,3250415359,NL +3250415360,3250415615,PL 3250415616,3250416127,FR 3250416128,3250417663,DE 3250417664,3250418175,IT @@ -71737,7 +74334,7 @@ 3250750464,3250750537,FR 3250750538,3250750541,EU 3250750542,3250751487,FR -3250751488,3250751999,DE +3250751488,3250751743,DE 3250752000,3250752511,CH 3250752512,3250753023,BG 3250753536,3250754047,DE @@ -71814,7 +74411,6 @@ 3251142144,3251142655,RO 3251142656,3251142911,DE 3251142912,3251143167,RU -3251143168,3251143423,AM 3251143424,3251143679,LV 3251143680,3251143935,NL 3251143936,3251144191,PL @@ -72003,7 +74599,7 @@ 3251216256,3251216383,RU 3251216384,3251216639,GB 3251216640,3251216895,RO -3251216896,3251217151,BE +3251216896,3251217151,NL 3251217152,3251217407,GB 3251217408,3251217663,PL 3251217664,3251217919,SI @@ -72046,8 +74642,7 @@ 3251256832,3251257343,GB 3251257344,3251259903,BE 3251260416,3251261439,FR -3251261440,3251264255,CH -3251264256,3251265535,FR +3251263488,3251265535,FR 3251265536,3251267839,NL 3251267840,3251268351,GB 3251268352,3251268607,NL @@ -72073,7 +74668,6 @@ 3251302400,3251306239,LI 3251306240,3251306495,EU 3251306496,3251307007,AT -3251307520,3251307775,MK 3251307776,3251308031,GB 3251308032,3251308543,RS 3251311104,3251311615,RS @@ -72296,7 +74890,6 @@ 3252518912,3252527103,NL 3252527104,3252535295,BE 3252541952,3252542207,CI -3252542208,3252542719,BE 3252543488,3252551679,BE 3252551680,3252563967,CH 3252563968,3252564479,RU @@ -72330,7 +74923,7 @@ 3252587264,3252587519,AT 3252587520,3252587775,UA 3252587776,3252588031,SE -3252588032,3252599807,CH +3252588544,3252599807,CH 3252600320,3252600575,NL 3252600576,3252600831,RU 3252600832,3252616703,CH @@ -72342,13 +74935,14 @@ 3252636672,3252636927,TR 3252636928,3252637183,DE 3252637184,3252637695,GB -3252637696,3252642303,CH +3252637696,3252641791,CH 3252642304,3252642559,UA 3252642560,3252642815,DK 3252642816,3252643071,NL 3252643072,3252643327,RO 3252643328,3252643583,CH -3252643840,3252682751,CH +3252645120,3252645375,CH +3252645888,3252682751,CH 3252682752,3252813823,HU 3252813824,3252830207,RO 3252830208,3252830719,MD @@ -72413,7 +75007,8 @@ 3252944896,3252945151,AT 3252945152,3252945407,GB 3252945408,3252945663,UA -3252945920,3252977663,AT +3252945920,3252947455,AT +3252948992,3252977663,AT 3252980992,3252981247,GB 3252981248,3252981503,RU 3252981504,3252981759,SE @@ -72429,16 +75024,20 @@ 3252984832,3252985087,FR 3252985088,3252985343,SE 3252985344,3252985855,RU -3252985856,3252989183,AT +3252988416,3252988927,AT 3252989440,3252989695,PL -3252989952,3252995071,AT +3252989952,3252994303,AT 3252995072,3252996095,CH -3252996096,3253004799,AT +3252996096,3253002239,AT +3253003008,3253003263,AT +3253004288,3253004799,AT 3253004800,3253005055,CZ 3253005056,3253006335,AT 3253006336,3253010431,DE 3253010432,3253075967,FI -3253075968,3253207039,RO +3253075968,3253139455,RO +3253139456,3253139711,MD +3253139712,3253207039,RO 3253207040,3253270527,RU 3253270528,3253271551,BY 3253271552,3253338111,RU @@ -72476,7 +75075,9 @@ 3253405564,3253405564,EU 3253405565,3253409791,SE 3253409792,3253410047,GB -3253410048,3253412351,SE +3253410048,3253411839,SE +3253411840,3253412095,US +3253412096,3253412351,SE 3253412352,3253412607,US 3253412608,3253416447,SE 3253416448,3253416703,GB @@ -72509,7 +75110,13 @@ 3253453568,3253454079,SE 3253454080,3253454335,GB 3253454336,3253454591,EU -3253454592,3253460735,SE +3253454592,3253454847,SE +3253454848,3253454848,NL +3253454849,3253455615,SE +3253455616,3253455871,US +3253455872,3253456383,SE +3253456384,3253456639,US +3253456640,3253460735,SE 3253460736,3253460991,IT 3253460992,3253461759,SE 3253461760,3253462015,PL @@ -72698,7 +75305,9 @@ 3253765280,3253765295,NL 3253765296,3253765311,BE 3253765312,3253765375,TR -3253765376,3253767615,GB +3253765376,3253766463,GB +3253766464,3253766527,NL +3253766528,3253767615,GB 3253767616,3253767675,IE 3253767676,3253767679,DE 3253767680,3253767711,GB @@ -73143,19 +75752,19 @@ 3254962381,3254962381,NL 3254962382,3254962421,FR 3254962422,3254962422,NL -3254962423,3255119871,FR +3254962423,3255117823,FR 3255120640,3255120895,DE -3255120896,3255121919,FR -3255123200,3255123711,FR +3255121664,3255121919,FR 3255123712,3255123967,DE 3255123968,3255124991,FR 3255126016,3255126527,FR 3255126528,3255127551,EU -3255127808,3255128575,FR +3255128064,3255128575,FR 3255129856,3255130111,HR -3255130112,3255169023,FR +3255130112,3255130623,FR +3255132160,3255160831,FR +3255166976,3255169023,FR 3255172352,3255172607,DE -3255172608,3255173119,FR 3255173120,3255173631,GB 3255173632,3255173647,EU 3255173648,3255173711,GB @@ -73407,7 +76016,8 @@ 3255544576,3255544831,AT 3255544832,3255558143,CH 3255558400,3255558655,UA -3255558912,3255563263,CH +3255558912,3255559679,CH +3255560192,3255563263,CH 3255563776,3255564031,CH 3255564032,3255564287,RU 3255565312,3255565955,DE @@ -73421,16 +76031,25 @@ 3255599104,3255615487,CH 3255615488,3255623679,DE 3255623680,3255631871,BG -3255631872,3255660287,NL +3255631872,3255659519,NL +3255659776,3255660031,NL 3255660288,3255660543,GR 3255660544,3255666175,NL 3255666432,3255666687,DE -3255667712,3255697407,NL +3255668224,3255697407,NL 3255697408,3255699711,SE 3255699712,3255699967,EU -3255699968,3255710719,SE +3255699968,3255704575,SE +3255704576,3255705087,FR +3255705088,3255710719,SE 3255710720,3255710975,ES -3255710976,3255724543,SE +3255710976,3255716351,SE +3255716352,3255716863,CH +3255716864,3255719167,SE +3255719168,3255719423,NO +3255719424,3255719679,SE +3255719680,3255719935,IT +3255719936,3255724543,SE 3255724544,3255725055,US 3255725056,3255725311,ES 3255725312,3255730943,SE @@ -73443,7 +76062,8 @@ 3255745536,3255745791,DK 3255745792,3255752959,SE 3255752960,3255753215,LI -3255753216,3255762943,SE +3255753216,3255762431,SE +3255762432,3255762943,BE 3255762944,3255771135,DE 3255779328,3255791615,DE 3255791616,3255792639,UA @@ -73452,9 +76072,10 @@ 3255794944,3255795711,RU 3255795712,3255798783,DE 3255799040,3255799295,SE -3255799296,3255800575,DE +3255799296,3255800319,DE 3255800576,3255800831,UA -3255800832,3255817215,DE +3255800832,3255801855,DE +3255802880,3255817215,DE 3255817216,3255817471,SE 3255817472,3255817727,ES 3255817728,3255820287,DE @@ -73512,7 +76133,8 @@ 3256489472,3256489983,GR 3256489984,3256490239,BE 3256490496,3256490751,CH -3256490752,3256524287,NL +3256491008,3256491263,NL +3256492032,3256524287,NL 3256524288,3256524799,DE 3256524800,3256549375,NL 3256549376,3256614911,TR @@ -73659,11 +76281,10 @@ 3256898048,3256898303,GB 3256898560,3256899071,TR 3256899072,3256899583,RU -3256905216,3256905471,GB -3256909824,3256915455,GB 3256915456,3256915711,RS 3256915712,3256915967,SE -3256918016,3256944639,GB +3256918016,3256934399,GB +3256942592,3256944639,GB 3256945408,3256945663,GB 3256945664,3256945919,SI 3256945920,3256946175,GB @@ -73671,7 +76292,7 @@ 3256946432,3256946687,UA 3256946944,3256947199,EU 3256947200,3256947711,DE -3256947712,3256958975,GB +3256948736,3256958975,GB 3256958976,3256959999,RO 3256960000,3256960255,SA 3256960256,3256960511,HU @@ -73719,7 +76340,6 @@ 3257059328,3257065471,GB 3257073664,3257092351,GB 3257092608,3257092863,RO -3257092864,3257093119,GB 3257093888,3257098239,GB 3257106432,3257139199,GB 3257139200,3257139455,DK @@ -73731,7 +76351,7 @@ 3257144576,3257144831,GB 3257144832,3257145087,FR 3257145088,3257145343,GB -3257147392,3257180159,GB +3257151488,3257180159,GB 3257180160,3257180415,TR 3257180416,3257180671,RU 3257180672,3257180927,EE @@ -73740,7 +76360,6 @@ 3257181440,3257181695,PL 3257181696,3257181951,FR 3257182208,3257182463,PL -3257184256,3257186303,GB 3257192448,3257196543,GB 3257196544,3257200639,LU 3257200640,3257204735,GB @@ -73749,7 +76368,6 @@ 3257229312,3257268223,AT 3257268224,3257268479,UA 3257268480,3257268735,SE -3257268992,3257269247,AT 3257269248,3257269503,IT 3257269504,3257269759,AT 3257270016,3257270271,DE @@ -73766,9 +76384,8 @@ 3257372672,3257382911,DE 3257382912,3257383167,NL 3257383168,3257383679,DE -3257383936,3257389055,DE +3257383936,3257385983,DE 3257390592,3257390847,DE -3257391104,3257391615,DE 3257391616,3257391871,EU 3257391872,3257401343,DE 3257401344,3257453567,CH @@ -73786,9 +76403,7 @@ 3257472000,3257472511,SG 3257472512,3257475071,FI 3257476864,3257477119,DE -3257481216,3257481471,GB 3257481472,3257481727,DE -3257481728,3257481983,FI 3257482240,3257482751,GB 3257482752,3257483007,NL 3257483008,3257491455,CH @@ -73882,8 +76497,10 @@ 3257990656,3257990911,AT 3257991168,3258003967,DE 3258003968,3258004479,RU -3258004992,3258005503,DE -3258006528,3258021887,DE +3258004992,3258005247,DE +3258006528,3258015743,DE +3258019328,3258019583,DE +3258019840,3258021887,DE 3258021888,3258022911,RU 3258022912,3258023167,PL 3258023168,3258023423,DE @@ -74012,7 +76629,7 @@ 3258105600,3258105855,DE 3258105856,3258109951,CZ 3258109952,3258110207,DK -3258110208,3258110975,CZ +3258110464,3258110975,CZ 3258111232,3258111487,CZ 3258111488,3258111743,PL 3258111744,3258118399,CZ @@ -74035,7 +76652,7 @@ 3258297344,3258297599,BE 3258297600,3258298111,NL 3258298112,3258298367,GB -3258298368,3258318847,NL +3258302464,3258318847,NL 3258318848,3258320895,DE 3258320896,3258321919,GB 3258321920,3258322943,RU @@ -74072,17 +76689,17 @@ 3258428416,3258449919,DE 3258449920,3258486783,CH 3258486784,3258487807,LI -3258488832,3258503935,CH +3258488832,3258499071,CH +3258501120,3258503935,CH 3258503936,3258504191,PL -3258504192,3258504703,CH 3258504704,3258504959,DE 3258504960,3258505215,IL -3258505216,3258506495,CH +3258505728,3258506495,CH 3258506496,3258506751,DE -3258507008,3258515455,CH +3258507264,3258515455,CH 3258515456,3258580991,FR 3258580992,3258646527,RU -3258646528,3258689535,DE +3258646528,3258688511,DE 3258689792,3258690047,DE 3258690560,3258690815,EU 3258690816,3258691583,DE @@ -74133,7 +76750,7 @@ 3258776064,3258776319,GE 3258776320,3258776575,PL 3258776576,3258777599,UA -3258777600,3258789887,GB +3258785792,3258789887,GB 3258789888,3258790911,CZ 3258790912,3258792191,RU 3258792192,3258792447,PL @@ -74144,10 +76761,11 @@ 3258794496,3258794751,PL 3258794752,3258795007,RU 3258795008,3258796031,PL -3258797568,3258802175,GB +3258797568,3258798079,GB +3258801152,3258802175,GB 3258802176,3258806271,LU 3258808832,3258809343,GB -3258812416,3258813439,GB +3258814464,3258816511,GB 3258818048,3258818303,SE 3258818560,3258843135,GB 3258843136,3258843391,RU @@ -74158,13 +76776,14 @@ 3258849280,3258859519,GB 3258859520,3258859775,BY 3258859776,3258860031,GB -3258860288,3258900479,GB -3258901504,3258902783,GB +3258860544,3258900479,GB +3258902528,3258902783,GB 3258903040,3258903295,FR 3258903296,3258903551,GB 3258903552,3258903807,DE 3258903808,3258904063,AT -3258904064,3258941439,GB +3258904064,3258904575,GB +3258908672,3258941439,GB 3258941440,3258943487,PL 3258943488,3258944511,BG 3258944512,3258945535,RU @@ -74200,9 +76819,13 @@ 3259252480,3259252735,EU 3259252736,3259258623,SE 3259258624,3259258879,ES -3259258880,3259262719,SE +3259258880,3259260927,SE +3259260928,3259261183,DK +3259261184,3259262719,SE 3259262720,3259262975,DK -3259262976,3259276287,SE +3259262976,3259265023,SE +3259265024,3259265535,DE +3259265536,3259276287,SE 3259276288,3259276543,ES 3259276544,3259280639,SE 3259280640,3259280895,US @@ -74251,7 +76874,9 @@ 3259435264,3259435519,IT 3259435520,3259438079,SE 3259438080,3259438335,ES -3259438336,3259454719,SE +3259438336,3259438591,SE +3259438592,3259439103,NO +3259439104,3259454719,SE 3259454720,3259454975,EU 3259454976,3259457279,SE 3259457280,3259457535,IT @@ -74263,23 +76888,29 @@ 3259479808,3259480063,DK 3259480064,3259480831,SE 3259480832,3259481087,ES -3259481088,3259490303,SE +3259481088,3259484671,SE +3259484672,3259485183,ES +3259485184,3259490303,SE 3259490304,3259490815,IN 3259490816,3259491071,SE 3259491072,3259491327,LI -3259491328,3259498495,SE +3259491328,3259495935,SE +3259495936,3259496447,DK +3259496448,3259498495,SE 3259498496,3259541503,GB 3259541504,3259543551,NL 3259543552,3259760639,GB -3259760640,3259814399,DE +3259760640,3259811839,DE +3259813888,3259814399,DE 3259814400,3259814655,AT -3259814656,3259821055,DE +3259814656,3259817983,DE +3259819008,3259821055,DE 3259821824,3259822079,AT 3259822592,3259823103,DE 3259823104,3259823615,RO 3259823616,3259823871,NO 3259823872,3259824127,IE -3259825152,3259825663,DE +3259825408,3259825663,DE 3259826176,3259891711,DE 3259891712,3259893503,BE 3259893504,3259893759,EU @@ -74413,10 +77044,12 @@ 3261213696,3261239237,FR 3261239238,3261239238,EU 3261239239,3261267967,FR -3261267968,3261280512,DE +3261267968,3261278207,DE +3261280256,3261280512,DE 3261280513,3261280513,EU 3261280514,3261280767,DE -3261281280,3261297663,DE +3261281280,3261296639,DE +3261296896,3261297151,DE 3261297664,3261297919,RU 3261297920,3261298175,PL 3261298176,3261333503,DE @@ -74429,7 +77062,9 @@ 3261532416,3261532671,GB 3261532672,3261532927,SE 3261532928,3261533183,GB -3261533184,3261534207,SE +3261533184,3261533439,SE +3261533440,3261533695,US +3261533696,3261534207,SE 3261534208,3261534463,NL 3261534464,3261534719,SE 3261534720,3261534975,US @@ -74669,15 +77304,15 @@ 3262185472,3262200319,DE 3262200576,3262200831,EU 3262200832,3262201087,DE -3262201856,3262224383,DE +3262201856,3262222335,DE +3262223360,3262223871,DE 3262224896,3262225151,AT 3262226432,3262227455,DE 3262227712,3262227967,RO -3262227968,3262228223,DE 3262228480,3262228735,DE -3262228992,3262229247,DE 3262229248,3262229503,NL -3262229504,3262283775,DE +3262229760,3262230015,DE +3262230528,3262283775,DE 3262283776,3262284799,RU 3262284800,3262285823,UA 3262286848,3262287871,SE @@ -74903,7 +77538,7 @@ 3262840320,3262906367,NL 3262906368,3262954495,CH 3262954496,3262955519,LI -3262955520,3262964991,CH +3262955520,3262964735,CH 3262964992,3262965247,DE 3262965248,3262971903,CH 3262971904,3263029247,IE @@ -74999,11 +77634,16 @@ 3263138560,3263138815,AT 3263138816,3263168511,DE 3263168512,3263430655,GB -3263430656,3263436543,SE +3263430656,3263433471,SE +3263433472,3263433727,NO +3263433728,3263436543,SE 3263436544,3263436799,ES -3263436800,3263443455,SE +3263436800,3263438591,SE +3263438592,3263438847,IT +3263438848,3263443455,SE 3263443456,3263443967,NL -3263443968,3263446527,SE +3263443968,3263446271,SE +3263446272,3263446527,CH 3263446528,3263447039,DE 3263447040,3263458047,SE 3263458048,3263458303,DE @@ -75012,13 +77652,31 @@ 3263459840,3263460095,SE 3263460096,3263460351,GB 3263460352,3263469567,SE -3263469568,3263470591,SG +3263469568,3263469663,SG +3263469664,3263469695,US +3263469696,3263469855,SG +3263469856,3263469887,US +3263469888,3263470591,SG 3263470592,3263475711,SE -3263475712,3263476735,JP +3263475712,3263476159,JP +3263476160,3263476191,GB +3263476192,3263476255,JP +3263476256,3263476287,GB +3263476288,3263476415,JP +3263476416,3263476479,GB +3263476480,3263476671,JP +3263476672,3263476703,GB +3263476704,3263476735,JP 3263476736,3263478527,SE 3263478528,3263478783,ES 3263478784,3263480831,SE -3263480832,3263481855,JP +3263480832,3263481343,JP +3263481344,3263481359,GB +3263481360,3263481455,JP +3263481456,3263481471,GB +3263481472,3263481487,JP +3263481488,3263481503,GB +3263481504,3263481855,JP 3263481856,3263482879,SE 3263482880,3263483903,GB 3263483904,3263496191,SE @@ -75182,8 +77840,7 @@ 3264345088,3264346111,NL 3264346112,3264347135,SE 3264347136,3264348159,DE -3264348160,3264356351,FR -3264356608,3264356863,FR +3264352256,3264356351,FR 3264357632,3264357887,DE 3264359936,3264360191,FR 3264360448,3264369151,FR @@ -75233,23 +77890,27 @@ 3264430592,3264430847,CH 3264431104,3264431615,LI 3264431616,3264431871,CH -3264432128,3264440831,CH +3264432128,3264440575,CH 3264441344,3264441599,PL -3264442368,3264446463,CH +3264442368,3264442879,CH 3264447488,3264447743,CH 3264447744,3264447999,DE 3264448000,3264448511,CH -3264449536,3264452607,CH -3264454656,3264457471,CH +3264449536,3264450559,CH +3264452352,3264452607,CH +3264454656,3264455679,CH +3264456704,3264457215,CH 3264457472,3264457727,AT -3264457728,3264463871,CH +3264457984,3264458239,CH +3264458752,3264463871,CH 3264463872,3264466943,LI 3264466944,3264475391,CH 3264476416,3264476671,CH 3264476672,3264477183,RU 3264477184,3264477439,PL 3264477440,3264477695,RU -3264477952,3264544767,CH +3264478720,3264478975,CH +3264479232,3264544767,CH 3264544768,3264556799,HU 3264556800,3264557055,BG 3264557056,3264557823,HU @@ -75436,7 +78097,6 @@ 3264847488,3264847615,RU 3264847616,3264847679,PL 3264847680,3264847743,FI -3264847808,3264847871,SE 3264847872,3264849919,DE 3264849920,3264850431,GB 3264850688,3264850943,LV @@ -75463,19 +78123,23 @@ 3264921600,3264929791,LU 3264929792,3264937983,SK 3264937984,3265003519,GB -3265003520,3265015807,DE +3265003520,3265005567,DE +3265007616,3265009663,DE +3265009664,3265009919,FR +3265009920,3265010175,DE +3265011712,3265015807,DE 3265015808,3265016063,EU 3265016064,3265018879,DE 3265018880,3265019903,HK 3265036288,3265044479,DE 3265044736,3265044991,DE 3265045760,3265046015,TR -3265046016,3265046271,DE 3265046528,3265048575,DE 3265050624,3265052671,DE -3265053696,3265054719,DE +3265053696,3265054207,DE 3265055232,3265055743,FR -3265055744,3265069055,DE +3265056256,3265056511,DE +3265056768,3265069055,DE 3265069056,3265134591,FI 3265134592,3265134863,CH 3265134864,3265134879,BE @@ -75594,12 +78258,12 @@ 3265825024,3265867775,GB 3265868288,3265868543,GB 3265868800,3265869055,DE -3265869312,3265869823,GB -3265871872,3265886207,GB +3265871872,3265875967,GB +3265880064,3265886207,GB 3265887232,3265887487,GB 3265887488,3265887743,PT 3265887744,3265888255,PL -3265888256,3265902335,GB +3265888256,3265901567,GB 3265902336,3265902591,FR 3265904384,3265904639,RO 3265904640,3265904895,DE @@ -75726,13 +78390,9 @@ 3266510848,3266543615,ES 3266543616,3266576383,IT 3266576384,3266616575,DE -3266617088,3266617279,DE 3266617328,3266617343,GB -3266617344,3266634271,DE -3266634368,3266634383,DE +3266617344,3266633727,DE 3266634392,3266634399,EE -3266634400,3266634431,DE -3266634496,3266634751,DE 3266635776,3266641919,DE 3266641920,3266707455,PL 3266707456,3266772991,DK @@ -75846,7 +78506,9 @@ 3267549184,3267550207,DK 3267550208,3267559423,EU 3267559424,3267624959,DE -3267624960,3267628399,EU +3267624960,3267627407,EU +3267627408,3267627411,GB +3267627412,3267628399,EU 3267628400,3267628415,FR 3267628416,3267630079,EU 3267630080,3267631095,GB @@ -76409,7 +79071,8 @@ 3270443008,3270508543,DK 3270508544,3270639615,FI 3270639616,3270640127,PL -3270640128,3270642175,RU +3270640128,3270640383,RU +3270640640,3270642175,RU 3270642176,3270642687,NO 3270642688,3270643199,DE 3270643200,3270643711,RU @@ -76457,7 +79120,6 @@ 3270903808,3270905855,SE 3270905856,3270906111,EU 3270906112,3270909951,IT -3270909952,3270911743,DE 3270911840,3270911871,PL 3270911872,3270911935,DE 3270911936,3270911967,PL @@ -76469,7 +79131,7 @@ 3270921216,3270921471,DK 3270921472,3270921727,UA 3270921728,3270922239,GB -3270922240,3270924287,DE +3270923264,3270924287,DE 3270926336,3270926591,AT 3270926592,3270926847,CH 3270926848,3270927103,PL @@ -76657,7 +79319,6 @@ 3271916544,3271917311,UA 3271917312,3271925759,RU 3271925760,3271926015,DK -3271926016,3271926271,MD 3271926272,3271926527,RU 3271926528,3271926783,NL 3271926784,3271927295,SI @@ -77446,7 +80107,7 @@ 3273436672,3273437183,DE 3273437184,3273437695,RO 3273438208,3273438719,IL -3273438720,3273439231,RU +3273438720,3273439231,GB 3273439232,3273439743,RO 3273439744,3273440255,DE 3273440256,3273440767,RO @@ -78499,7 +81160,9 @@ 3276031480,3276031487,FR 3276031488,3276032311,GB 3276032312,3276032319,FR -3276032320,3276039263,GB +3276032320,3276036543,GB +3276036544,3276036607,FR +3276036608,3276039263,GB 3276039264,3276039279,FR 3276039280,3276040351,GB 3276040352,3276040367,FR @@ -78658,7 +81321,9 @@ 3276473304,3276473311,AT 3276473312,3276474879,EU 3276474880,3276474927,IT -3276474928,3276478063,EU +3276474928,3276477975,EU +3276477976,3276477983,NL +3276477984,3276478063,EU 3276478064,3276478095,CH 3276478096,3276485631,EU 3276485632,3276486655,GB @@ -78839,7 +81504,9 @@ 3276907520,3276907551,NL 3276907552,3276911167,GB 3276911168,3276911199,IT -3276911200,3276912207,GB +3276911200,3276911679,GB +3276911680,3276911711,IT +3276911712,3276912207,GB 3276912208,3276912215,IT 3276912216,3276912287,GB 3276912288,3276912319,IT @@ -79579,7 +82246,7 @@ 3279994368,3279994879,GB 3279994880,3280003071,CZ 3280003072,3280003583,BG -3280003584,3280004095,UA +3280003584,3280004095,GB 3280004096,3280004607,PL 3280004608,3280005119,UA 3280005120,3280005631,HU @@ -79786,7 +82453,9 @@ 3280928832,3280928847,RU 3280928848,3280928855,GB 3280928856,3280928863,RU -3280928864,3280955707,GB +3280928864,3280952783,GB +3280952784,3280952799,DE +3280952800,3280955707,GB 3280955708,3280955711,DE 3280955712,3280958919,GB 3280958920,3280958927,DE @@ -79934,7 +82603,9 @@ 3281387520,3281453055,PL 3281453056,3281518591,RU 3281518592,3281649663,GB -3281649664,3281715199,FR +3281649664,3281710335,FR +3281710336,3281710591,KP +3281710592,3281715199,FR 3281715200,3281780735,TR 3281780736,3281846271,FI 3281846272,3281911807,GB @@ -80140,7 +82811,8 @@ 3283248128,3283248639,DE 3283248640,3283249151,RO 3283249152,3283249663,UA -3283249664,3283250175,RO +3283249664,3283249919,MD +3283249920,3283250175,RO 3283250176,3283250687,RU 3283251200,3283251711,FR 3283251712,3283252223,PL @@ -80174,7 +82846,6 @@ 3283490560,3283490815,PL 3283491072,3283491327,TR 3283491328,3283491583,AT -3283491584,3283491839,RO 3283491840,3283492095,RU 3283492096,3283492351,AT 3283492352,3283492607,ES @@ -80633,7 +83304,6 @@ 3285115904,3285116415,SI 3285116416,3285116927,CZ 3285116928,3285117439,UA -3285117440,3285117951,RU 3285117952,3285118463,FR 3285118464,3285118975,UA 3285118976,3285119487,RU @@ -80871,12 +83541,11 @@ 3285912576,3285913647,EU 3285913648,3285913655,IE 3285913656,3285913703,GB -3285913704,3285913707,EU -3285913708,3285913711,FI +3285913704,3285913711,FI 3285913712,3285913863,GB 3285913864,3285913871,EU -3285913872,3285913887,GB -3285913888,3285917695,EU +3285913872,3285913903,GB +3285913904,3285917695,EU 3285917696,3285917703,GB 3285917704,3285917711,EU 3285917712,3285917807,GB @@ -80910,8 +83579,8 @@ 3285931544,3285935871,EU 3285935872,3285936127,GB 3285936128,3285936135,EU -3285936136,3285936143,FR -3285936144,3285939135,EU +3285936136,3285936147,FR +3285936148,3285939135,EU 3285939136,3285939175,GB 3285939176,3285939183,EU 3285939184,3285939191,GB @@ -80920,8 +83589,8 @@ 3285939760,3285939839,EU 3285939840,3285939967,GB 3285939968,3285940735,EU -3285940736,3285940743,IT -3285940744,3285941247,EU +3285940736,3285940767,IT +3285940768,3285941247,EU 3285941248,3285941503,ES 3285941504,3285949603,EU 3285949604,3285949607,CH @@ -81207,7 +83876,6 @@ 3286937600,3286937855,CH 3286937856,3286938111,RO 3286938112,3286938367,DE -3286938368,3286938623,ES 3286938624,3286938879,CH 3286939136,3286939391,RO 3286939392,3286939647,DE @@ -81416,7 +84084,7 @@ 3287640064,3287640575,PL 3287640576,3287641087,SI 3287641088,3287641599,EU -3287642112,3287642623,UA +3287642112,3287642623,GB 3287642624,3287643135,BE 3287643136,3287643647,IT 3287643648,3287644671,UA @@ -81488,8 +84156,7 @@ 3287706112,3287706623,RU 3287706624,3287707135,GB 3287707648,3287708159,BE -3287708160,3287708671,NL -3287708672,3287709183,EU +3287708160,3287709183,NL 3287709184,3287709695,RU 3287709696,3287710207,SE 3287710208,3287710719,RU @@ -81782,7 +84449,7 @@ 3288779008,3288779263,ZA 3288779264,3288779775,KE 3288779776,3288780799,NG -3288781824,3288782591,ZA +3288780800,3288782591,ZA 3288782592,3288782847,KE 3288783872,3288784127,KE 3288784128,3288784895,ZA @@ -81866,6 +84533,9 @@ 3289186304,3289212159,ZA 3289212160,3289212415,MZ 3289212416,3289212927,NG +3289212928,3289213183,ZM +3289213184,3289213439,TZ +3289213440,3289213951,ZA 3289214976,3289215231,NG 3289215232,3289217279,ZA 3289217280,3289217535,KE @@ -81901,7 +84571,10 @@ 3289248256,3289248511,NG 3289248512,3289248767,AO 3289248768,3289249023,EG +3289249024,3289249279,NG 3289249280,3289250815,ZA +3289251072,3289251327,EG +3289251328,3289251583,ZA 3289251840,3289319423,ZA 3289319424,3289319679,A2 3289319680,3289319935,ZA @@ -81939,7 +84612,9 @@ 3290031360,3290060287,ZA 3290060288,3290060543,SZ 3290060544,3290103807,ZA -3290103808,3290120191,CA +3290103808,3290110335,CA +3290110336,3290110367,US +3290110368,3290120191,CA 3290120192,3290128383,MU 3290128384,3290136575,ZW 3290136576,3290169343,NG @@ -81973,7 +84648,9 @@ 3290284032,3290288127,AO 3290288128,3290292223,NG 3290292224,3290296319,GH -3290296320,3290431487,ZA +3290296320,3290423295,ZA +3290423296,3290427391,NA +3290427392,3290431487,ZA 3290431488,3290433535,JM 3290439680,3290447871,TT 3290447872,3290456063,AR @@ -82006,10 +84683,10 @@ 3291078656,3291086847,DZ 3291086848,3291103231,PR 3291103232,3291123711,ZA -3291123712,3291127807,BG -3291127808,3291131903,ZA -3291131904,3291135999,BG -3291136000,3291148287,ZA +3291123712,3291135999,BG +3291136000,3291140095,ZA +3291140096,3291144191,BG +3291144192,3291148287,ZA 3291148288,3291152383,BG 3291152384,3291168767,ZA 3291168768,3291176959,TZ @@ -82162,6 +84839,7 @@ 3291548928,3291549183,MG 3291549184,3291549439,GH 3291549440,3291549695,UG +3291549696,3291549951,LR 3291611136,3291611391,ZA 3291742208,3292004351,US 3292004352,3292266495,SC @@ -82172,7 +84850,9 @@ 3300933632,3300950015,MU 3300953088,3300954111,MU 3300966400,3301113855,ZA -3301113856,3301146623,NG +3301113856,3301138431,NG +3301138432,3301140479,ZA +3301140480,3301146623,NG 3301146624,3301171199,ZA 3301171200,3301172223,IN 3301172224,3301175295,ZA @@ -82182,24 +84862,26 @@ 3301185536,3301187583,GB 3301187584,3301189631,FR 3301189632,3301191679,US -3301191680,3301191680,CA -3301191681,3301193727,SC +3301191680,3301193727,CA 3301193728,3301195775,JP 3301195776,3301197823,DE 3301197824,3301199871,GB 3301199872,3301201919,US -3301201920,3301203967,SC +3301201920,3301203967,NL 3301203968,3301204991,DK 3301204992,3301205247,SE 3301205248,3301206015,DK -3301206016,3301212159,SC -3301212160,3301214207,US +3301206016,3301208063,SC +3301208064,3301214207,US 3301214208,3301216255,SE 3301216256,3301220351,SC -3301220352,3301224447,SE -3301224448,3301228543,SC +3301220352,3301222399,SE +3301222400,3301224447,BE +3301224448,3301226495,SC +3301226496,3301228543,US 3301228544,3301230591,IE -3301230592,3301236735,SC +3301230592,3301232639,FI +3301232640,3301236735,SC 3301236736,3301238783,CA 3301238784,3301240831,US 3301240832,3301242879,SE @@ -82275,7 +84957,8 @@ 3302498304,3302502399,NA 3302502400,3302505471,AO 3302505472,3302506495,NA -3302506496,3302514687,MU +3302506496,3302508543,KE +3302508544,3302514687,MU 3302522880,3302523903,KE 3302523904,3302525951,ZA 3302525952,3302526975,EG @@ -82307,6 +84990,9 @@ 3302544640,3302544895,MU 3302544896,3302545151,GH 3302545152,3302545407,ZA +3302545408,3302545919,CD +3302545920,3302546431,TZ +3302546432,3302546943,SL 3302548480,3302548991,GH 3302548992,3302549503,ZA 3302549504,3302550015,KE @@ -82380,6 +85066,7 @@ 3302959360,3302959615,MG 3302959616,3302959871,TD 3302959872,3302960127,SC +3302960128,3302960383,LR 3302985728,3302987775,DJ 3304062976,3304456191,SC 3304456192,3304521727,NG @@ -82654,8 +85341,7 @@ 3322202112,3322203135,GB 3322203136,3322339583,US 3322339584,3322339839,GB -3322339840,3322353663,US -3322353664,3322354175,VI +3322339840,3322354175,US 3322354176,3322354431,JP 3322354432,3322609663,US 3322609664,3322610687,SA @@ -82917,9 +85603,7 @@ 3324943048,3324943055,CA 3324943056,3324980223,US 3324980224,3324981247,CA -3324981248,3324998399,US -3324998400,3324998655,A1 -3324998656,3325034495,US +3324981248,3325034495,US 3325034496,3325035519,NZ 3325035520,3325067263,US 3325067264,3325100287,CA @@ -82953,7 +85637,9 @@ 3325207808,3325207935,US 3325207936,3325208119,CA 3325208120,3325208123,US -3325208124,3325211419,CA +3325208124,3325208403,CA +3325208404,3325208407,US +3325208408,3325211419,CA 3325211420,3325211423,US 3325211424,3325211647,CA 3325211648,3325211775,US @@ -83362,9 +86048,7 @@ 3331102464,3331102719,CA 3331102720,3331194879,US 3331194880,3331260415,AU -3331260416,3331352575,US -3331352576,3331352831,A1 -3331352832,3331352919,US +3331260416,3331352919,US 3331352920,3331352920,A1 3331352921,3331353087,US 3331353088,3331353599,A1 @@ -83379,7 +86063,7 @@ 3331524608,3331527167,US 3331527168,3331527679,GB 3331527680,3331563519,US -3331563520,3331563775,CH +3331563520,3331563775,IN 3331563776,3331565567,US 3331565568,3331566079,CA 3331566080,3331632639,US @@ -83441,7 +86125,9 @@ 3332505344,3332505855,US 3332505856,3332508671,CA 3332508672,3332508927,US -3332508928,3332528127,CA +3332508928,3332525311,CA +3332525312,3332525823,US +3332525824,3332528127,CA 3332528128,3332529663,US 3332529664,3332554751,CA 3332554752,3332558847,US @@ -83689,7 +86375,8 @@ 3337682944,3337892607,US 3337892608,3337892671,HK 3337892672,3337893119,US -3337893120,3337893631,CN +3337893120,3337893375,CN +3337893376,3337893631,CA 3337893632,3337895679,US 3337895680,3337895935,CN 3337895936,3337900031,PR @@ -83697,13 +86384,13 @@ 3337948672,3337949183,CA 3337949184,3337957375,US 3337957376,3337958399,CA -3337958400,3337960447,US +3337958400,3337958783,US +3337958784,3337958784,CA +3337958785,3337960447,US 3337960448,3337961471,CA 3337961472,3337961727,US 3337961728,3337961983,CA -3337961984,3337963391,US -3337963392,3337963519,CA -3337963520,3337963639,US +3337961984,3337963639,US 3337963640,3337963647,CA 3337963648,3337964031,US 3337964032,3337964543,A2 @@ -83860,8 +86547,7 @@ 3339093504,3339094015,NL 3339094016,3339142655,US 3339142656,3339142911,NL -3339142912,3339146239,US -3339146752,3339147007,US +3339142912,3339147007,US 3339147008,3339147775,CA 3339147776,3339148031,MS 3339148032,3339153407,US @@ -83938,7 +86624,9 @@ 3340387328,3340388351,CA 3340388352,3340390399,US 3340390400,3340391423,CA -3340391424,3340429823,US +3340391424,3340418559,US +3340418560,3340419071,CA +3340419072,3340429823,US 3340429824,3340430079,PA 3340430080,3340452863,US 3340452864,3340453887,CA @@ -83954,14 +86642,15 @@ 3340584704,3340584959,KW 3340584960,3340664831,US 3340664832,3340665855,CA -3340665856,3340666879,US -3340668416,3340677119,US +3340668928,3340677119,US 3340677120,3340679167,CA 3340679168,3340694783,US 3340694784,3340695039,CA -3340695040,3340857343,US +3340695040,3340852479,US +3340852736,3340853247,CA +3340853248,3340857343,US 3340857344,3340858367,CA -3340859136,3340925567,US +3340858368,3340925567,US 3340925568,3340925575,DE 3340925576,3340925815,US 3340925816,3340925823,AU @@ -84090,7 +86779,9 @@ 3342603264,3342604799,US 3342604800,3342605311,CA 3342605312,3342605567,US -3342605568,3342663679,CA +3342605568,3342629631,CA +3342629632,3342629887,US +3342629888,3342663679,CA 3342663680,3342795007,US 3342795008,3342795263,AP 3342795264,3342831103,US @@ -84117,13 +86808,7 @@ 3343355904,3343364095,CA 3343364096,3343365631,US 3343365632,3343372543,CA -3343372800,3343378511,US -3343378512,3343378519,GB -3343378520,3343378535,US -3343378536,3343378543,GB -3343378544,3343378575,US -3343378576,3343378583,GB -3343378584,3343378823,US +3343372800,3343378823,US 3343378824,3343378839,SE 3343378840,3343379079,US 3343379080,3343379087,SE @@ -84322,7 +87007,9 @@ 3346327552,3346328575,CA 3346328576,3346329599,US 3346329600,3346330623,CA -3346330624,3346497535,US +3346330624,3346399231,US +3346399232,3346464767,FR +3346464768,3346497535,US 3346497536,3346498559,CA 3346498560,3346520063,US 3346520064,3346521087,CA @@ -84445,7 +87132,7 @@ 3350618112,3350619135,CA 3350619136,3350623231,US 3350623232,3350624255,CA -3350624256,3350626303,US +3350624256,3350625279,US 3350626304,3350628351,CA 3350628352,3350642687,US 3350642688,3350643711,TC @@ -84458,11 +87145,17 @@ 3350650880,3350790399,US 3350790400,3350814975,CA 3350814976,3350815231,US -3350815232,3350825727,CA +3350815232,3350823423,CA +3350823424,3350823935,US +3350823936,3350825727,CA 3350825728,3350825983,GB -3350825984,3350836223,CA +3350825984,3350834687,CA +3350834688,3350835199,US +3350835200,3350836735,CA 3350836736,3350836991,US -3350836992,3350843391,CA +3350836992,3350837247,CA +3350837248,3350837759,US +3350837760,3350843391,CA 3350843392,3350843647,US 3350843648,3350855679,CA 3350855680,3350862079,US @@ -84479,7 +87172,7 @@ 3351004160,3351005183,CA 3351005184,3351015423,US 3351015424,3351016447,CA -3351016448,3351028223,US +3351016448,3351027711,US 3351029760,3351030783,US 3351030784,3351031807,CA 3351031808,3351034879,US @@ -84505,7 +87198,9 @@ 3351112704,3351113727,CA 3351113728,3351129087,US 3351129088,3351130111,A2 -3351130112,3351232511,US +3351130112,3351196159,US +3351196160,3351196671,VG +3351196672,3351232511,US 3351232512,3351232767,IL 3351232768,3351275519,US 3351275520,3351276543,CA @@ -84648,8 +87343,9 @@ 3351524096,3351524351,GB 3351524352,3351642111,US 3351642112,3351695871,CA +3351695872,3351696383,US 3351696384,3351696639,CA -3351696640,3351696895,US +3351696640,3351697407,US 3351697408,3351698431,CA 3351698432,3351699199,US 3351699200,3351699455,CA @@ -84672,7 +87368,9 @@ 3351933952,3351939071,US 3351939072,3351959551,CA 3351959552,3351961599,US -3351961600,3351965695,CA +3351961600,3351963647,CA +3351963648,3351964159,US +3351964160,3351965695,CA 3351965696,3351969279,US 3351969280,3351969535,CA 3351969536,3351969791,US @@ -84767,7 +87465,9 @@ 3354686976,3354687231,CN 3354687232,3354687487,US 3354687488,3354688511,CA -3354688512,3354731018,US +3354688512,3354707455,US +3354707456,3354707967,CA +3354707968,3354731018,US 3354731019,3354731019,EU 3354731020,3354731519,US 3354731520,3354731775,AP @@ -84792,7 +87492,9 @@ 3355017216,3355052287,US 3355052288,3355053311,CA 3355053312,3355053567,US -3355054080,3355260927,US +3355054080,3355249151,US +3355249152,3355249663,CA +3355249664,3355260927,US 3355260928,3355262719,CA 3355262720,3355272189,US 3355272190,3355272190,EU @@ -84834,7 +87536,9 @@ 3355448832,3355449343,SX 3355449344,3355450367,CU 3355450368,3355451391,EC -3355451392,3355459327,BR +3355451392,3355458559,BR +3355458560,3355459071,HN +3355459072,3355459327,BR 3355459328,3355459583,EC 3355459584,3355459839,PA 3355459840,3355460095,VE @@ -84867,7 +87571,8 @@ 3355472640,3355473407,CL 3355473408,3355473919,PE 3355473920,3355475199,CL -3355475200,3355478015,MX +3355475200,3355477503,MX +3355477504,3355478015,BR 3355478016,3355478271,PE 3355478272,3355478783,US 3355478784,3355479039,VE @@ -84899,6 +87604,7 @@ 3355516928,3355525119,AR 3355525120,3355535359,CO 3355535360,3355537407,TT +3355537408,3355537663,BR 3355537664,3355537919,AR 3355538176,3355538431,CL 3355538432,3355539199,AR @@ -84992,7 +87698,7 @@ 3355843584,3355844863,EC 3355844864,3355845119,CL 3355845120,3355845375,EC -3355845376,3355848703,BR +3355845376,3355848959,BR 3355849728,3355849983,PA 3355849984,3355850495,CL 3355850496,3355850751,NI @@ -85010,7 +87716,7 @@ 3355885568,3355901951,GT 3355901952,3355902975,BR 3355902976,3355903999,CL -3355904000,3355905023,BR +3355904000,3355905535,BR 3355905536,3355905791,PY 3355905792,3355906047,AR 3355906048,3355910143,CL @@ -85028,20 +87734,19 @@ 3355949056,3355951103,CW 3355951104,3355967487,EC 3355967488,3356033023,VE -3356033280,3356033791,BR +3356033024,3356033791,BR 3356033792,3356034047,CL 3356034048,3356035071,PY 3356035072,3356037119,MX 3356037120,3356041215,CO 3356041216,3356049407,CR 3356049408,3356049663,CL -3356049664,3356050175,BR -3356050432,3356051455,BR +3356049664,3356051455,BR 3356051456,3356051711,CO 3356051712,3356051967,CL 3356051968,3356052223,GT 3356052224,3356052479,AR -3356052480,3356052735,BR +3356052480,3356053247,BR 3356053248,3356054015,CL 3356054016,3356054527,US 3356054528,3356057599,BR @@ -85112,7 +87817,13 @@ 3356102400,3356102655,PA 3356102656,3356105727,CL 3356105728,3356106751,SV -3356106752,3356113919,BR +3356106752,3356109263,BR +3356109264,3356109271,DE +3356109272,3356109495,BR +3356109496,3356109503,IT +3356109504,3356109687,BR +3356109688,3356109695,CA +3356109696,3356113919,BR 3356113920,3356114943,UY 3356114944,3356123135,PE 3356123136,3356131839,AR @@ -85500,16 +88211,14 @@ 3357556736,3357556991,VE 3357556992,3357557247,AR 3357557248,3357557759,MX -3357557760,3357558783,EC -3357558784,3357558895,AR -3357558896,3357558903,EC -3357558904,3357559039,AR -3357559040,3357559295,EC +3357557760,3357559295,EC 3357559296,3357559551,CA 3357559552,3357559807,US 3357559808,3357559935,AR 3357559936,3357560063,VE -3357560064,3357560199,AR +3357560064,3357560159,AR +3357560160,3357560167,VE +3357560168,3357560199,AR 3357560200,3357560207,VE 3357560208,3357560247,AR 3357560248,3357560255,VE @@ -85614,12 +88323,7 @@ 3358151272,3358151423,AR 3358151424,3358151551,EC 3358151552,3358151679,AR -3358151680,3358151807,PE -3358151808,3358151935,AR -3358151936,3358152191,PE -3358152192,3358152543,AR -3358152544,3358152575,PE -3358152576,3358152703,AR +3358151680,3358152703,PE 3358152704,3358152959,US 3358152960,3358153215,EC 3358153216,3358153279,AR @@ -85650,8 +88354,8 @@ 3358326784,3358392319,VE 3358392320,3358457855,AR 3358457856,3358523391,PA -3358523392,3358524159,VE -3358524160,3358524415,AR +3358523392,3358523903,VE +3358523904,3358524415,AR 3358524416,3358525951,VE 3358525952,3358526463,AR 3358526464,3358529535,VE @@ -85865,9 +88569,13 @@ 3360227328,3360228095,CO 3360228096,3360228991,CL 3360228992,3360229007,CO -3360229008,3360229023,US +3360229008,3360229012,US +3360229013,3360229013,CL +3360229014,3360229023,US 3360229024,3360231423,CO -3360231424,3360231935,CL +3360231424,3360231775,CL +3360231776,3360231807,US +3360231808,3360231935,CL 3360231936,3360232447,CO 3360232448,3360232703,CL 3360232704,3360235263,CO @@ -85987,8 +88695,8 @@ 3360701952,3360702207,CO 3360702208,3360705535,AR 3360705536,3360706047,US -3360706048,3360706815,AR -3360706816,3360707327,US +3360706048,3360707071,AR +3360707072,3360707327,US 3360707328,3360707583,AR 3360707584,3360708095,US 3360708096,3360708223,AR @@ -86150,7 +88858,9 @@ 3362552144,3362552159,PR 3362552160,3362553023,AR 3362553024,3362553039,PR -3362553040,3362553855,AR +3362553040,3362553247,AR +3362553248,3362553263,CO +3362553264,3362553855,AR 3362553856,3362557951,PY 3362557952,3362562047,AR 3362570240,3362586623,UY @@ -86158,9 +88868,7 @@ 3362652160,3362664447,PE 3362664448,3362668543,BO 3362668544,3362684927,EC -3362684928,3362687999,AR -3362688000,3362688511,CO -3362688512,3362688767,AR +3362684928,3362688767,AR 3362688768,3362689279,CO 3362689280,3362689311,AR 3362689312,3362690367,CO @@ -86281,7 +88989,9 @@ 3368052992,3368053247,PE 3368053760,3368086015,BR 3368086528,3368087551,CR -3368087552,3370188799,BR +3368087552,3368157183,BR +3368157184,3368173567,MX +3368173568,3370188799,BR 3370188800,3370196991,MX 3370196992,3370214399,BR 3370214400,3370215423,AR @@ -86293,13 +89003,14 @@ 3370506240,3370507263,VE 3370507264,3370514943,BR 3370515456,3370516479,AR -3370516480,3371106303,BR +3370516480,3370926079,BR +3370926080,3370942463,MX +3370942464,3371106303,BR 3371106304,3371122687,MX 3371122688,3378511871,BR 3378511872,3380506879,MX 3380506880,3380507135,BR 3380507136,3380744191,MX -3380744192,3380745215,CW 3380745216,3380746239,BR 3380746240,3380747263,PE 3380747264,3380748287,BR @@ -86335,6 +89046,7 @@ 3380825088,3380825343,MX 3380825344,3380825599,HT 3380825600,3380825855,CO +3380825856,3380826111,AR 3380826112,3380828159,BR 3380828160,3380828671,MX 3380828672,3380829183,CO @@ -86343,9 +89055,10 @@ 3380830464,3380830719,CO 3380830720,3380831231,PA 3380831232,3380831743,MX +3380831744,3380831999,AR 3380832000,3380832255,SR 3380832256,3380832767,MX -3380833024,3380833279,DO +3380832768,3380833279,DO 3380833280,3380833791,MX 3380833792,3380834303,SV 3380834304,3380834815,MX @@ -86494,7 +89207,7 @@ 3386474496,3386490879,UY 3386490880,3386499071,CO 3386499072,3386503167,AR -3386503168,3386504191,PE +3386503168,3386504191,CL 3386504192,3386505215,AR 3386505216,3386507263,CL 3386507264,3386523647,EC @@ -86562,21 +89275,7 @@ 3387424768,3387555839,CO 3387555840,3387568127,AR 3387568128,3387572223,PE -3387572224,3387572539,AR -3387572540,3387572543,CO -3387572544,3387573375,AR -3387573376,3387573887,CO -3387573888,3387574015,AR -3387574016,3387574143,CO -3387574144,3387574783,AR -3387574784,3387575039,CO -3387575040,3387575295,AR -3387575296,3387575423,CO -3387575424,3387575551,AR -3387575552,3387575567,CO -3387575568,3387575679,AR -3387575680,3387576063,CO -3387576064,3387576319,AR +3387572224,3387576319,CO 3387576320,3387578367,EC 3387578368,3387584511,AR 3387584512,3387588607,PE @@ -86761,7 +89460,6 @@ 3389326336,3389326847,TW 3389326848,3389327359,AU 3389327360,3389329407,TW -3389329408,3389333503,PH 3389333504,3389341695,BD 3389341696,3389345791,JP 3389345792,3389349887,TH @@ -86897,7 +89595,6 @@ 3389609472,3389609727,SG 3389609728,3389609983,AU 3389609984,3389610239,NZ -3389610496,3389610751,HK 3389610752,3389611519,IN 3389611520,3389612031,AU 3389612032,3389616127,MY @@ -86908,7 +89605,7 @@ 3389661184,3389669375,ID 3389669376,3389673471,CN 3389673472,3389677567,AU -3389677568,3389685759,JP +3389677568,3389681663,JP 3389685760,3389718527,AU 3389718528,3389784063,JP 3389784064,3389784319,NZ @@ -87215,7 +89912,6 @@ 3391725568,3391733759,TH 3391733760,3391734015,CN 3391734016,3391734783,AU -3391735808,3391736831,JP 3391736832,3391737855,IN 3391737856,3391741951,JP 3391741952,3391746047,IN @@ -87241,7 +89937,6 @@ 3391837184,3391838207,AU 3391838208,3391838719,ID 3391838720,3391838975,IN -3391838976,3391839231,AU 3391839232,3391840255,ID 3391840256,3391841279,JP 3391841280,3391842303,MY @@ -87364,7 +90059,9 @@ 3392114432,3392114687,KR 3392114688,3392118783,GU 3392118784,3392126975,MY -3392126976,3392135167,ID +3392126976,3392130303,ID +3392130304,3392130815,TW +3392130816,3392135167,ID 3392135168,3392143359,TH 3392143360,3392208895,JP 3392208896,3392286975,NZ @@ -87452,7 +90149,9 @@ 3392499712,3392503807,JP 3392503808,3392507903,HK 3392512000,3392516095,BD -3392516096,3392524287,AU +3392516096,3392519167,AU +3392519168,3392519679,NZ +3392519680,3392524287,AU 3392524288,3392528383,JP 3392528384,3392536575,ID 3392536576,3392602111,IN @@ -88048,7 +90747,6 @@ 3394953216,3394957311,CN 3394957312,3394959359,AU 3394959360,3394960383,HK -3394960384,3394961407,PH 3394961408,3394962431,CN 3394962432,3394963455,AU 3394963456,3394965503,ID @@ -88354,7 +91052,6 @@ 3397738496,3397742591,MY 3397742592,3397746687,JP 3397746688,3397763071,TH -3397763072,3397771263,PH 3397771264,3397779455,TW 3397779456,3397781503,ID 3397781504,3397783551,BD @@ -88723,9 +91420,7 @@ 3399999488,3400000475,SG 3400000476,3400000479,US 3400000480,3400000487,AU -3400000488,3400002303,SG -3400002304,3400002367,HK -3400002368,3400006143,SG +3400000488,3400006143,SG 3400006144,3400006399,AP 3400006400,3400007679,SG 3400007680,3400024063,AU @@ -88857,9 +91552,9 @@ 3400648816,3400648831,HK 3400648832,3400649943,SG 3400649944,3400649951,HK -3400649952,3400650143,SG -3400650144,3400650159,HK -3400650160,3400650751,SG +3400649952,3400650409,SG +3400650410,3400650410,AU +3400650411,3400650751,SG 3400650752,3400654847,AU 3400654848,3400663039,IN 3400663040,3400683519,MY @@ -89246,9 +91941,7 @@ 3406454528,3406454783,CN 3406454784,3406462207,AU 3406462208,3406462463,CN -3406462464,3406512383,AU -3406512384,3406512639,IN -3406512640,3406513663,AU +3406462464,3406513663,AU 3406513664,3406513919,CN 3406513920,3406514175,AU 3406514176,3406514431,IN @@ -90253,7 +92946,8 @@ 3407938560,3407938815,CN 3407938816,3407939327,AU 3407939328,3407939583,CN -3407939584,3407941631,HK +3407939584,3407940607,SG +3407940608,3407941631,HK 3407941632,3407942911,AU 3407942912,3407943167,CN 3407943168,3407944191,AU @@ -90652,12 +93346,11 @@ 3411149312,3411149823,MV 3411149824,3411150847,IN 3411150848,3411154943,HK -3411154944,3411156991,JP 3411156992,3411161087,PH 3411161088,3411165183,PK 3411165184,3411173375,MY 3411173376,3411177471,AU -3411177472,3411189759,JP +3411181568,3411189759,JP 3411189760,3411197951,AU 3411197952,3411202047,BD 3411202048,3411204607,AU @@ -90934,7 +93627,9 @@ 3413344256,3413360639,PH 3413360640,3413377023,MY 3413377024,3413387519,SG -3413387520,3413387775,AP +3413387520,3413387695,AP +3413387696,3413387711,SG +3413387712,3413387775,AP 3413387776,3413437951,SG 3413437952,3413438207,AP 3413438208,3413524479,SG @@ -91191,7 +93886,6 @@ 3416262656,3416264703,AU 3416264704,3416268799,JP 3416268800,3416272895,HK -3416272896,3416274943,MN 3416274944,3416276991,ID 3416276992,3416285183,HK 3416285184,3416287231,VN @@ -91216,7 +93910,6 @@ 3416342528,3416371199,AU 3416371200,3416371711,PH 3416371712,3416371967,VN -3416371968,3416372223,IN 3416372224,3416372479,CN 3416372480,3416372735,AP 3416372736,3416372991,AU @@ -91411,7 +94104,6 @@ 3417946112,3417946137,AU 3417946138,3417946138,HK 3417946139,3417947135,AU -3417947136,3417947391,IN 3417947648,3417947903,AU 3417947904,3417948159,IN 3417948160,3417964543,AU @@ -91483,9 +94175,9 @@ 3418282240,3418282495,AU 3418282496,3418283519,PH 3418283520,3418284031,AU -3418284032,3418286975,SG -3418286976,3418287007,AU -3418287008,3418288127,SG +3418284032,3418286079,SG +3418286080,3418287103,AU +3418287104,3418288127,SG 3418288128,3418290175,ID 3418290176,3418290431,IN 3418290432,3418290687,CN @@ -91496,8 +94188,7 @@ 3418292992,3418293503,HK 3418293760,3418294015,AU 3418294272,3418296319,VN -3418296320,3418297343,HK -3418297344,3418298367,CN +3418296320,3418298367,CN 3418298368,3418299391,HK 3418299392,3418300415,CN 3418300416,3418300927,BD @@ -91523,7 +94214,9 @@ 3418393794,3418393794,JP 3418393795,3418393919,AP 3418393920,3418393927,AU -3418393928,3418399231,AP +3418393928,3418394367,AP +3418394368,3418394623,TW +3418394624,3418399231,AP 3418399232,3418399247,PH 3418399248,3418401455,AP 3418401456,3418401459,TW @@ -91606,10 +94299,11 @@ 3419353088,3419354111,JP 3419354112,3419356159,ID 3419356160,3419356671,NZ -3419356672,3419357183,IN +3419356672,3419356927,IN 3419357184,3419411455,CN 3419411456,3419411711,HK 3419411712,3419411967,NZ +3419411968,3419412223,PH 3419412224,3419412479,JP 3419412480,3419414527,PH 3419414528,3419422719,CN @@ -91812,8 +94506,7 @@ 3423474688,3423478783,US 3423479808,3423481855,A2 3423481856,3423487999,US -3423488000,3423489023,CA -3423489024,3423490047,A1 +3423488000,3423490047,CA 3423490048,3423493631,US 3423493632,3423493887,RU 3423493888,3423533055,US @@ -92329,9 +95022,7 @@ 3432133888,3432134143,GB 3432134144,3432205311,US 3432205312,3432206335,CA -3432206336,3432253695,US -3432253696,3432253951,CA -3432253952,3432265983,US +3432206336,3432265983,US 3432265984,3432267263,DE 3432267264,3432280063,US 3432280064,3432280319,GB @@ -92341,17 +95032,15 @@ 3432329216,3432330239,DE 3432330240,3432361983,US 3432361984,3432366079,DE -3432366080,3432476415,US -3432476416,3432476671,DE -3432476672,3432493823,US -3432493824,3432495103,DE -3432495104,3432517119,US +3432366080,3432517119,US 3432517120,3432517631,MU 3432517632,3432570879,US 3432570880,3432572927,HK 3432572928,3432585215,US 3432585216,3432585727,MX -3432585728,3432613631,US +3432585728,3432606463,US +3432606464,3432606719,GB +3432606720,3432613631,US 3432613632,3432613887,CA 3432613888,3432660991,US 3432660992,3432663039,DE @@ -92601,12 +95290,9 @@ 3448380416,3448380671,SG 3448380672,3448380839,US 3448380840,3448380847,SG -3448380848,3448380943,US -3448380944,3448380959,SG -3448380960,3448381183,US +3448380848,3448381183,US 3448381184,3448381439,SG -3448381440,3448381695,GB -3448381696,3448398335,US +3448381440,3448398335,US 3448398336,3448399103,CA 3448399104,3448399359,US 3448399360,3448399871,CA @@ -92711,7 +95397,9 @@ 3449254144,3449254911,US 3449254912,3449273599,CA 3449273600,3449273855,US -3449273856,3449290495,CA +3449273856,3449278975,CA +3449278976,3449279487,US +3449279488,3449290495,CA 3449290496,3449575423,US 3449575424,3449575679,AU 3449575680,3449582848,US @@ -92742,9 +95430,7 @@ 3449974784,3449976831,CA 3449976832,3449994239,US 3449994240,3449994495,MX -3449994496,3450085375,US -3450085376,3450085631,A1 -3450085632,3450086143,US +3449994496,3450086143,US 3450086144,3450086655,CH 3450086656,3450088191,US 3450088192,3450088447,CH @@ -92775,15 +95461,13 @@ 3450685184,3450685439,CA 3450685440,3450699007,US 3450699008,3450699263,CA -3450699776,3450731519,US +3450699264,3450731519,US 3450731520,3450732543,CA 3450732544,3450773503,US -3450773504,3450774783,CA -3450774784,3450775039,US -3450775040,3450777599,CA +3450773504,3450777599,CA 3450777600,3450849791,US 3450849792,3450850047,EU -3450850048,3450851839,US +3450850048,3450852351,US 3450852352,3450853375,CA 3450853376,3450935551,US 3450935552,3450935807,AP @@ -92803,9 +95487,10 @@ 3451507200,3451507711,BR 3451507712,3451715839,US 3451715840,3451724543,CA -3451724544,3451724799,US -3451725312,3451725567,US -3451725568,3451737343,CA +3451724544,3451725567,US +3451725568,3451726847,CA +3451726848,3451727359,US +3451727360,3451737343,CA 3451737344,3451737599,US 3451737600,3451740927,CA 3451740928,3451741183,US @@ -92868,7 +95553,9 @@ 3452678144,3452678399,EU 3452678400,3452715007,US 3452715008,3452723199,CA -3452723200,3452764671,US +3452723200,3452730623,US +3452730624,3452730879,HK +3452730880,3452764671,US 3452764672,3452765183,CA 3452765184,3452765439,US 3452765440,3452765951,CA @@ -93005,7 +95692,9 @@ 3452920832,3452923391,US 3452923392,3452931327,CA 3452931328,3452931583,US -3452931584,3452934911,CA +3452931584,3452933119,CA +3452933120,3452933631,US +3452933632,3452934911,CA 3452934912,3452936191,US 3452936192,3452938751,CA 3452938752,3452939023,US @@ -93491,8 +96180,8 @@ 3459620864,3459622911,US 3459624960,3459629055,BM 3459629056,3459686399,US -3459686400,3459687167,NL -3459687168,3459731455,US +3459686400,3459688447,NL +3459688448,3459731455,US 3459731456,3459735551,CA 3459735552,3459745535,US 3459745536,3459745791,IT @@ -93791,7 +96480,19 @@ 3464173824,3464174591,CA 3464175104,3464175359,US 3464175360,3464180735,CA -3464180736,3464204799,US +3464180736,3464200703,US +3464200704,3464200959,AU +3464200960,3464201215,NZ +3464201216,3464201471,JP +3464201472,3464201727,GR +3464201728,3464201983,EG +3464201984,3464202239,ES +3464202240,3464202495,CA +3464202496,3464202751,FR +3464202752,3464203007,IT +3464203008,3464203263,SE +3464203264,3464203519,DE +3464203520,3464204799,US 3464204800,3464205311,NL 3464205312,3464205567,SE 3464205568,3464205823,VE @@ -93830,10 +96531,9 @@ 3464394752,3464396799,LC 3464396800,3464421631,US 3464421632,3464421887,CA -3464422400,3464425983,US +3464421888,3464426495,US 3464426496,3464426751,GD -3464426752,3464427007,US -3464427520,3464548607,US +3464426752,3464548607,US 3464548608,3464548863,LC 3464548864,3464549119,KN 3464549120,3464549375,VG @@ -93844,13 +96544,17 @@ 3464550144,3464550399,LC 3464550400,3464626175,US 3464626176,3464626687,CA -3464626688,3464627199,US +3464626688,3464627711,US 3464627968,3464628735,CA 3464628736,3464628991,US 3464628992,3464630271,CA 3464630272,3464631295,US -3464631296,3464650751,CA -3464650752,3464664063,US +3464631296,3464642047,CA +3464642048,3464642559,US +3464642560,3464648703,CA +3464648704,3464649215,US +3464649216,3464650239,CA +3464650240,3464664063,US 3464664064,3464691711,CA 3464691712,3464740863,US 3464740864,3464744959,PH @@ -93932,9 +96636,7 @@ 3467051008,3467116543,CA 3467116544,3467378687,US 3467378688,3467444223,CA -3467444224,3467500799,US -3467500800,3467501055,A1 -3467501056,3467554815,US +3467444224,3467554815,US 3467554816,3467567103,CA 3467567104,3467706367,US 3467706368,3467902975,CA @@ -94069,11 +96771,7 @@ 3470131200,3470135295,AG 3470135296,3470137343,LC 3470137344,3470139391,VG -3470139392,3470148095,US -3470148096,3470148351,CA -3470148352,3470148607,US -3470148608,3470148863,CA -3470148864,3470151807,US +3470139392,3470151807,US 3470151808,3470151871,CA 3470151872,3470151935,US 3470151936,3470152191,EG @@ -94118,7 +96816,6 @@ 3470767872,3470768127,IE 3470768128,3470770175,CA 3470770176,3470778367,US -3470778368,3470786559,CA 3470786560,3470794751,US 3470794752,3470802943,PA 3470802944,3470884863,US @@ -94145,7 +96842,9 @@ 3471572992,3472375807,US 3472375808,3472392191,PR 3472392192,3472408575,CA -3472408576,3473039359,US +3472408576,3472721919,US +3472721920,3472723967,CA +3472723968,3473039359,US 3473039360,3473040639,BM 3473040640,3473040895,US 3473040896,3473041407,BM @@ -94439,19 +97138,7 @@ 3482017536,3482017791,CA 3482017792,3482018047,US 3482018048,3482018303,CA -3482018304,3482018583,US -3482018584,3482018591,CA -3482018592,3482018599,US -3482018600,3482018607,CA -3482018608,3482018655,US -3482018656,3482018671,CA -3482018672,3482018679,US -3482018680,3482018695,CA -3482018696,3482018711,US -3482018712,3482018719,CA -3482018720,3482018783,US -3482018784,3482018799,CA -3482018800,3482019327,US +3482018304,3482019327,US 3482019328,3482019583,CA 3482019584,3482020607,US 3482020608,3482020863,CA @@ -94483,9 +97170,7 @@ 3482037760,3482038015,CA 3482038016,3482038271,US 3482038272,3482038783,CA -3482038784,3482039039,US -3482039040,3482039295,CA -3482039296,3482039551,US +3482038784,3482039551,US 3482039552,3482040319,CA 3482040320,3482041087,US 3482041088,3482041343,CA @@ -94541,11 +97226,12 @@ 3484006912,3484007167,AU 3484007168,3484013055,US 3484013056,3484013567,DE -3484013568,3484319743,US -3484320256,3484320511,US +3484013568,3484320767,US 3484321792,3484322047,PR -3484322048,3484340223,US -3484340736,3484341247,US +3484322048,3484325887,US +3484326912,3484327423,US +3484327424,3484327935,CA +3484327936,3484341247,US 3484341248,3484342271,VG 3484342272,3484438527,US 3484438528,3484438783,ZM @@ -94637,7 +97323,10 @@ 3485327360,3485335551,CA 3485335552,3485462527,US 3485462528,3485464575,VC -3485464576,3485466623,LC +3485464576,3485464831,LC +3485464832,3485465599,VC +3485465600,3485466367,LC +3485466368,3485466623,VC 3485466624,3485597695,US 3485597696,3485695999,CA 3485696000,3485959423,US @@ -94856,9 +97545,7 @@ 3487216384,3487216639,SE 3487216640,3487236095,US 3487236096,3487301631,CA -3487301632,3487561471,US -3487561472,3487561727,AU -3487561728,3487706367,US +3487301632,3487706367,US 3487706368,3487706623,RU 3487706624,3487766527,US 3487766528,3487768575,CA @@ -95021,7 +97708,9 @@ 3492969728,3492994815,US 3492994816,3492995071,GB 3492995072,3493011327,US -3493011328,3493011455,GB +3493011328,3493011395,GB +3493011396,3493011396,US +3493011397,3493011455,GB 3493011456,3493029119,US 3493029120,3493029375,GB 3493029376,3493039359,US @@ -95171,9 +97860,7 @@ 3494627328,3494628351,BM 3494628352,3494651903,US 3494651904,3494652927,CA -3494652928,3494655743,US -3494655744,3494655759,GB -3494655760,3494660095,US +3494652928,3494660095,US 3494660096,3494661119,CA 3494661120,3494668287,US 3494668288,3494670335,CA @@ -95410,9 +98097,7 @@ 3497163168,3497163175,GB 3497163176,3497164799,US 3497164800,3497181183,CA -3497181184,3497233407,US -3497233408,3497233663,CN -3497233664,3497410559,US +3497181184,3497410559,US 3497410560,3497431039,CA 3497431040,3497447423,US 3497447424,3497451519,CA @@ -95471,20 +98156,13 @@ 3500126464,3500126719,GB 3500126720,3500351487,US 3500351488,3500359679,JM -3500359680,3500486655,US -3500486656,3500490751,CR -3500490752,3500613631,US +3500359680,3500613631,US 3500613632,3500614655,MZ 3500614656,3500689407,US 3500689408,3500689919,CL 3500689920,3500707327,US 3500707328,3500707839,CA -3500707840,3500724991,US -3500724992,3500725503,EC -3500725504,3500725759,HT -3500725760,3500726015,EC -3500726016,3500726271,HT -3500726272,3500728319,US +3500707840,3500728319,US 3500728320,3500736511,KY 3500736512,3500752895,US 3500752896,3500761087,KY @@ -95824,8 +98502,8 @@ 3509532672,3509532927,US 3509532928,3509533439,CA 3509533440,3509534719,US -3509534720,3509535487,CA -3509535488,3509535743,US +3509534720,3509535231,CA +3509535232,3509535743,US 3509535744,3509535999,CA 3509536000,3509536255,US 3509536256,3509536767,CA @@ -95855,11 +98533,7 @@ 3509551616,3509551871,CA 3509551872,3509552127,US 3509552128,3509552639,CA -3509552640,3509554311,US -3509554312,3509554319,CA -3509554320,3509554327,US -3509554328,3509554335,CA -3509554336,3509554431,US +3509552640,3509554431,US 3509554432,3509554959,CA 3509554960,3509555199,US 3509555200,3509555455,CA @@ -95875,34 +98549,20 @@ 3509560320,3509560831,US 3509560832,3509561087,CA 3509561088,3509561343,US -3509561344,3509561727,CA -3509561728,3509561743,US -3509561744,3509561791,CA -3509561792,3509561855,US +3509561344,3509561599,CA +3509561600,3509561855,US 3509561856,3509562623,CA 3509562624,3509563391,US -3509563392,3509563911,CA -3509563912,3509563919,US -3509563920,3509563935,CA -3509563936,3509563967,US -3509563968,3509564031,CA -3509564032,3509564095,US -3509564096,3509564127,CA -3509564128,3509564415,US -3509564416,3509564799,CA -3509564800,3509565183,US +3509563392,3509563903,CA +3509563904,3509564415,US +3509564416,3509564671,CA +3509564672,3509565183,US 3509565184,3509566463,CA 3509566464,3509567231,US 3509567232,3509569023,CA 3509569024,3509569535,US 3509569536,3509569791,CA -3509569792,3509571071,US -3509571072,3509571087,CA -3509571088,3509571215,US -3509571216,3509571223,CA -3509571224,3509571263,US -3509571264,3509571295,CA -3509571296,3509572351,US +3509569792,3509572351,US 3509572352,3509573375,CA 3509573376,3509573439,US 3509573440,3509573455,CA @@ -95912,27 +98572,17 @@ 3509574144,3509575679,CA 3509575680,3509575935,US 3509575936,3509576191,CA -3509576192,3509576447,US -3509576448,3509576703,CA -3509576704,3509576959,US +3509576192,3509576959,US 3509576960,3509577215,CA 3509577216,3509577983,US 3509577984,3509578239,CA -3509578240,3509578495,US -3509578496,3509578751,CA -3509578752,3509579007,US +3509578240,3509579007,US 3509579008,3509579263,CA 3509579264,3509579519,US 3509579520,3509579775,CA 3509579776,3509580031,US 3509580032,3509580287,CA -3509580288,3509580879,US -3509580880,3509580927,CA -3509580928,3509580943,US -3509580944,3509580951,CA -3509580952,3509580991,US -3509580992,3509581055,CA -3509581056,3509582335,US +3509580288,3509582335,US 3509582336,3509582847,CA 3509582848,3509583615,US 3509583616,3509583871,CA @@ -96016,13 +98666,9 @@ 3510935552,3510943743,CA 3510943744,3511140351,US 3511140352,3511156735,CA -3511156736,3511256063,US -3511256064,3511256319,A1 -3511256320,3511258367,US +3511156736,3511258367,US 3511258368,3511258623,A1 -3511258624,3511260927,US -3511260928,3511261183,A1 -3511261184,3511812095,US +3511258624,3511812095,US 3511812096,3511844863,CA 3511844864,3512012095,US 3512012096,3512012159,GB @@ -96228,9 +98874,7 @@ 3514723697,3514723697,BZ 3514723698,3514724635,US 3514724636,3514724636,UA -3514724637,3514732071,US -3514732072,3514732075,UA -3514732076,3514826751,US +3514724637,3514826751,US 3514826752,3514843135,CA 3514843136,3514993919,US 3514993920,3514993983,GB @@ -96241,11 +98885,14 @@ 3514994024,3514994049,GB 3514994050,3514994050,EU 3514994051,3514994175,GB -3514994176,3515222271,US +3514994176,3515211775,US +3515211776,3515219967,CA +3515219968,3515222271,US 3515222272,3515224831,TR 3515224832,3515301887,US 3515301888,3515318271,CA -3515318272,3515339519,US +3515318272,3515326463,US +3515334656,3515339519,US 3515339520,3515339775,A1 3515339776,3515358975,US 3515358976,3515359231,MX @@ -96328,9 +98975,7 @@ 3517389312,3517389567,CA 3517389568,3517389823,US 3517389824,3517391103,CA -3517391104,3517391119,US -3517391120,3517391123,CA -3517391124,3517391871,US +3517391104,3517391871,US 3517391872,3517392127,CA 3517392128,3517392383,US 3517392384,3517392639,CA @@ -96500,11 +99145,7 @@ 3518762496,3518762751,GB 3518762752,3518765311,US 3518765312,3518765567,CA -3518765568,3518905599,US -3518905600,3518905855,GB -3518905856,3518911743,US -3518911744,3518911999,GB -3518912000,3518912511,US +3518765568,3518912511,US 3518912512,3518912767,IN 3518912768,3518918143,US 3518918144,3518918399,IN @@ -96614,9 +99255,7 @@ 3521904640,3521921023,JM 3521921024,3521965055,US 3521965056,3521966079,DE -3521966080,3521989631,US -3521989632,3521989887,A2 -3521989888,3522101247,US +3521966080,3522101247,US 3522101248,3522109439,CA 3522109440,3522118143,US 3522118144,3522118655,GB @@ -96797,7 +99436,7 @@ 3528404992,3528407039,NZ 3528407040,3528409087,AU 3528409088,3528425471,CN -3528425472,3528445951,JP +3528441856,3528445951,JP 3528445952,3528450047,ID 3528450048,3528458239,CN 3528458240,3528474623,AP @@ -96826,7 +99465,9 @@ 3529089024,3529097215,KR 3529097216,3529113599,JP 3529113600,3531603967,KR -3531603968,3532929279,JP +3531603968,3532290815,JP +3532290816,3532291071,GB +3532291072,3532929279,JP 3532929280,3532929535,AP 3532929536,3534749695,JP 3534749696,3534757887,HK @@ -96920,7 +99561,9 @@ 3546808320,3547856895,KR 3547856896,3547916287,JP 3547916288,3547916543,US -3547916544,3548905471,JP +3547916544,3548208127,JP +3548208128,3548208639,US +3548208640,3548905471,JP 3548905472,3551002623,CN 3551002624,3556769791,KR 3556769792,3556773887,DE @@ -97100,11 +99743,11 @@ 3557998592,3558006783,DE 3558006784,3558010879,GB 3558010880,3558012927,FR -3558012928,3558013951,GB -3558013952,3558014207,IL +3558012928,3558014207,GB 3558014208,3558014463,NL 3558014464,3558014464,US -3558014465,3558014975,IL +3558014465,3558014719,IL +3558014720,3558014975,NL 3558014976,3558023167,RU 3558023168,3558031359,DE 3558031360,3558039551,GB @@ -97220,7 +99863,7 @@ 3558718208,3558718463,EU 3558718464,3558719487,NL 3558719488,3558735871,IL -3558735872,3558744063,GB +3558735872,3558744063,GG 3558744064,3558752255,LB 3558752256,3558760447,SI 3558760448,3558768639,FR @@ -97267,7 +99910,9 @@ 3559089936,3559089951,BE 3559089952,3559090239,GB 3559090240,3559090303,BE -3559090304,3559093311,GB +3559090304,3559092243,GB +3559092244,3559092244,BE +3559092245,3559093311,GB 3559093312,3559093319,BE 3559093320,3559093695,GB 3559093696,3559093703,BE @@ -97299,11 +99944,7 @@ 3559276544,3559284735,GB 3559284736,3559292927,RU 3559292928,3559301119,JO -3559301120,3559303103,GB -3559303104,3559303167,A1 -3559303168,3559303679,GB -3559303680,3559303871,A1 -3559303872,3559306576,GB +3559301120,3559306576,GB 3559306577,3559306577,AT 3559306578,3559309311,GB 3559309312,3559317503,PL @@ -97329,7 +99970,9 @@ 3559448576,3559456767,ES 3559456768,3559473151,RU 3559473152,3559489535,CH -3559489536,3559491759,GB +3559489536,3559491247,GB +3559491248,3559491263,NL +3559491264,3559491759,GB 3559491760,3559491767,NL 3559491768,3559505919,GB 3559505920,3559514111,CH @@ -97403,7 +100046,9 @@ 3560023632,3560023639,ES 3560023640,3560023791,GB 3560023792,3560023799,ES -3560023800,3560030095,GB +3560023800,3560025904,GB +3560025905,3560025905,ES +3560025906,3560030095,GB 3560030096,3560030103,ES 3560030104,3560046591,GB 3560046592,3560054783,BG @@ -97918,7 +100563,8 @@ 3563454464,3563462655,SA 3563462656,3563479039,IT 3563479040,3563487231,GB -3563487232,3563495423,RS +3563487232,3563491327,RS +3563491328,3563495423,BG 3563495424,3563503615,DE 3563503616,3563511807,GB 3563511808,3563519999,DE @@ -98087,17 +100733,9 @@ 3564756992,3564765183,ES 3564765184,3564773375,RU 3564773376,3564781567,DE -3564781568,3564782079,LT -3564782080,3564782335,US -3564782336,3564786175,LT -3564786176,3564786431,US -3564786432,3564786687,LT -3564786688,3564786943,US -3564786944,3564787199,LT -3564787200,3564787455,US +3564781568,3564787455,LT 3564787456,3564787583,NL -3564787584,3564787711,US -3564787712,3564789759,LT +3564787584,3564789759,LT 3564789760,3564797951,ES 3564797952,3564806143,DE 3564806144,3564814335,BG @@ -98198,11 +100836,9 @@ 3565684997,3565748223,NL 3565748224,3565752319,GB 3565752320,3565752447,EU -3565752448,3565752455,GB -3565752456,3565752463,EU -3565752464,3565752479,GB -3565752480,3565752535,EU -3565752536,3565752543,GB +3565752448,3565752479,GB +3565752480,3565752527,EU +3565752528,3565752543,GB 3565752544,3565752575,EU 3565752576,3565752839,GB 3565752840,3565752855,EU @@ -98248,23 +100884,11 @@ 3565755848,3565755855,EU 3565755856,3565755871,GB 3565755872,3565755879,EU -3565755880,3565755919,GB -3565755920,3565755927,EU -3565755928,3565755935,GB -3565755936,3565755943,EU -3565755944,3565755959,GB -3565755960,3565755967,EU -3565755968,3565755999,GB -3565756000,3565756007,EU -3565756008,3565756063,GB -3565756064,3565756071,EU -3565756072,3565756087,GB -3565756088,3565756095,EU -3565756096,3565756119,GB -3565756120,3565756135,EU -3565756136,3565756159,GB -3565756160,3565756287,EU -3565756288,3565760783,GB +3565755880,3565755903,GB +3565755904,3565756151,EU +3565756152,3565756159,GB +3565756160,3565756415,EU +3565756416,3565760783,GB 3565760784,3565760791,EU 3565760792,3565760799,GB 3565760800,3565760807,EU @@ -98652,9 +101276,7 @@ 3569075712,3569090559,GB 3569090560,3569123327,RU 3569123328,3569156095,GB -3569156096,3569156351,NL -3569156352,3569156607,EU -3569156608,3569157379,NL +3569156096,3569157379,NL 3569157380,3569157380,EU 3569157381,3569165311,NL 3569165312,3569165567,EU @@ -98802,7 +101424,9 @@ 3574136832,3574169599,DE 3574169600,3574174839,GB 3574174840,3574174847,ES -3574174848,3574186799,GB +3574174848,3574182904,GB +3574182905,3574182905,ES +3574182906,3574186799,GB 3574186800,3574186815,ES 3574186816,3574187007,GB 3574187008,3574188031,ES @@ -99173,7 +101797,9 @@ 3576100864,3576101375,EU 3576101376,3576110939,GB 3576110940,3576110943,NL -3576110944,3576134653,GB +3576110944,3576116127,GB +3576116128,3576116135,DE +3576116136,3576134653,GB 3576134654,3576134654,CH 3576134655,3576135679,GB 3576135680,3576168447,DE @@ -99303,7 +101929,9 @@ 3579193760,3579193775,NL 3579193776,3579197311,GB 3579197312,3579197439,US -3579197440,3579248639,GB +3579197440,3579244831,GB +3579244832,3579244879,AT +3579244880,3579248639,GB 3579248640,3579346943,RU 3579346944,3579362055,SE 3579362056,3579362063,NO @@ -99659,7 +102287,8 @@ 3583401984,3583410175,KE 3583410176,3583418367,SE 3583418368,3583426559,TN -3583426560,3583434751,CI +3583426560,3583428607,CV +3583428608,3583434751,CI 3583434752,3583442943,AT 3583442944,3583451135,RU 3583451136,3583459327,IL @@ -99743,8 +102372,7 @@ 3583950848,3583959039,PL 3583959040,3583967231,NO 3583967232,3583975423,NL -3583975424,3583983103,LT -3583983104,3583983231,US +3583975424,3583983231,LT 3583983232,3583983359,BR 3583983360,3583983615,LT 3583983616,3583999999,RU @@ -99863,6 +102491,7 @@ 3584827392,3584835583,ES 3584835584,3584843775,AZ 3584843776,3584851967,DE +3584851968,3584860159,ZA 3584860160,3584868351,PL 3584868352,3584876543,NO 3584876544,3584884735,SI @@ -100095,7 +102724,9 @@ 3586679600,3586679615,IT 3586679616,3586680511,FR 3586680512,3586680519,GB -3586680520,3586681615,FR +3586680520,3586681471,FR +3586681472,3586681487,GB +3586681488,3586681615,FR 3586681616,3586681631,CZ 3586681632,3586682239,FR 3586682240,3586682367,US @@ -100372,7 +103003,9 @@ 3589582976,3589583103,NL 3589583104,3589586943,GB 3589586944,3589587199,DE -3589587200,3589599231,RS +3589587200,3589587455,RS +3589587456,3589587967,CH +3589587968,3589599231,RS 3589599232,3589601279,SE 3589601280,3589603327,RS 3589603328,3589668863,FR @@ -100437,7 +103070,11 @@ 3590244352,3590244607,DE 3590244608,3590245311,FR 3590245312,3590245439,US -3590245440,3590247167,FR +3590245440,3590247048,FR +3590247049,3590247049,IT +3590247050,3590247103,FR +3590247104,3590247119,GB +3590247120,3590247167,FR 3590247168,3590247231,US 3590247232,3590247295,FR 3590247296,3590247423,US @@ -100445,7 +103082,9 @@ 3590247488,3590247551,US 3590247552,3590247711,FR 3590247712,3590247743,A1 -3590247744,3590251647,FR +3590247744,3590247759,FR +3590247760,3590247763,IE +3590247764,3590251647,FR 3590251648,3590251775,NL 3590251776,3590255871,FR 3590255872,3590255935,US @@ -100548,8 +103187,7 @@ 3624484864,3624529919,US 3624529920,3624534015,CA 3624534016,3624534271,PA -3624534272,3624536063,CA -3624536064,3624546559,US +3624534272,3624546559,US 3624546560,3624546815,A2 3624546816,3624547327,US 3624547328,3624548095,A2 @@ -100558,8 +103196,8 @@ 3624550144,3624587263,US 3624587264,3624591359,JM 3624591360,3624592383,US -3624592384,3624593407,CA -3624593408,3624714239,US +3624592384,3624593919,CA +3624594176,3624714239,US 3624714240,3624722431,SG 3624722432,3624730623,US 3624730624,3624796159,CA @@ -100581,8 +103219,7 @@ 3625168896,3625172991,CA 3625172992,3625256959,US 3625256960,3625257983,CA -3625258496,3625258751,US -3625259008,3625261055,US +3625257984,3625261055,US 3625263104,3625287679,US 3625287680,3625295871,CA 3625295872,3625346047,US @@ -100824,9 +103461,7 @@ 3630096128,3630096383,CA 3630096384,3630097151,US 3630097152,3630097663,CA -3630097664,3630099711,US -3630099712,3630099967,CA -3630099968,3630102783,US +3630097664,3630102783,US 3630102784,3630103807,CA 3630103808,3630104063,US 3630104064,3630104575,CA @@ -100899,9 +103534,7 @@ 3631284224,3631316991,CA 3631316992,3631333375,US 3631333376,3631341567,CA -3631341568,3631435007,US -3631435008,3631435263,GB -3631435264,3631644671,US +3631341568,3631644671,US 3631644672,3631652863,CA 3631652864,3631665151,US 3631665152,3631667199,CA @@ -100947,7 +103580,9 @@ 3632244224,3632244479,CA 3632244480,3632332799,US 3632332800,3632357375,CA -3632357376,3632381951,US +3632357376,3632376319,US +3632376320,3632377343,CA +3632377344,3632381951,US 3632381952,3632390143,CA 3632390144,3632414719,US 3632414720,3632422911,CA @@ -101062,11 +103697,7 @@ 3635159040,3635163135,CA 3635163136,3635171071,US 3635171072,3635171327,CA -3635171328,3635185407,US -3635185408,3635185663,A1 -3635185664,3635187199,US -3635187200,3635187455,A1 -3635187456,3635314687,US +3635171328,3635314687,US 3635314688,3635322879,CA 3635322880,3635466239,US 3635466240,3635470335,CA @@ -101456,7 +104087,9 @@ 3639704574,3639704574,GB 3639704575,3639730175,US 3639730176,3639734271,CA -3639734272,3639737343,US +3639734272,3639736575,US +3639736576,3639736831,HK +3639736832,3639737343,US 3639737344,3639737373,GB 3639737374,3639737374,FR 3639737375,3639737599,GB @@ -101476,9 +104109,7 @@ 3640312320,3640312575,NI 3640312576,3640312831,US 3640312832,3640313087,TO -3640313088,3640314879,US -3640314880,3640315135,A2 -3640315136,3640315391,US +3640313088,3640315391,US 3640315392,3640315647,TR 3640315648,3640316927,US 3640316928,3640317183,MX @@ -101496,10 +104127,10 @@ 3640430592,3640432639,DE 3640432640,3640433407,US 3640433408,3640433663,A2 -3640433664,3640436735,US +3640433664,3640438783,US 3640438784,3640442879,DE 3640442880,3640446975,US -3640446976,3640447999,CA +3640446976,3640449023,CA 3640449024,3640450047,A2 3640450048,3640451071,US 3640451072,3640459263,DE @@ -101748,7 +104379,9 @@ 3642224640,3642228735,SK 3642228736,3642232831,DE 3642232832,3642236927,RS -3642236928,3642241023,CH +3642236928,3642237263,CH +3642237264,3642237264,DE +3642237265,3642241023,CH 3642241024,3642245119,DE 3642245120,3642249215,LV 3642249216,3642253311,FR @@ -102245,7 +104878,9 @@ 3647987656,3647987695,DE 3647987696,3647987711,ES 3647987712,3647988735,IT -3647988736,3647989063,DE +3647988736,3647988999,DE +3647989000,3647989007,BE +3647989008,3647989063,DE 3647989064,3647989071,BE 3647989072,3647995903,DE 3647995904,3648004095,RU @@ -102258,10 +104893,7 @@ 3648020480,3648024575,IT 3648024576,3648028671,NL 3648028672,3648032767,HU -3648032768,3648033023,IE -3648033024,3648036095,EU -3648036096,3648036351,IE -3648036352,3648036863,EU +3648032768,3648036863,IE 3648036864,3648040959,CZ 3648040960,3648045055,BE 3648045056,3648049151,FI @@ -102585,7 +105217,9 @@ 3650879488,3650912255,RO 3650912256,3650915327,GB 3650915328,3650915583,FR -3650915584,3650920447,GB +3650915584,3650916393,GB +3650916394,3650916394,FR +3650916395,3650920447,GB 3650920448,3650920457,FR 3650920458,3650920458,GB 3650920459,3650920703,FR @@ -102818,9 +105452,7 @@ 3653410816,3653414911,CZ 3653414912,3653419007,IT 3653419008,3653423103,IL -3653423104,3653426687,GB -3653426688,3653426815,A1 -3653426816,3653427199,GB +3653423104,3653427199,GB 3653427200,3653431295,DE 3653431296,3653435391,RU 3653435392,3653439487,DE @@ -102973,9 +105605,8 @@ 3664007168,3664008191,AU 3664008192,3664008447,MN 3664008448,3664008703,PK -3664008704,3664008959,MY -3664008960,3664009215,AU -3664009216,3664052223,CN +3664008960,3664010239,AU +3664010240,3664052223,CN 3664052224,3664084991,NZ 3664084992,3664117759,KR 3664117760,3664248831,HK @@ -103091,7 +105722,9 @@ 3706159104,3706191871,CN 3706191872,3706206959,SG 3706206960,3706206975,AP -3706206976,3706208255,SG +3706206976,3706207107,SG +3706207108,3706207108,US +3706207109,3706208255,SG 3706208256,3706224639,CN 3706224640,3706257407,HK 3706257408,3706322943,AU @@ -103103,7 +105736,7 @@ 3707109376,3707174911,HK 3707174912,3707207679,JP 3707209728,3707211775,CN -3707211776,3707215871,JP +3707211776,3707215871,NZ 3707215872,3707217919,BD 3707217920,3707219967,ID 3707219968,3707222015,AU @@ -103128,7 +105761,9 @@ 3715694592,3715710975,VN 3715710976,3715719167,AU 3715719168,3715727359,PH -3715727360,3715735551,AU +3715727360,3715729151,AU +3715729152,3715729407,NZ +3715729408,3715735551,AU 3715735552,3715741695,JP 3715741696,3715743743,PH 3715743744,3715760127,JP diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a85b0c8aa..9535f12e9 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 = "-rc"; From f3bb20d750ba340d8eadc9cfe612103b2ad8b7c7 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 30 Jul 2015 20:41:45 +0000 Subject: [PATCH 125/258] minor updates after review --- .../java/src/net/i2p/i2ptunnel/GunzipOutputStream.java | 2 +- .../java/src/net/i2p/router/update/ConsoleUpdateManager.java | 2 +- .../java/src/net/i2p/router/update/NewsFetcher.java | 2 +- apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java | 2 +- core/java/src/net/i2p/client/impl/I2PSessionImpl.java | 2 +- core/java/src/net/i2p/update/UpdateManager.java | 2 ++ 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java index 291d903db..e0798567d 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java @@ -25,7 +25,7 @@ class GunzipOutputStream extends InflaterOutputStream { private final CRC32 _crc32; private final byte _buf1[] = new byte[1]; private boolean _complete; - private byte _footer[] = new byte[FOOTER_SIZE]; + private final byte _footer[] = new byte[FOOTER_SIZE]; private long _bytesReceived; private long _bytesReceivedAtCompletion; diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index 04a8d779f..ff0a90016 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -1050,7 +1050,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp { uri = DataHelper.stripHTML(task.getURI().getPath()); buf.append(_("Install failed from {0}", uri)); } else { - buf.append(_("Transfer failed from {0}")); + buf.append(_("Transfer failed from {0}", uri)); } if (reason != null && reason.length() > 0) { buf.append("
"); diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index d6876383c..19d878908 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -136,7 +136,7 @@ class NewsFetcher extends UpdateRunner { /** * Add a query param for the local language to get translated news. * Unchanged if disabled by property, if language is english, - * or if URI already contains a language paramter + * or if URI already contains a language parameter * * @since 0.9.21 */ 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 8cbd02304..496f49ac1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -73,7 +73,7 @@ public class NetDbHelper extends HelperBase { NetDbRenderer renderer = new NetDbRenderer(_context); try { renderNavBar(); - if (_routerPrefix != null || _version!= null || _country != null) + if (_routerPrefix != null || _version != null || _country != null) renderer.renderRouterInfoHTML(_out, _routerPrefix, _version, _country); else if (_lease) renderer.renderLeaseSetHTML(_out, _debug); diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java index 6d264549b..4307924de 100644 --- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -96,7 +96,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 // established subsessions private final ConcurrentHashMap _subsessionMap; private final Object _subsessionLock = new Object(); - private static final String MIN_SUBSESSION_VERSION = "0.9.19"; + private static final String MIN_SUBSESSION_VERSION = "0.9.21"; private volatile boolean _routerSupportsSubsessions; /** hostname of router - will be null if in RouterContext */ diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java index b5035ec95..57065dcb3 100644 --- a/core/java/src/net/i2p/update/UpdateManager.java +++ b/core/java/src/net/i2p/update/UpdateManager.java @@ -178,6 +178,7 @@ public interface UpdateManager { * @since 0.9.21 */ public boolean isUpdateInProgress(UpdateType type, String id); + /** * Non-blocking. Does not check. * Fails if check or update already in progress. @@ -225,6 +226,7 @@ public interface UpdateManager { /** * The status on any update current or last finished. * @return status or "" + * @since 0.9.21 */ public String getStatus(); From 44b35f328bf8c849f9dd3872326e6f9e2fe1011e Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 31 Jul 2015 14:22:03 +0000 Subject: [PATCH 126/258] 0.9.21 --- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 2 ++ installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 0aa44511d..4343c9074 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -18,7 +18,7 @@ public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.20"; + public final static String VERSION = "0.9.21"; /** * For Vuze. diff --git a/history.txt b/history.txt index 61a02c768..2cb9a8432 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,5 @@ +* 2015-07-31 0.9.21 released + 2015-07-27 zzz * Update: Fix processing of translated news su3 files diff --git a/installer/install.xml b/installer/install.xml index 95ed4b1cd..582e0c284 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.20 + 0.9.21 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 9535f12e9..a411b0099 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ 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 = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); From ecd0231cd04f7d44a6f5294ba1b2df2964e5675e Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 2 Aug 2015 12:58:00 +0000 Subject: [PATCH 127/258] Fix console SSL excluded ciphers (thx lazyg) Fix typo in local address in I2PSSLSocketFactory Another findbugs char encoding fix Add keystore password option to SU3File command line --- .../java/src/net/i2p/jetty/I2PRequestLog.java | 2 +- .../i2p/router/web/RouterConsoleRunner.java | 2 +- core/java/src/net/i2p/crypto/SU3File.java | 49 +++++++++++-------- .../src/net/i2p/util/I2PSSLSocketFactory.java | 2 +- .../src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 33 insertions(+), 24 deletions(-) diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java index ab4b606f9..723e069f7 100644 --- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java +++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java @@ -465,7 +465,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog else _ignorePathMap = null; - _writer = new OutputStreamWriter(_out); + _writer = new OutputStreamWriter(_out, "UTF-8"); _buffers = new ArrayList(); _copy = new char[1024]; super.doStart(); 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 213f82db1..0c36391dd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -517,7 +517,7 @@ public class RouterConsoleRunner implements RouterApp { sslFactory.setKeyManagerPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork")); sslFactory.addExcludeProtocols(I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.toArray( new String[I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.size()])); - sslFactory.addExcludeCipherSuites(I2PSSLSocketFactory.INCLUDE_CIPHERS.toArray( + sslFactory.addExcludeCipherSuites(I2PSSLSocketFactory.EXCLUDE_CIPHERS.toArray( new String[I2PSSLSocketFactory.EXCLUDE_CIPHERS.size()])); StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,"); while (tok.hasMoreTokens()) { diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java index bc4d0251c..f8753aee5 100644 --- a/core/java/src/net/i2p/crypto/SU3File.java +++ b/core/java/src/net/i2p/crypto/SU3File.java @@ -540,9 +540,10 @@ public class SU3File { String ctype = null; String ftype = null; String kfile = null; + String kspass = KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD; boolean error = false; boolean shouldVerify = true; - Getopt g = new Getopt("SU3File", args, "t:c:f:k:x"); + Getopt g = new Getopt("SU3File", args, "t:c:f:k:xp:"); int c; while ((c = g.getopt()) != -1) { switch (c) { @@ -566,6 +567,10 @@ public class SU3File { shouldVerify = false; break; + case 'p': + kspass = g.getOptarg(); + break; + case '?': case ':': default: @@ -586,16 +591,16 @@ public class SU3File { Properties props = new Properties(); props.setProperty("prng.bufferSize", "16384"); new I2PAppContext(props); - ok = signCLI(stype, ctype, ftype, a.get(0), a.get(1), a.get(2), a.get(3), a.get(4), ""); + ok = signCLI(stype, ctype, ftype, a.get(0), a.get(1), a.get(2), a.get(3), a.get(4), "", kspass); } else if ("bulksign".equals(cmd)) { Properties props = new Properties(); props.setProperty("prng.bufferSize", "16384"); new I2PAppContext(props); - ok = bulkSignCLI(stype, ctype, a.get(0), a.get(1), a.get(2), a.get(3)); + ok = bulkSignCLI(stype, ctype, a.get(0), a.get(1), a.get(2), a.get(3), kspass); } else if ("verifysig".equals(cmd)) { ok = verifySigCLI(a.get(0), kfile); } else if ("keygen".equals(cmd)) { - ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2)); + ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2), kspass); } else if ("extract".equals(cmd)) { ok = extractCLI(a.get(0), a.get(1), shouldVerify, kfile); } else { @@ -611,12 +616,13 @@ public class SU3File { } private static final void showUsageCLI() { - System.err.println("Usage: SU3File keygen [-t type|code] publicKeyFile keystore.ks you@mail.i2p"); - System.err.println(" SU3File sign [-t type|code] [-c type|code] [-f type|code] inputFile.zip signedFile.su3 keystore.ks version you@mail.i2p"); - System.err.println(" SU3File bulksign [-t type|code] [-c type|code] directory keystore.ks version you@mail.i2p"); - System.err.println(" SU3File showversion signedFile.su3"); - System.err.println(" SU3File verifysig [-k file.crt] signedFile.su3 ## -k use this pubkey cert for verification"); - System.err.println(" SU3File extract [-x] [-k file.crt] signedFile.su3 outFile ## -x don't check sig"); + System.err.println("Usage: SU3File keygen [-t type|code] [-p keystorepw] publicKeyFile keystore.ks you@mail.i2p\n" + + " SU3File sign [-t type|code] [-c type|code] [-f type|code] [-p keystorepw] inputFile.zip signedFile.su3 keystore.ks version you@mail.i2p\n" + + " SU3File bulksign [-t type|code] [-c type|code] [-p keystorepw] directory keystore.ks version you@mail.i2p\n" + + " SU3File showversion signedFile.su3\n" + + " SU3File verifysig [-k file.crt] signedFile.su3 ## -k use this pubkey cert for verification\n" + + " SU3File extract [-x] [-k file.crt] signedFile.su3 outFile ## -x don't check sig"); + System.err.println("Default keystore password: \"" + KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD + '"'); System.err.println(dumpTypes()); } @@ -714,7 +720,7 @@ public class SU3File { * @since 0.9.9 */ private static final boolean bulkSignCLI(String stype, String ctype, String dir, - String privateKeyFile, String version, String signerName) { + String privateKeyFile, String version, String signerName, String kspass) { File d = new File(dir); if (!d.isDirectory()) { System.out.println("Directory does not exist: " + d); @@ -749,7 +755,8 @@ public class SU3File { if (!inputFile.endsWith(".zip")) continue; String signedFile = inputFile.substring(0, inputFile.length() - 4) + ".su3"; - boolean rv = signCLI(stype, ctype, null, inputFile, signedFile, privateKeyFile, version, signerName, keypw); + boolean rv = signCLI(stype, ctype, null, inputFile, signedFile, + privateKeyFile, version, signerName, keypw, kspass); if (!rv) return false; success++; @@ -764,7 +771,7 @@ public class SU3File { * @since 0.9.9 */ private static final boolean signCLI(String stype, String ctype, String ftype, String inputFile, String signedFile, - String privateKeyFile, String version, String signerName, String keypw) { + String privateKeyFile, String version, String signerName, String keypw, String kspass) { SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype); if (type == null) { System.out.println("Signature type " + stype + " is not supported"); @@ -799,7 +806,7 @@ public class SU3File { System.out.println("Warning: File type " + ftype + " is undefined"); } } - return signCLI(type, ct, ft, inputFile, signedFile, privateKeyFile, version, signerName, keypw); + return signCLI(type, ct, ft, inputFile, signedFile, privateKeyFile, version, signerName, keypw, kspass); } /** @@ -807,7 +814,7 @@ public class SU3File { * @since 0.9.9 */ private static final boolean signCLI(SigType type, ContentType ctype, int ftype, String inputFile, String signedFile, - String privateKeyFile, String version, String signerName, String keypw) { + String privateKeyFile, String version, String signerName, String keypw, String kspass) { try { while (keypw.length() < 6) { System.out.print("Enter password for key \"" + signerName + "\": "); @@ -821,7 +828,7 @@ public class SU3File { System.out.println("Key password must be at least 6 characters"); } File pkfile = new File(privateKeyFile); - PrivateKey pk = KeyStoreUtil.getPrivateKey(pkfile,KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD, signerName, keypw); + PrivateKey pk = KeyStoreUtil.getPrivateKey(pkfile, kspass, signerName, keypw); if (pk == null) { System.out.println("Private key for " + signerName + " not found in keystore " + privateKeyFile); return false; @@ -895,13 +902,14 @@ public class SU3File { * @return success * @since 0.9.9 */ - private static final boolean genKeysCLI(String stype, String publicKeyFile, String privateKeyFile, String alias) { + private static final boolean genKeysCLI(String stype, String publicKeyFile, String privateKeyFile, + String alias, String kspass) { SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype); if (type == null) { System.out.println("Signature type " + stype + " is not supported"); return false; } - return genKeysCLI(type, publicKeyFile, privateKeyFile, alias); + return genKeysCLI(type, publicKeyFile, privateKeyFile, alias, kspass); } /** @@ -909,7 +917,8 @@ public class SU3File { * @return success * @since 0.9.9 */ - private static final boolean genKeysCLI(SigType type, String publicKeyFile, String privateKeyFile, String alias) { + private static final boolean genKeysCLI(SigType type, String publicKeyFile, String privateKeyFile, + String alias, String kspass) { File pubFile = new File(publicKeyFile); if (pubFile.exists()) { System.out.println("Error: Not overwriting file " + publicKeyFile); @@ -947,7 +956,7 @@ public class SU3File { if (keylen == 528) keylen = 521; } - boolean success = KeyStoreUtil.createKeys(ksFile, KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD, alias, + boolean success = KeyStoreUtil.createKeys(ksFile, kspass, alias, alias, "I2P", 3652, type.getBaseAlgorithm().getName(), keylen, keypw); if (!success) { diff --git a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java index eecd608ab..4761ac710 100644 --- a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java +++ b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java @@ -284,7 +284,7 @@ public class I2PSSLSocketFactory { host.equals("localhost") || host.equals("127.0.0.1") || host.equals("::1") || - host.equals("0:0:0:0:0:0:0::1")) { + host.equals("0:0:0:0:0:0:0:1")) { if (log.shouldWarn()) log.warn("Skipping hostname validation for " + host); return; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b0099..87e5bffca 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 = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = ""; From b5944045fb3d9affbe8d55df0476aeb18d7d7059 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 2 Aug 2015 15:04:08 +0000 Subject: [PATCH 128/258] sync apparmor rules with the 0.9.21 package --- debian/apparmor/i2p | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/apparmor/i2p b/debian/apparmor/i2p index f0b7b77ef..8e06c9b7c 100644 --- a/debian/apparmor/i2p +++ b/debian/apparmor/i2p @@ -7,7 +7,9 @@ #include network inet stream, + network inet dgram, network inet6 stream, + network inet6 dgram, # Needed by Java @{PROC} r, @@ -53,8 +55,11 @@ /{,lib/live/mount/overlay/}tmp/ rwm, owner /{,lib/live/mount/overlay/}tmp/hsperfdata_i2psvc/ rwk, owner /{,lib/live/mount/overlay/}tmp/hsperfdata_i2psvc/** rw, - owner /{,lib/live/mount/overlay/}tmp/wrapper[0-9]*.tmp rwk, - owner /{,lib/live/mount/overlay/}tmp/wrapper[0-9]*.tmp/** rw, + owner /{,lib/live/mount/overlay/}tmp/wrapper* rwk, + owner /{,lib/live/mount/overlay/}tmp/wrapper*/** rw, + # Scrypt used by I2P-Bote + owner /{,lib/live/mount/overlay/}tmp/scrypt* rwk, + owner /{,lib/live/mount/overlay/}tmp/scrypt*/** rw, owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/ rwm, owner /{,lib/live/mount/overlay/}tmp/i2p-daemon/** rwklm, From fde0ae8349c5f8633ea25707ae55f4c73db31bc1 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 2 Aug 2015 15:06:50 +0000 Subject: [PATCH 129/258] sync debian/changelog with packaged version --- debian/changelog | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/debian/changelog b/debian/changelog index fd4e29a28..f0d4d62d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +i2p (0.9.21-2) unstable; urgency=medium + + * Add exception to apparmor rules for scrypt, needed by I2P-Bote + + -- Kill Your TV Sun, 02 Aug 2015 15:00:30 +0000 + +i2p (0.9.21-1) unstable; urgency=medium + + * New Upstream Version + - Add multisession support for dual-signature crypto on the same tunnels + - Use multisession for shared clients + - Increase default outbound bandwidth limit to 60 KBps + - Increase default maximum participating tunnels + - Floodfills will send database store acks directly if connected, for efficiency + - Set TCP keepalive on I2CP and SAM sockets + - More efficient decompression in HTTP proxy, use less threads + - Add support for fast extensions in i2psnark + - i2psnark only autostarts torrents that were running previously + - Add support for translated console news + - SSU fixes to compete better with NTCP for bandwidth when limited + - Fixes to prevent SSU stalls + - Wait for outbound tunnels before sending first leaseset to client, to + prevent dropping first message + - Clean up resources correctly when SAM stops + - Better error handling and notification when HTTP proxy is not running + - More i2ptunnel fixes at startup and shutdown of tunnels + - Fix total_size in i2psnark metadata message + - Restore dates in console news headers + - Several I2CP fixes + - Use same session for naming lookups in I2PSocketEepGet + - Increase max bandwidth to 16 MBps, add larger Bloom filter + - New floodfills will send their info to nearby floodfills to speed integration + - Apache Tomcat 6.0.44 + - Translation updates + * Drop the following patches; included in 0.9.21: + - 0005-i2ptunnel-Don-t-connect-manager-to-router-in-constru.patch + - 0006-i2ptunnel-Don-t-call-startup-in-chained-constructor-.patch + - 0007-Define-I2PTunnelClientBase-stats-in-one-place.patch + - 0008-i2psnark-Fix-NPE-ticket-1602.patch + + + -- Kill Your TV Fri, 31 Jul 2015 20:01:42 +0000 + +i2p (0.9.20-3) unstable; urgency=medium + + * Add datagram exception to the apparmor profile + + -- Kill Your TV Sat, 20 Jun 2015 11:22:28 +0000 i2p (0.9.20-2) unstable; urgency=medium [str4d] From 5a11a28a358362973042e8b12cde9a333ed56a9b Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 24 Aug 2015 17:30:32 +0000 Subject: [PATCH 130/258] i2psnark: - Return partial piece to coordinator after reject - Fix tracking of downloaded portion of piece after reject - Send reject on receipt of bad request - Mark piece unrequested after receiving bad data, so it will be requested again, but not from the same peer - Fix NPE in Request constructor on error - Fix stuck before completion due to reject handling (ticket #1633) --- .../java/src/org/klomp/snark/BitField.java | 21 +++++++ .../src/org/klomp/snark/PartialPiece.java | 27 +++++++-- .../org/klomp/snark/PeerConnectionOut.java | 2 + .../src/org/klomp/snark/PeerCoordinator.java | 20 ++++++- .../java/src/org/klomp/snark/PeerState.java | 59 +++++++++++++++++-- .../java/src/org/klomp/snark/Request.java | 8 +-- history.txt | 14 +++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 8 files changed, 135 insertions(+), 18 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/BitField.java b/apps/i2psnark/java/src/org/klomp/snark/BitField.java index cb147fb26..f724f71d7 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/BitField.java +++ b/apps/i2psnark/java/src/org/klomp/snark/BitField.java @@ -107,6 +107,27 @@ public class BitField } } + /** + * Sets the given bit to false. + * + * @exception IndexOutOfBoundsException if bit is smaller then zero + * bigger then size (inclusive). + * @since 0.9.22 + */ + public void clear(int bit) + { + if (bit < 0 || bit >= size) + throw new IndexOutOfBoundsException(Integer.toString(bit)); + int index = bit/8; + int mask = 128 >> (bit % 8); + synchronized(this) { + if ((bitfield[index] & mask) != 0) { + count--; + bitfield[index] &= ~mask; + } + } + } + /** * Sets all bits to true. * diff --git a/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java b/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java index bcf0aefd0..6cf35836d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java @@ -108,7 +108,8 @@ class PartialPiece implements Comparable { /** * Convert this PartialPiece to a request for the next chunk. - * Used by PeerState only. + * Used by PeerState only. This depends on the downloaded value + * as set by setDownloaded() or read(). */ public Request getRequest() { @@ -128,14 +129,16 @@ class PartialPiece implements Comparable { } /** - * How many bytes are good - only valid by setDownloaded() + * How many bytes are good - as set by setDownloaded() or read() */ public int getDownloaded() { return this.off; } /** - * Call this before returning a PartialPiece to the PeerCoordinator + * Call this if necessary before returning a PartialPiece to the PeerCoordinator. + * We do not use a bitmap to track individual chunks received. + * Any chunks after a 'hole' will be lost. * @since 0.9.1 */ public void setDownloaded(int offset) { @@ -191,11 +194,20 @@ class PartialPiece implements Comparable { /** * Blocking. + * If offset matches the previous downloaded amount + * (as set by a previous call to read() or setDownlaoded()), + * the downloaded amount will be incremented by len. + * * @since 0.9.1 */ - public void read(DataInputStream din, int off, int len) throws IOException { + public void read(DataInputStream din, int offset, int len) throws IOException { if (bs != null) { - din.readFully(bs, off, len); + din.readFully(bs, offset, len); + synchronized (this) { + // only works for in-order chunks + if (this.off == offset) + this.off += len; + } } else { // read in fully before synching on raf ByteArray ba; @@ -211,8 +223,11 @@ class PartialPiece implements Comparable { synchronized (this) { if (raf == null) createTemp(); - raf.seek(off); + raf.seek(offset); raf.write(tmp); + // only works for in-order chunks + if (this.off == offset) + this.off += len; } if (ba != null) _cache.release(ba, false); diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java index 51272e8a6..314b534bc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java @@ -170,6 +170,8 @@ class PeerConnectionOut implements Runnable lastSent = System.currentTimeMillis(); // Remove all piece messages after sending a choke message. + // FiXME this causes REJECT messages to be sent before sending the CHOKE; + // BEP 6 recommends sending them after. if (m.type == Message.CHOKE) removeMessage(Message.PIECE); diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java index 7f5e8a4f0..b347b5448 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java @@ -920,6 +920,7 @@ class PeerCoordinator implements PeerListener * Returns a byte array containing the requested piece or null of * the piece is unknown. * + * @return bytes or null for errors such as not having the piece yet * @throws RuntimeException on IOE getting the data */ public ByteArray gotRequest(Peer peer, int piece, int off, int len) @@ -1010,9 +1011,21 @@ class PeerCoordinator implements PeerListener } else { + // so we will try again + markUnrequested(peer, piece); + // just in case + removePartialPiece(piece); // Oops. We didn't actually download this then... :( downloaded.addAndGet(0 - metainfo.getPieceLength(piece)); - _log.warn("Got BAD piece " + piece + "/" + metainfo.getPieces() + " from " + peer + " for " + metainfo.getName()); + // Mark this peer as not having the piece. PeerState will update its bitfield. + for (Piece pc : wantedPieces) { + if (pc.getId() == piece) { + pc.removePeer(peer); + break; + } + } + if (_log.shouldWarn()) + _log.warn("Got BAD piece " + piece + "/" + metainfo.getPieces() + " from " + peer + " for " + metainfo.getName()); return false; // No need to announce BAD piece to peers. } } @@ -1141,8 +1154,9 @@ class PeerCoordinator implements PeerListener * * Also mark the piece unrequested if this peer was the only one. * - * @param peer partials, must include the zero-offset (empty) ones too - * No dup pieces, piece.setDownloaded() must be set + * @param peer partials, must include the zero-offset (empty) ones too. + * No dup pieces, piece.setDownloaded() must be set. + * len field in Requests is ignored. * @since 0.8.2 */ public void savePartialPieces(Peer peer, List partials) diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java index cf29c415f..23cbe5690 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java +++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java @@ -21,6 +21,7 @@ package org.klomp.snark; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -238,6 +239,8 @@ class PeerState implements DataLoader } // Sanity check + // There is no check here that we actually have the piece; + // this will be caught in loadData() below if (piece < 0 || piece >= metainfo.getPieces() || begin < 0 @@ -251,6 +254,8 @@ class PeerState implements DataLoader + ", " + begin + ", " + length + "' message from " + peer); + if (peer.supportsFast()) + out.sendReject(piece, begin, length); return; } @@ -281,7 +286,8 @@ class PeerState implements DataLoader /** * This is the callback that PeerConnectionOut calls * - * @return bytes or null for errors + * @return bytes or null for errors such as not having the piece yet + * @throws RuntimeException on IOE getting the data * @since 0.8.2 */ public ByteArray loadData(int piece, int begin, int length) { @@ -291,6 +297,8 @@ class PeerState implements DataLoader // XXX - Protocol error-> diconnect? if (_log.shouldLog(Log.WARN)) _log.warn("Got request for unknown piece: " + piece); + if (peer.supportsFast()) + out.sendReject(piece, begin, length); return null; } @@ -303,6 +311,8 @@ class PeerState implements DataLoader + ", " + begin + ", " + length + "' message from " + peer); + if (peer.supportsFast()) + out.sendReject(piece, begin, length); return null; } @@ -360,6 +370,11 @@ class PeerState implements DataLoader { if (_log.shouldLog(Log.WARN)) _log.warn("Got BAD " + req.getPiece() + " from " + peer); + synchronized(this) { + // so we don't ask again + if (bitfield != null) + bitfield.clear(req.getPiece()); + } } } @@ -493,7 +508,12 @@ class PeerState implements DataLoader for (Integer p : pcs) { Request req = getLowestOutstandingRequest(p.intValue()); if (req != null) { - req.getPartialPiece().setDownloaded(req.off); + PartialPiece pp = req.getPartialPiece(); + synchronized(pp) { + int dl = pp.getDownloaded(); + if (req.off != dl) + req = new Request(pp, dl, 1); + } rv.add(req); } } @@ -598,6 +618,13 @@ class PeerState implements DataLoader /** * BEP 6 + * If the peer rejects lower chunks but not higher ones, thus creating holes, + * we won't figure it out and the piece will fail, since we don't currently + * keep a chunk bitmap in PartialPiece. + * As long as the peer rejects all the chunks, or rejects only the last chunks, + * no holes are created and we will be fine. The reject messages may be in any order, + * just don't make a hole when it's over. + * * @since 0.9.21 */ void rejectMessage(int piece, int begin, int length) { @@ -605,10 +632,34 @@ class PeerState implements DataLoader _log.info("Got reject(" + piece + ',' + begin + ',' + length + ") from " + peer); out.cancelRequest(piece, begin, length); synchronized(this) { + Request deletedRequest = null; + // for this piece only + boolean haveMoreRequests = false; for (Iterator iter = outstandingRequests.iterator(); iter.hasNext(); ) { Request req = iter.next(); - if (req.getPiece() == piece && req.off == begin && req.len == length) - iter.remove(); + if (req.getPiece() == piece) { + if (req.off == begin && req.len == length) { + iter.remove(); + deletedRequest = req; + } else { + haveMoreRequests = true; + } + } + } + if (deletedRequest != null && !haveMoreRequests) { + // We must return the piece to the coordinator + // Create a new fake request so we can set the offset correctly + PartialPiece pp = deletedRequest.getPartialPiece(); + int downloaded = pp.getDownloaded(); + Request req; + if (deletedRequest.off == downloaded) + req = deletedRequest; + else + req = new Request(pp, downloaded, 1); + List pcs = Collections.singletonList(req); + listener.savePartialPieces(this.peer, pcs); + if (_log.shouldWarn()) + _log.warn("Returned to coord. w/ offset " + pp.getDownloaded() + " due to reject(" + piece + ',' + begin + ',' + length + ") from " + peer); } if (lastRequest != null && lastRequest.getPiece() == piece && lastRequest.off == begin && lastRequest.len == length) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Request.java b/apps/i2psnark/java/src/org/klomp/snark/Request.java index d6a621b1f..fddbb2b53 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Request.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Request.java @@ -43,13 +43,13 @@ class Request */ Request(PartialPiece piece, int off, int len) { - // Sanity check - if (off < 0 || len <= 0 || off + len > piece.getLength()) - throw new IndexOutOfBoundsException("Illegal Request " + toString()); - this.piece = piece; this.off = off; this.len = len; + + // Sanity check + if (off < 0 || len <= 0 || off + len > piece.getLength()) + throw new IndexOutOfBoundsException("Illegal Request " + toString()); } /** diff --git a/history.txt b/history.txt index 2cb9a8432..ab376a4a9 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,17 @@ +2015-08-25 zzz + * i2psnark: + - Return partial piece to coordinator after reject + - Fix tracking of downloaded portion of piece after reject + - Send reject on receipt of bad request + - Mark piece unrequested after receiving bad data, so it + will be requested again, but not from the same peer + - Fix NPE in Request constructor on error + - Fix stuck before completion due to reject handling (ticket #1633) + +2015-08-02 zzz + * Console: Fix SSL excluded ciphers (thx lazyg) + * SU3File: Add keystore password command line option + * 2015-07-31 0.9.21 released 2015-07-27 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 87e5bffca..282c18b42 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 = ""; From 601376561bd2a9a2b6dbaa844934a16ae6328f77 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 27 Aug 2015 14:36:19 +0000 Subject: [PATCH 131/258] add Closeable/Flushable interfaces --- .../java/src/net/i2p/addressbook/ConfigIterator.java | 3 ++- apps/i2psnark/java/src/org/klomp/snark/Storage.java | 3 ++- apps/sam/java/src/net/i2p/sam/SAMMessageSession.java | 3 ++- .../java/src/net/i2p/client/streaming/impl/PacketQueue.java | 3 ++- .../java/src/net/i2p/client/streaming/impl/PcapWriter.java | 4 +++- core/java/src/net/i2p/internal/I2CPMessageQueue.java | 4 +++- core/java/src/net/i2p/util/LogManager.java | 3 ++- core/java/src/net/metanotion/io/RandomAccessInterface.java | 3 ++- core/java/src/net/metanotion/io/block/BlockFile.java | 3 ++- core/java/src/net/metanotion/io/block/index/BSkipList.java | 3 ++- core/java/src/net/metanotion/util/skiplist/SkipLevels.java | 4 +++- core/java/src/net/metanotion/util/skiplist/SkipList.java | 3 ++- core/java/src/net/metanotion/util/skiplist/SkipSpan.java | 4 +++- .../i2p/router/networkdb/kademlia/PersistentDataStore.java | 3 ++- .../src/net/i2p/router/transport/ntcp/NTCPConnection.java | 3 ++- 15 files changed, 34 insertions(+), 15 deletions(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java index 8b01fb854..30c21d19b 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/ConfigIterator.java @@ -22,6 +22,7 @@ package net.i2p.addressbook; import java.io.BufferedReader; +import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -41,7 +42,7 @@ import java.util.NoSuchElementException; * * @since 0.8.7 */ -class ConfigIterator implements Iterator> { +class ConfigIterator implements Iterator>, Closeable { private BufferedReader input; private ConfigEntry next; diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 682d6f700..1a4b1fb4c 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -20,6 +20,7 @@ package org.klomp.snark; +import java.io.Closeable; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -50,7 +51,7 @@ import net.i2p.util.SystemVersion; /** * Maintains pieces on disk. Can be used to store and retrieve pieces. */ -public class Storage +public class Storage implements Closeable { private final MetaInfo metainfo; private final List _torrentFiles; diff --git a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java index db2450b01..e8e502da8 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMMessageSession.java @@ -9,6 +9,7 @@ package net.i2p.sam; */ import java.io.ByteArrayInputStream; +import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.util.Properties; @@ -31,7 +32,7 @@ import net.i2p.util.Log; * * @author human */ -abstract class SAMMessageSession { +abstract class SAMMessageSession implements Closeable { protected final Log _log; private I2PSession session; diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java index 073ce3d15..34ab43939 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java @@ -1,5 +1,6 @@ package net.i2p.client.streaming.impl; +import java.io.Closeable; import java.io.IOException; import java.util.Iterator; import java.util.Map; @@ -25,7 +26,7 @@ import net.i2p.util.SimpleTimer2; *

* MessageOutputStream -> ConnectionDataReceiver -> Connection -> PacketQueue -> I2PSession */ -class PacketQueue implements SendMessageStatusListener { +class PacketQueue implements SendMessageStatusListener, Closeable { private final I2PAppContext _context; private final Log _log; private final ByteCache _cache = ByteCache.getInstance(64, 36*1024); diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java index 9a3c3e0be..1c704f02e 100644 --- a/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java +++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java @@ -1,8 +1,10 @@ package net.i2p.client.streaming.impl; import java.io.BufferedOutputStream; +import java.io.Closeable; import java.io.File; import java.io.FileOutputStream; +import java.io.Flushable; import java.io.IOException; import java.io.OutputStream; @@ -41,7 +43,7 @@ import net.i2p.data.DataHelper; * * @since 0.9.4 */ -public class PcapWriter { +public class PcapWriter implements Closeable, Flushable { /** big-endian, see file format ref - 24 bytes */ private static final byte[] FILE_HEADER = { (byte) 0xa1, (byte) 0xb2, (byte) 0xc3, (byte) 0xd4, diff --git a/core/java/src/net/i2p/internal/I2CPMessageQueue.java b/core/java/src/net/i2p/internal/I2CPMessageQueue.java index eda2d8f95..76584255c 100644 --- a/core/java/src/net/i2p/internal/I2CPMessageQueue.java +++ b/core/java/src/net/i2p/internal/I2CPMessageQueue.java @@ -1,5 +1,7 @@ package net.i2p.internal; +import java.io.Closeable; + import net.i2p.data.i2cp.I2CPMessage; /** @@ -15,7 +17,7 @@ import net.i2p.data.i2cp.I2CPMessage; * @author zzz * @since 0.8.3 */ -public abstract class I2CPMessageQueue { +public abstract class I2CPMessageQueue implements Closeable { /** * Send a message, nonblocking. diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index 85d948c53..f2df0a881 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -10,6 +10,7 @@ package net.i2p.util; */ import java.io.File; +import java.io.Flushable; import java.io.IOException; import java.text.DateFormat; import java.text.DecimalFormat; @@ -37,7 +38,7 @@ import net.i2p.data.DataHelper; * writes them where appropriate. * */ -public class LogManager { +public class LogManager implements Flushable { public final static String CONFIG_LOCATION_PROP = "loggerConfigLocation"; public final static String FILENAME_OVERRIDE_PROP = "loggerFilenameOverride"; public final static String CONFIG_LOCATION_DEFAULT = "logger.config"; diff --git a/core/java/src/net/metanotion/io/RandomAccessInterface.java b/core/java/src/net/metanotion/io/RandomAccessInterface.java index fa382621c..1f3df6af6 100644 --- a/core/java/src/net/metanotion/io/RandomAccessInterface.java +++ b/core/java/src/net/metanotion/io/RandomAccessInterface.java @@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.io; +import java.io.Closeable; import java.io.IOException; -public interface RandomAccessInterface { +public interface RandomAccessInterface extends Closeable { public long getFilePointer() throws IOException; public long length() throws IOException; public int read() throws IOException; diff --git a/core/java/src/net/metanotion/io/block/BlockFile.java b/core/java/src/net/metanotion/io/block/BlockFile.java index f6ea7d634..018702204 100644 --- a/core/java/src/net/metanotion/io/block/BlockFile.java +++ b/core/java/src/net/metanotion/io/block/BlockFile.java @@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.io.block; +import java.io.Closeable; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -64,7 +65,7 @@ import net.i2p.util.Log; * Pages are 1 KB and are numbered starting from 1. * e.g. the Metaindex skiplist is at offset 1024 bytes */ -public class BlockFile { +public class BlockFile implements Closeable { public static final int PAGESIZE = 1024; public static final long OFFSET_MOUNTED = 20; public final Log log = I2PAppContext.getGlobalContext().logManager().getLog(BlockFile.class); diff --git a/core/java/src/net/metanotion/io/block/index/BSkipList.java b/core/java/src/net/metanotion/io/block/index/BSkipList.java index 5eef949cf..3a2d8b599 100644 --- a/core/java/src/net/metanotion/io/block/index/BSkipList.java +++ b/core/java/src/net/metanotion/io/block/index/BSkipList.java @@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.io.block.index; +import java.io.Closeable; import java.io.IOException; import java.util.HashMap; @@ -50,7 +51,7 @@ import net.i2p.util.Log; * * Always fits on one page. */ -public class BSkipList extends SkipList { +public class BSkipList extends SkipList implements Closeable { private static final long MAGIC = 0x536b69704c697374l; // "SkipList" public int firstSpanPage = 0; public int firstLevelPage = 0; diff --git a/core/java/src/net/metanotion/util/skiplist/SkipLevels.java b/core/java/src/net/metanotion/util/skiplist/SkipLevels.java index e4665fc4b..bd9da7ba1 100644 --- a/core/java/src/net/metanotion/util/skiplist/SkipLevels.java +++ b/core/java/src/net/metanotion/util/skiplist/SkipLevels.java @@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.util.skiplist; +import java.io.Flushable; + import net.metanotion.io.block.BlockFile; import net.i2p.I2PAppContext; import net.i2p.util.Log; -public class SkipLevels { +public class SkipLevels implements Flushable { /** We can't have more than 2**32 pages */ public static final int MAX_SIZE = 32; diff --git a/core/java/src/net/metanotion/util/skiplist/SkipList.java b/core/java/src/net/metanotion/util/skiplist/SkipList.java index 74e35f56a..6f44e9e23 100644 --- a/core/java/src/net/metanotion/util/skiplist/SkipList.java +++ b/core/java/src/net/metanotion/util/skiplist/SkipList.java @@ -28,13 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.util.skiplist; +import java.io.Flushable; import java.util.Random; import net.i2p.util.RandomSource; //import net.metanotion.io.block.BlockFile; -public class SkipList { +public class SkipList implements Flushable { /** the probability of each next higher level */ protected static final int P = 2; private static final int MIN_SLOTS = 4; diff --git a/core/java/src/net/metanotion/util/skiplist/SkipSpan.java b/core/java/src/net/metanotion/util/skiplist/SkipSpan.java index ae2cc9ef7..94210ebd4 100644 --- a/core/java/src/net/metanotion/util/skiplist/SkipSpan.java +++ b/core/java/src/net/metanotion/util/skiplist/SkipSpan.java @@ -28,9 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package net.metanotion.util.skiplist; +import java.io.Flushable; + //import net.metanotion.io.block.BlockFile; -public class SkipSpan { +public class SkipSpan implements Flushable { /** This is actually limited by BlockFile.spanSize which is much smaller */ public static final int MAX_SIZE = 256; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java index ba10f8872..c3c413930 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java @@ -13,6 +13,7 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FilenameFilter; +import java.io.Flushable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -193,7 +194,7 @@ class PersistentDataStore extends TransientDataStore { * we will soon have to implement a scheme for keeping only * a subset of all DatabaseEntrys in memory and keeping the rest on disk. */ - private class Writer implements Runnable { + private class Writer implements Runnable, Flushable { private final Map_keys; private final Object _waitLock; private volatile boolean _quit; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index 3f77d73a7..703ee5050 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1,5 +1,6 @@ package net.i2p.router.transport.ntcp; +import java.io.Closeable; import java.io.IOException; import java.net.Inet6Address; import java.nio.ByteBuffer; @@ -64,7 +65,7 @@ import net.i2p.util.VersionComparator; * * */ -class NTCPConnection { +class NTCPConnection implements Closeable { private final RouterContext _context; private final Log _log; private SocketChannel _chan; From b10b8581cc07f267e05e6dcd5b6ceb62496db024 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 29 Aug 2015 14:20:13 +0000 Subject: [PATCH 132/258] Router: - Change default RI sig type to Ed25519, with a 10% chance od rekeying from DSA at each restart - Don't initialize KeyManager before selecting sig type - Don't log KeyManager error when changing sig type --- history.txt | 8 ++++ .../java/src/net/i2p/router/KeyManager.java | 38 +++++++++++++++---- router/java/src/net/i2p/router/Router.java | 2 - .../src/net/i2p/router/RouterVersion.java | 2 +- .../router/startup/CreateRouterInfoJob.java | 10 +++-- .../i2p/router/startup/LoadRouterInfoJob.java | 10 +++++ 6 files changed, 55 insertions(+), 15 deletions(-) diff --git a/history.txt b/history.txt index ab376a4a9..3dd700a2f 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2015-08-29 zzz + * Router: + - Change default RI sig type to Ed25519, with a 10% chance od + rekeying from DSA at each restart + - Don't initialize KeyManager before selecting sig type + - Don't log KeyManager error when changing sig type + 2015-08-25 zzz * i2psnark: - Return partial piece to coordinator after reject @@ -7,6 +14,7 @@ will be requested again, but not from the same peer - Fix NPE in Request constructor on error - Fix stuck before completion due to reject handling (ticket #1633) + - Fix orphaned temp files due to reject handling (ticket #1635) 2015-08-02 zzz * Console: Fix SSL excluded ciphers (thx lazyg) diff --git a/router/java/src/net/i2p/router/KeyManager.java b/router/java/src/net/i2p/router/KeyManager.java index 2807e8fe7..3317b9290 100644 --- a/router/java/src/net/i2p/router/KeyManager.java +++ b/router/java/src/net/i2p/router/KeyManager.java @@ -60,6 +60,11 @@ public class KeyManager { _leaseSetKeys = new ConcurrentHashMap(); } + /** + * Read keys in from disk, blocking + * + * @deprecated we never read keys in anymore + */ public void startup() { // run inline so keys are loaded immediately (new SynchronizeKeysJob()).runJob(); @@ -79,17 +84,29 @@ public class KeyManager { queueWrite(); } - /** router */ - public PrivateKey getPrivateKey() { return _privateKey; } + /** + * Router key + * @return will be null on error or before startup() or setKeys() is called + */ + public synchronized PrivateKey getPrivateKey() { return _privateKey; } - /** router */ - public PublicKey getPublicKey() { return _publicKey; } + /** + * Router key + * @return will be null on error or before startup() or setKeys() is called + */ + public synchronized PublicKey getPublicKey() { return _publicKey; } - /** router */ - public SigningPrivateKey getSigningPrivateKey() { return _signingPrivateKey; } + /** + * Router key + * @return will be null on error or before startup() or setKeys() is called + */ + public synchronized SigningPrivateKey getSigningPrivateKey() { return _signingPrivateKey; } - /** router */ - public SigningPublicKey getSigningPublicKey() { return _signingPublicKey; } + /** + * Router key + * @return will be null on error or before startup() or setKeys() is called + */ + public synchronized SigningPublicKey getSigningPublicKey() { return _signingPublicKey; } /** client */ public void registerKeys(Destination dest, SigningPrivateKey leaseRevocationPrivateKey, PrivateKey endpointDecryptionKey) { @@ -216,6 +233,11 @@ public class KeyManager { _signingPublicKey = (SigningPublicKey) readin; } + /** + * @param param non-null, filled-in if exists is true, or without data if exists is false + * @param exists write to file if true, read from file if false + * @return structure or null on read error + */ private DataStructure syncKey(File keyFile, DataStructure structure, boolean exists) { OutputStream out = null; InputStream in = null; diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index bb7e5068d..c6cc76f68 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -577,8 +577,6 @@ public class Router implements RouterClock.ClockShiftListener { if (!SystemVersion.isAndroid()) I2PThread.addOOMEventListener(_oomListener); - _context.keyManager().startup(); - setupHandlers(); //if (ALLOW_DYNAMIC_KEYS) { // if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false"))) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 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 = ""; diff --git a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java index 03076cb1e..7c18f6333 100644 --- a/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/CreateRouterInfoJob.java @@ -35,6 +35,7 @@ import net.i2p.router.RouterContext; import net.i2p.router.util.EventLog; import net.i2p.util.Log; import net.i2p.util.SecureFileOutputStream; +import net.i2p.util.SystemVersion; /** * Warning - misnamed. This creates a new RouterIdentity, i.e. @@ -49,9 +50,10 @@ public class CreateRouterInfoJob extends JobImpl { public static final String INFO_FILENAME = "router.info"; public static final String KEYS_FILENAME = "router.keys"; public static final String KEYS2_FILENAME = "router.keys.dat"; - private static final String PROP_ROUTER_SIGTYPE = "router.sigType"; - /** TODO when changing, check isAvailable() and fallback to DSA_SHA1 */ - private static final SigType DEFAULT_SIGTYPE = SigType.DSA_SHA1; + static final String PROP_ROUTER_SIGTYPE = "router.sigType"; + /** TODO make everybody Ed */ + private static final SigType DEFAULT_SIGTYPE = (SystemVersion.isARM() || SystemVersion.isAndroid()) ? + SigType.DSA_SHA1 : SigType.EdDSA_SHA512_Ed25519; CreateRouterInfoJob(RouterContext ctx, Job next) { super(ctx); @@ -166,7 +168,7 @@ public class CreateRouterInfoJob extends JobImpl { * @since 0.9.16 */ public static SigType getSigTypeConfig(RouterContext ctx) { - SigType cstype = CreateRouterInfoJob.DEFAULT_SIGTYPE; + SigType cstype = DEFAULT_SIGTYPE; String sstype = ctx.getProperty(PROP_ROUTER_SIGTYPE); if (sstype != null) { SigType ntype = SigType.parseSigType(sstype); diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java index 27d026960..eebd0f02b 100644 --- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java @@ -110,6 +110,16 @@ class LoadRouterInfoJob extends JobImpl { // check if the sigtype config changed SigType cstype = CreateRouterInfoJob.getSigTypeConfig(getContext()); boolean sigTypeChanged = stype != cstype; + if (sigTypeChanged && getContext().getProperty(CreateRouterInfoJob.PROP_ROUTER_SIGTYPE) == null) { + // Not explicitly configured, and default has changed + // Give a 10% chance of rekeying for each restart + // TODO reduce from 10 to ~3 (i.e. increase probability) in future release + if (getContext().random().nextInt(10) > 0) { + sigTypeChanged = false; + if (_log.shouldWarn()) + _log.warn("Deferring RI rekey from " + stype + " to " + cstype); + } + } if (sigTypeChanged || shouldRebuild(privkey)) { if (sigTypeChanged) From f577a94012062131267af482f4063d050a2e9275 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 31 Aug 2015 13:19:29 +0000 Subject: [PATCH 133/258] i2psnark: Change default sig type to Ed25519 --- apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 85bb97c4d..75570e04a 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -14,6 +14,7 @@ import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.I2PException; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSession; import net.i2p.client.I2PSessionException; import net.i2p.client.streaming.I2PServerSocket; @@ -255,6 +256,8 @@ public class I2PSnarkUtil { opts.setProperty("i2p.streaming.disableRejectLogging", "true"); if (opts.getProperty("i2p.streaming.answerPings") == null) opts.setProperty("i2p.streaming.answerPings", "false"); + if (opts.getProperty(I2PClient.PROP_SIGTYPE) == null) + opts.setProperty(I2PClient.PROP_SIGTYPE, "EdDSA_SHA512_Ed25519"); _manager = I2PSocketManagerFactory.createManager(_i2cpHost, _i2cpPort, opts); _connecting = false; } From 7c703953be0afa7d3ed5cb57d4a6cb00f113da4d Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 31 Aug 2015 13:25:58 +0000 Subject: [PATCH 134/258] Data: Cache P256 and Ed255i9 key certificates - Enable P256 caching - Create cached Ed25519 cert and enable - Fix cached P256 hashcode --- core/java/src/net/i2p/data/Certificate.java | 22 +++- .../java/src/net/i2p/data/KeyCertificate.java | 104 +++++++++++++++++- history.txt | 4 + .../src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 121 insertions(+), 11 deletions(-) diff --git a/core/java/src/net/i2p/data/Certificate.java b/core/java/src/net/i2p/data/Certificate.java index 7b40b5099..aa2624b8a 100644 --- a/core/java/src/net/i2p/data/Certificate.java +++ b/core/java/src/net/i2p/data/Certificate.java @@ -47,16 +47,17 @@ public class Certificate extends DataStructureImpl { public final static int CERTIFICATE_TYPE_KEY = 5; /** - * If null cert, return immutable static instance, else create new + * If null, P256 key, or Ed25519 key cert, return immutable static instance, else create new * @throws DataFormatException if not enough bytes * @since 0.8.3 */ public static Certificate create(byte[] data, int off) throws DataFormatException { int type; byte[] payload; + int length; try { type = data[off] & 0xff; - int length = (int) DataHelper.fromLong(data, off + 1, 2); + length = (int) DataHelper.fromLong(data, off + 1, 2); if (type == 0 && length == 0) return NULL_CERT; // from here down roughly the same as readBytes() below @@ -68,6 +69,12 @@ public class Certificate extends DataStructureImpl { throw new DataFormatException("not enough bytes", aioobe); } if (type == CERTIFICATE_TYPE_KEY) { + if (length == 4) { + if (Arrays.equals(payload, KeyCertificate.Ed25519_PAYLOAD)) + return KeyCertificate.ELG_Ed25519_CERT; + if (Arrays.equals(payload, KeyCertificate.ECDSA256_PAYLOAD)) + return KeyCertificate.ELG_ECDSA256_CERT; + } try { return new KeyCertificate(payload); } catch (DataFormatException dfe) { @@ -78,7 +85,7 @@ public class Certificate extends DataStructureImpl { } /** - * If null cert, return immutable static instance, else create new + * If null, P256 key, or Ed25519 key cert, return immutable static instance, else create new * @since 0.8.3 */ public static Certificate create(InputStream in) throws DataFormatException, IOException { @@ -93,8 +100,15 @@ public class Certificate extends DataStructureImpl { int read = DataHelper.read(in, payload); if (read != length) throw new DataFormatException("Not enough bytes for the payload (read: " + read + " length: " + length + ')'); - if (type == CERTIFICATE_TYPE_KEY) + if (type == CERTIFICATE_TYPE_KEY) { + if (length == 4) { + if (Arrays.equals(payload, KeyCertificate.Ed25519_PAYLOAD)) + return KeyCertificate.ELG_Ed25519_CERT; + if (Arrays.equals(payload, KeyCertificate.ECDSA256_PAYLOAD)) + return KeyCertificate.ELG_ECDSA256_CERT; + } return new KeyCertificate(payload); + } return new Certificate(type, payload); } diff --git a/core/java/src/net/i2p/data/KeyCertificate.java b/core/java/src/net/i2p/data/KeyCertificate.java index 86078658f..1c35d6c31 100644 --- a/core/java/src/net/i2p/data/KeyCertificate.java +++ b/core/java/src/net/i2p/data/KeyCertificate.java @@ -17,15 +17,41 @@ public class KeyCertificate extends Certificate { public static final int HEADER_LENGTH = 4; + /** @since 0.9.22 pkg private for Certificate.create() */ + static final byte[] Ed25519_PAYLOAD = new byte[] { + 0, (byte) (SigType.EdDSA_SHA512_Ed25519.getCode()), 0, 0 + }; + + /** @since 0.9.22 pkg private for Certificate.create() */ + static final byte[] ECDSA256_PAYLOAD = new byte[] { + 0, (byte) (SigType.ECDSA_SHA256_P256.getCode()), 0, 0 + }; + + /** + * An immutable ElG/ECDSA-P256 certificate. + */ public static final KeyCertificate ELG_ECDSA256_CERT; + + /** + * An immutable ElG/Ed25519 certificate. + * @since 0.9.22 + */ + public static final KeyCertificate ELG_Ed25519_CERT; + static { KeyCertificate kc; try { kc = new ECDSA256Cert(); } catch (DataFormatException dfe) { - kc = null; // won't happen + throw new RuntimeException(dfe); // won't happen } ELG_ECDSA256_CERT = kc; + try { + kc = new Ed25519Cert(); + } catch (DataFormatException dfe) { + throw new RuntimeException(dfe); // won't happen + } + ELG_Ed25519_CERT = kc; } /** @@ -185,19 +211,17 @@ public class KeyCertificate extends Certificate { /** * An immutable ElG/ECDSA-256 certificate. - * @since 0.8.3 */ private static final class ECDSA256Cert extends KeyCertificate { private static final byte[] ECDSA256_DATA = new byte[] { CERTIFICATE_TYPE_KEY, 0, HEADER_LENGTH, 0, (byte) (SigType.ECDSA_SHA256_P256.getCode()), 0, 0 }; private static final int ECDSA256_LENGTH = ECDSA256_DATA.length; - private static final byte[] ECDSA256_PAYLOAD = new byte[] { - 0, (byte) (SigType.ECDSA_SHA256_P256.getCode()), 0, 0 - }; + private final int _hashcode; public ECDSA256Cert() throws DataFormatException { super(ECDSA256_PAYLOAD); + _hashcode = super.hashCode(); } /** @throws RuntimeException always */ @@ -246,7 +270,75 @@ public class KeyCertificate extends Certificate { /** Overridden for efficiency */ @Override public int hashCode() { - return 1234567; + return _hashcode; + } + } + + /** + * An immutable ElG/Ed25519 certificate. + * @since 0.9.22 + */ + private static final class Ed25519Cert extends KeyCertificate { + private static final byte[] ED_DATA = new byte[] { CERTIFICATE_TYPE_KEY, + 0, HEADER_LENGTH, + 0, (byte) SigType.EdDSA_SHA512_Ed25519.getCode(), + 0, 0 + }; + private static final int ED_LENGTH = ED_DATA.length; + private final int _hashcode; + + public Ed25519Cert() throws DataFormatException { + super(Ed25519_PAYLOAD); + _hashcode = super.hashCode(); + } + + /** @throws RuntimeException always */ + @Override + public void setCertificateType(int type) { + throw new RuntimeException("Data already set"); + } + + /** @throws RuntimeException always */ + @Override + public void setPayload(byte[] payload) { + throw new RuntimeException("Data already set"); + } + + /** @throws RuntimeException always */ + @Override + public void readBytes(InputStream in) throws DataFormatException, IOException { + throw new RuntimeException("Data already set"); + } + + /** Overridden for efficiency */ + @Override + public void writeBytes(OutputStream out) throws IOException { + out.write(ED_DATA); + } + + /** Overridden for efficiency */ + @Override + public int writeBytes(byte target[], int offset) { + System.arraycopy(ED_DATA, 0, target, offset, ED_LENGTH); + return ED_LENGTH; + } + + /** @throws RuntimeException always */ + @Override + public int readBytes(byte source[], int offset) throws DataFormatException { + throw new RuntimeException("Data already set"); + } + + /** Overridden for efficiency */ + @Override + public int size() { + return ED_LENGTH; + } + + /** Overridden for efficiency */ + @Override + public int hashCode() { + return _hashcode; } } } diff --git a/history.txt b/history.txt index 3dd700a2f..37d8b5652 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-08-31 zzz + * Data: Cache P256 and Ed255i9 key certificates + * i2psnark: Change default sig type to Ed25519 + 2015-08-29 zzz * Router: - Change default RI sig type to Ed25519, with a 10% chance od diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0725033fa..f6e6df3a5 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 = ""; From 483d7c43ee4dc966e614051a660e3c9c2f67d6dc Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 1 Sep 2015 11:56:58 +0000 Subject: [PATCH 135/258] Router: Change thread name so it truncates better (ticket #1648) --- router/java/src/net/i2p/router/Router.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index c6cc76f68..a76d4b7fa 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -398,7 +398,7 @@ public class Router implements RouterClock.ClockShiftListener { _oomListener = new OOMListener(_context); _shutdownHook = new ShutdownHook(_context); - _gracefulShutdownDetector = new I2PAppThread(new GracefulShutdown(_context), "Graceful shutdown hook", true); + _gracefulShutdownDetector = new I2PAppThread(new GracefulShutdown(_context), "Graceful ShutdownHook", true); _gracefulShutdownDetector.setPriority(Thread.NORM_PRIORITY + 1); _gracefulShutdownDetector.start(); From 61edd01e3d6666bfb198eb856a67071ac15e8916 Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 4 Sep 2015 18:44:05 +0000 Subject: [PATCH 136/258] Switch URL/certificate for backup's reseed server --- .../certificates/ssl/link.mx24.eu.crt | 24 ------------------- .../certificates/ssl/user.mx24.eu.crt | 17 +++++++++++++ .../i2p/router/networkdb/reseed/Reseeder.java | 2 +- 3 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 installer/resources/certificates/ssl/link.mx24.eu.crt create mode 100644 installer/resources/certificates/ssl/user.mx24.eu.crt diff --git a/installer/resources/certificates/ssl/link.mx24.eu.crt b/installer/resources/certificates/ssl/link.mx24.eu.crt deleted file mode 100644 index 8e0d910fc..000000000 --- a/installer/resources/certificates/ssl/link.mx24.eu.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIJAMsPNG1k0yV4MA0GCSqGSIb3DQEBCwUAMIGdMQswCQYD -VQQGEwJERTEVMBMGA1UECAwMbGluay5teDI0LmV1MRUwEwYDVQQHDAxsaW5rLm14 -MjQuZXUxFTATBgNVBAoMDGxpbmsubXgyNC5ldTEVMBMGA1UECwwMbGluay5teDI0 -LmV1MRUwEwYDVQQDDAxsaW5rLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDGxpbmsu -bXgyNC5ldTAeFw0xNDExMTkxOTE4NTRaFw0yMDA1MTExOTE4NTRaMIGdMQswCQYD -VQQGEwJERTEVMBMGA1UECAwMbGluay5teDI0LmV1MRUwEwYDVQQHDAxsaW5rLm14 -MjQuZXUxFTATBgNVBAoMDGxpbmsubXgyNC5ldTEVMBMGA1UECwwMbGluay5teDI0 -LmV1MRUwEwYDVQQDDAxsaW5rLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDGxpbmsu -bXgyNC5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8modDBRkyh -SHSm92pTfguO3F6n5ocsBJ4vaVoosYq3ILCsapjqmynMHZUef6gEB7+Gn5cKXsH2 -JaKOeb8DHrOFCaxfj187x1QfZj1UNMQblx2T9q4th12tqp+k4JuLwgemr+2uAUpM -xx/uHRJXD0hf67+fHQFYNVfa+WvT46xlKGsWDQ0LBsA/z4YGnyeaV4PrS5nj3euA -IbdfDj7rJea3bfhSqYA1ZH1cquKlsXOOYO5cIcXsa5dxDWX51QS+i7+ocph+JN1X -dRh6ZirE9OXZVXwXXVRnJSYjgBlP/DQBdE7YkE1R3LyCVZsgxJaaLV/ujijOIK61 -SqEhHvFNRe0CAwEAAaNQME4wHQYDVR0OBBYEFB6XRz6VZlrAE+3xL6AyKrkq+y2X -MB8GA1UdIwQYMBaAFB6XRz6VZlrAE+3xL6AyKrkq+y2XMAwGA1UdEwQFMAMBAf8w -DQYJKoZIhvcNAQELBQADggEBADhxBA5GHisDVf5a+1hIi7FBGBjJJLqzlaKh+bFB -gTCYfk3F4wYzndr1HpdCZSSYDtY3mXFNMWQCpwvwvy1DM+9AMRY68wKNXHa/WypW -zQSqTfEH8cdaIXUALB7pdWFVr3rx0f7/8I0Gj/ByUbJ94rzd22vduX5riY0Rag6B -dPtW0M9bJrC1AIjexzDcStupj9v/ceGYZQYC4zb2tZ7Ek/6q+vei8TxWZjku7Dl4 -YRPXXufyB24uQ1hJVy2fSyIJ63tIRJoEFLBNaKDOB53i10xLWBcsJpXKY57AOQMn -flqW4HG8uGJ/o1WjhiOB9eI7T9toy08zNzt+kSI/blFIoek= ------END CERTIFICATE----- diff --git a/installer/resources/certificates/ssl/user.mx24.eu.crt b/installer/resources/certificates/ssl/user.mx24.eu.crt new file mode 100644 index 000000000..38c68ab5b --- /dev/null +++ b/installer/resources/certificates/ssl/user.mx24.eu.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICwDCCAkagAwIBAgIJAKXCoCBjd/C0MAoGCCqGSM49BAMEMIGdMQswCQYDVQQG +EwJERTEVMBMGA1UECAwMdXNlci5teDI0LmV1MRUwEwYDVQQHDAx1c2VyLm14MjQu +ZXUxFTATBgNVBAoMDHVzZXIubXgyNC5ldTEVMBMGA1UECwwMdXNlci5teDI0LmV1 +MRUwEwYDVQQDDAx1c2VyLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDHVzZXIubXgy +NC5ldTAeFw0xNTA5MDMxNjMyNDVaFw0yMTAyMjMxNjMyNDVaMIGdMQswCQYDVQQG +EwJERTEVMBMGA1UECAwMdXNlci5teDI0LmV1MRUwEwYDVQQHDAx1c2VyLm14MjQu +ZXUxFTATBgNVBAoMDHVzZXIubXgyNC5ldTEVMBMGA1UECwwMdXNlci5teDI0LmV1 +MRUwEwYDVQQDDAx1c2VyLm14MjQuZXUxGzAZBgkqhkiG9w0BCQEWDHVzZXIubXgy +NC5ldTB2MBAGByqGSM49AgEGBSuBBAAiA2IABPlKs5fYTqVhIOMiR6U9U4TimxS3 +P5NBDVzeeIAgbw5KBC8UImScZVt9g4V1wQe5kPs7TxA2BfanAPZ+ekQiRRvMVQxD +bSlRYupEWhq5BrJI6Lq/HDc7VJe9UUWffWKUoKNQME4wHQYDVR0OBBYEFBGJ0Yr+ +PZXnrk5RafQEALUpAU6ZMB8GA1UdIwQYMBaAFBGJ0Yr+PZXnrk5RafQEALUpAU6Z +MAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwQDaAAwZQIxAPcovePHMCosrAQNzS5i +VDUiyPNLOxHyRBm79yKXGl13LxysB6OK+2M7t8j8E/udBwIwXVVjxN6aSgXYTJ7d +p+Hg/2CuBMwf41/ENRcYQA+oGS9bU6A+7U9KJ1xTWWoqsUEs +-----END CERTIFICATE----- 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 d930cac9b..146a734f3 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -98,7 +98,7 @@ public class Reseeder { "https://us.reseed.i2p2.no:444/" + "," + "https://uk.reseed.i2p2.no:444/" + "," + "https://reseed.i2p.vzaws.com:8443/" + ", " + // Only SU3 (v3) support - "https://link.mx24.eu/" + "," + // Only HTTPS and SU3 (v3) support + "https://user.mx24.eu/" + "," + // Only HTTPS and SU3 (v3) support "https://ieb9oopo.mooo.com/"; // Only HTTPS and SU3 (v3) support private static final String SU3_FILENAME = "i2pseeds.su3"; From fe69d3b8f71544740cc77657fd1eaf5e294a001a Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Sep 2015 21:05:38 +0000 Subject: [PATCH 137/258] UPnP: Fix "content not allowed in trailing section" (tickets #481, #1653) patch from 'kay" in #1653, dev agreement received --- history.txt | 4 +++ .../src/net/i2p/router/RouterVersion.java | 4 +-- .../cybergarage/xml/parser/JaxpParser.java | 34 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/history.txt b/history.txt index 37d8b5652..db2c40c3d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2015-09-04 zzz + * UPnP: Fix "content not allowed in trailing section" + (tickets #481, #1653) + 2015-08-31 zzz * Data: Cache P256 and Ed255i9 key certificates * i2psnark: Change default sig type to Ed25519 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5..ba403a9f3 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ 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 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); diff --git a/router/java/src/org/cybergarage/xml/parser/JaxpParser.java b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java index 332c5525f..af84b14f3 100644 --- a/router/java/src/org/cybergarage/xml/parser/JaxpParser.java +++ b/router/java/src/org/cybergarage/xml/parser/JaxpParser.java @@ -184,6 +184,40 @@ public class JaxpParser extends Parser } return rv; } + + /** @since 0.9.22 */ + @Override + public int read(byte[] b) throws IOException { + return this.read(b, 0, b.length); + } + + /** @since 0.9.22 */ + @Override + public int read(byte[] b, int off, int len) throws IOException { + if (b == null) { + throw new NullPointerException(); + } else if (off < 0 || len < 0 || len > b.length - off) { + throw new IndexOutOfBoundsException(); + } else if (len == 0) { + return 0; + } + + int rv = this.read(); + if (-1 == rv) { + return -1; + } + + int i = 1; + b[off] = (byte) rv; + for (; i < len; i++) { + rv = this.read(); + if (-1 == rv) { + break; + } + b[off + i] = (byte) rv; + } + return i; + } } /** From 2c6edf401f8fe4d84d86bafcfe3ed3825edfe81d Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 4 Sep 2015 21:15:48 +0000 Subject: [PATCH 138/258] add extra to bumpBuild output after change --- 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 ba403a9f3..ae4c8ac3a 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 = "-rc"; From e978bb81a07a7345f4a9105b3d37cd38c7d919eb Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 5 Sep 2015 14:02:21 +0000 Subject: [PATCH 139/258] checked in correct file --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 8b2ef5085..8190e4fa1 100644 --- a/build.xml +++ b/build.xml @@ -450,7 +450,7 @@ if (newBuildNumber != 'unknown' && newBuildNumber != null) { echo = project.createTask("echo"); project.setProperty("new.i2p.build.number", newBuildNumber); - echo.setMessage("Build number is now: " + newBuildNumber); + echo.setMessage("Build number is now: " + newBuildNumber + project.getProperty("build.extra")); echo.perform(); } ]]> From c4cbd7d5c45bc117f476b6f6098b07b74adcca70 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 6 Sep 2015 08:01:28 +0000 Subject: [PATCH 140/258] (hopefully temporarily) disable netdb.rows.io as it's been down for nearly a month. --- router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 146a734f3..f619391ec 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -89,7 +89,7 @@ public class Reseeder { /** @since 0.8.2 */ public static final String DEFAULT_SSL_SEED_URL = "https://reseed.i2p-projekt.de/" + "," + // Only HTTPS - "https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support + //"https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support "https://i2p.mooo.com/netDb/" + "," + // ticket #1596 From de2431e9ee1f0091655c3749ae5a5a27cf48722f Mon Sep 17 00:00:00 2001 From: dg2-new Date: Mon, 7 Sep 2015 18:18:16 +0000 Subject: [PATCH 141/258] Fix auto-start of new .torrents in the Snark folder --- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 4 ++-- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 771821827..7d64813e5 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1247,7 +1247,7 @@ public class SnarkManager implements CompleteListener { _log.info("New Snark, torrent: " + filename + " base: " + baseFile); torrent = new Snark(_util, filename, null, -1, null, null, this, _peerCoordinatorSet, _connectionAcceptor, - false, dataDir.getPath(), baseFile); + shouldAutoStart(), dataDir.getPath(), baseFile); loadSavedFilePriorities(torrent); synchronized (_snarks) { _snarks.put(filename, torrent); @@ -1278,7 +1278,7 @@ public class SnarkManager implements CompleteListener { running = true; } else { running = false; - } + } // Were we running last time? if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ae4c8ac3a..c76c0f106 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 = "-rc"; From ab134261f0846a2ae9972dcb012599b73297fd5c Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 11 Sep 2015 00:53:13 +0000 Subject: [PATCH 142/258] Translation updates from Transifex --- apps/desktopgui/locale/messages_uk.po | 8 +- apps/i2psnark/locale/messages_de.po | 10 +- apps/i2psnark/locale/messages_pl.po | 9 +- apps/i2psnark/locale/messages_ro.po | 826 ++++++++------- apps/i2ptunnel/locale-proxy/messages_uk.po | 63 +- apps/i2ptunnel/locale/messages_sv.po | 41 +- apps/i2ptunnel/locale/messages_uk.po | 10 +- apps/ministreaming/locale/messages_uk.po | 15 +- .../locale-countries/messages_pl.po | 39 +- .../locale-countries/messages_pt.po | 39 +- .../locale-countries/messages_tr.po | 40 +- .../locale-countries/messages_uk.po | 40 +- apps/routerconsole/locale-news/messages_sv.po | 9 +- apps/routerconsole/locale-news/messages_tr.po | 10 +- apps/routerconsole/locale-news/messages_uk.po | 6 +- apps/routerconsole/locale/messages_de.po | 28 +- apps/routerconsole/locale/messages_fr.po | 10 +- apps/routerconsole/locale/messages_ja.po | 323 +++--- apps/routerconsole/locale/messages_pl.po | 998 +++++++++--------- apps/routerconsole/locale/messages_ru.po | 909 ++++++++-------- apps/routerconsole/locale/messages_tr.po | 972 ++++++++--------- apps/routerconsole/locale/messages_uk.po | 103 +- apps/susidns/locale/messages_ja.po | 27 +- apps/susidns/locale/messages_tr.po | 136 +-- apps/susidns/locale/messages_uk.po | 33 +- apps/susimail/locale/messages_uk.po | 10 +- 26 files changed, 2407 insertions(+), 2307 deletions(-) diff --git a/apps/desktopgui/locale/messages_uk.po b/apps/desktopgui/locale/messages_uk.po index c45356c20..3084ecab5 100644 --- a/apps/desktopgui/locale/messages_uk.po +++ b/apps/desktopgui/locale/messages_uk.po @@ -4,7 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Denis Blank , 2011 +# Denis Lysenko , 2011 # LinuxChata, 2014 # madjong , 2014 msgid "" @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-09 19:27+0000\n" -"PO-Revision-Date: 2014-12-17 17:00+0000\n" -"Last-Translator: madjong \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 16:31+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index ad4612891..927df100d 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -12,7 +12,7 @@ # Ettore Atalan , 2014 # foo , 2009 # SteinQuadrat, 2013 -# Lars Schimmer , 2014 +# Lars Schimmer , 2014-2015 # Max Muster , 2014 # mixxy, 2011 # nextloop , 2013 @@ -23,9 +23,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:09+0000\n" -"PO-Revision-Date: 2015-07-17 01:32+0000\n" -"Last-Translator: kytv \n" -"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" +"PO-Revision-Date: 2015-08-21 21:02+0000\n" +"Last-Translator: Lars Schimmer \n" +"Language-Team: German (http://www.transifex.com/otf/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -659,7 +659,7 @@ msgstr[1] "{0} DHT-Gegenstellen" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 msgid "Dest" -msgstr "" +msgstr "Ziel" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" diff --git a/apps/i2psnark/locale/messages_pl.po b/apps/i2psnark/locale/messages_pl.po index 6072b60ec..854c90672 100644 --- a/apps/i2psnark/locale/messages_pl.po +++ b/apps/i2psnark/locale/messages_pl.po @@ -11,14 +11,15 @@ # polacco , 2012 # seb, 2014 # Smert i2p , 2013 +# Taporpo Ne , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:09+0000\n" -"PO-Revision-Date: 2015-07-17 01:32+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" +"PO-Revision-Date: 2015-09-03 19:18+0000\n" +"Last-Translator: Taporpo Ne \n" +"Language-Team: Polish (http://www.transifex.com/otf/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -655,7 +656,7 @@ msgstr[2] "{0} peerów DHT" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 msgid "Dest" -msgstr "" +msgstr "Cel" #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" diff --git a/apps/i2psnark/locale/messages_ro.po b/apps/i2psnark/locale/messages_ro.po index 5259dc9c8..98d4bb92c 100644 --- a/apps/i2psnark/locale/messages_ro.po +++ b/apps/i2psnark/locale/messages_ro.po @@ -4,236 +4,243 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# Di N., 2015 +# titus , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-01 20:06+0000\n" -"PO-Revision-Date: 2013-12-05 15:04+0000\n" -"Last-Translator: polearnik \n" -"Language-Team: Romanian (http://www.transifex.com/projects/p/I2P/language/ro/)\n" +"POT-Creation-Date: 2015-07-17 01:09+0000\n" +"PO-Revision-Date: 2015-07-21 13:47+0000\n" +"Last-Translator: Di N.\n" +"Language-Team: Romanian (http://www.transifex.com/otf/I2P/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../java/src/org/klomp/snark/IdleChecker.java:69 -#: ../java/src/org/klomp/snark/SnarkManager.java:1938 -#: ../java/src/org/klomp/snark/SnarkManager.java:1949 +#: ../java/src/org/klomp/snark/IdleChecker.java:75 +msgid "No more torrents running." +msgstr "Nu sunt torrente care rulează" + +#: ../java/src/org/klomp/snark/IdleChecker.java:76 +#: ../java/src/org/klomp/snark/SnarkManager.java:2392 +#: ../java/src/org/klomp/snark/SnarkManager.java:2403 msgid "I2P tunnel closed." msgstr "Tunel I2P închis." #: ../java/src/org/klomp/snark/MagnetURI.java:42 #: ../java/src/org/klomp/snark/MagnetURI.java:52 -#: ../java/src/org/klomp/snark/SnarkManager.java:1644 +#: ../java/src/org/klomp/snark/SnarkManager.java:2096 msgid "Magnet" msgstr "Magnet" -#: ../java/src/org/klomp/snark/SnarkManager.java:504 +#: ../java/src/org/klomp/snark/SnarkManager.java:772 #, java-format msgid "Total uploaders limit changed to {0}" msgstr "Limita totala de incarcare schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:506 +#: ../java/src/org/klomp/snark/SnarkManager.java:774 #, java-format msgid "Minimum total uploaders limit is {0}" msgstr "Limita totala minimă de incarcare este {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:518 +#: ../java/src/org/klomp/snark/SnarkManager.java:786 #, java-format msgid "Up BW limit changed to {0}KBps" msgstr "Limita de incarcare BW schimbat la {0} Kbps" -#: ../java/src/org/klomp/snark/SnarkManager.java:520 +#: ../java/src/org/klomp/snark/SnarkManager.java:788 #, java-format msgid "Minimum up bandwidth limit is {0}KBps" msgstr "Limita de lățime de bandă minima la incarcarea este {0} Kbps" -#: ../java/src/org/klomp/snark/SnarkManager.java:532 +#: ../java/src/org/klomp/snark/SnarkManager.java:800 #, java-format msgid "Startup delay changed to {0}" msgstr "Întârziere de pornire schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:543 +#: ../java/src/org/klomp/snark/SnarkManager.java:811 #, java-format msgid "Refresh time changed to {0}" msgstr "Actualizarea timpului schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:545 +#: ../java/src/org/klomp/snark/SnarkManager.java:813 msgid "Refresh disabled" msgstr "Refresh dezactivat" -#: ../java/src/org/klomp/snark/SnarkManager.java:561 +#: ../java/src/org/klomp/snark/SnarkManager.java:829 #, java-format msgid "Page size changed to {0}" msgstr "Schimbat dimensiunea paginii la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:570 +#: ../java/src/org/klomp/snark/SnarkManager.java:838 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:956 msgid "Data directory must be an absolute path" msgstr "Dosarul de data de lucru trebuie să fie o cale absolută" -#: ../java/src/org/klomp/snark/SnarkManager.java:572 +#: ../java/src/org/klomp/snark/SnarkManager.java:840 msgid "Data directory does not exist" msgstr "Dosarul de date nu există" -#: ../java/src/org/klomp/snark/SnarkManager.java:574 +#: ../java/src/org/klomp/snark/SnarkManager.java:842 msgid "Not a directory" msgstr "Nu e un dosar" -#: ../java/src/org/klomp/snark/SnarkManager.java:576 +#: ../java/src/org/klomp/snark/SnarkManager.java:844 msgid "Unreadable" msgstr "necitibil" -#: ../java/src/org/klomp/snark/SnarkManager.java:581 +#: ../java/src/org/klomp/snark/SnarkManager.java:849 #, java-format msgid "Data directory changed to {0}" msgstr "Dosarul de date s-a schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:636 +#: ../java/src/org/klomp/snark/SnarkManager.java:904 msgid "I2CP and tunnel changes will take effect after stopping all torrents" msgstr "I2CP și tunel modificările vor intra în vigoare după oprirea tuturor torrentele" -#: ../java/src/org/klomp/snark/SnarkManager.java:640 +#: ../java/src/org/klomp/snark/SnarkManager.java:908 #, java-format msgid "I2CP options changed to {0}" msgstr "Opțiuni I2CP schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:646 +#: ../java/src/org/klomp/snark/SnarkManager.java:914 msgid "Disconnecting old I2CP destination" msgstr "Deconectarea destinației vechi I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:648 +#: ../java/src/org/klomp/snark/SnarkManager.java:916 #, java-format msgid "I2CP settings changed to {0}" msgstr "Opțiuni I2CP schimbat la {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:653 +#: ../java/src/org/klomp/snark/SnarkManager.java:921 msgid "" "Unable to connect with the new settings, reverting to the old I2CP settings" msgstr "Imposibil de a se conecta cu noile setări, revenirea la vechile setări I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:657 +#: ../java/src/org/klomp/snark/SnarkManager.java:925 msgid "Unable to reconnect with the old settings!" msgstr "Nu pot să se reconectez cu setările vechi!" -#: ../java/src/org/klomp/snark/SnarkManager.java:659 +#: ../java/src/org/klomp/snark/SnarkManager.java:927 msgid "Reconnected on the new I2CP destination" msgstr "Reconectat la destinație noua I2CP" -#: ../java/src/org/klomp/snark/SnarkManager.java:666 +#: ../java/src/org/klomp/snark/SnarkManager.java:934 #, java-format msgid "I2CP listener restarted for \"{0}\"" msgstr "I2CP ascultător repornit pentru \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:680 +#: ../java/src/org/klomp/snark/SnarkManager.java:948 msgid "New files will be publicly readable" msgstr "Fișiere noi vor putea fi citite public" -#: ../java/src/org/klomp/snark/SnarkManager.java:682 +#: ../java/src/org/klomp/snark/SnarkManager.java:950 msgid "New files will not be publicly readable" msgstr "Fișiere noi nu vor putea fi citite public" -#: ../java/src/org/klomp/snark/SnarkManager.java:689 +#: ../java/src/org/klomp/snark/SnarkManager.java:957 msgid "Enabled autostart" msgstr "Activeaza autopornirea" -#: ../java/src/org/klomp/snark/SnarkManager.java:691 +#: ../java/src/org/klomp/snark/SnarkManager.java:959 msgid "Disabled autostart" msgstr "Dezactivează autopornirea" -#: ../java/src/org/klomp/snark/SnarkManager.java:697 +#: ../java/src/org/klomp/snark/SnarkManager.java:965 msgid "Enabled open trackers - torrent restart required to take effect." msgstr "Trackere deschise activat - repornirea torrentui este necesara să aibă efect." -#: ../java/src/org/klomp/snark/SnarkManager.java:699 +#: ../java/src/org/klomp/snark/SnarkManager.java:967 msgid "Disabled open trackers - torrent restart required to take effect." msgstr "Trackere deschise dezactivat - repornirea torrentui este necesara să aibă efect." -#: ../java/src/org/klomp/snark/SnarkManager.java:706 +#: ../java/src/org/klomp/snark/SnarkManager.java:974 msgid "Enabled DHT." msgstr "DHT activat." -#: ../java/src/org/klomp/snark/SnarkManager.java:708 +#: ../java/src/org/klomp/snark/SnarkManager.java:976 msgid "Disabled DHT." msgstr "DHT dezactivat." -#: ../java/src/org/klomp/snark/SnarkManager.java:710 +#: ../java/src/org/klomp/snark/SnarkManager.java:978 msgid "DHT change requires tunnel shutdown and reopen" msgstr "Schimbare DHT necesită oprirea tunel și redeschiderea lui" -#: ../java/src/org/klomp/snark/SnarkManager.java:717 +#: ../java/src/org/klomp/snark/SnarkManager.java:985 #, java-format msgid "{0} theme loaded, return to main i2psnark page to view." msgstr "{0} temă încărcata, a reveni la pagina principală i2psnark pentru a vizualiza." -#: ../java/src/org/klomp/snark/SnarkManager.java:727 +#: ../java/src/org/klomp/snark/SnarkManager.java:995 msgid "Configuration unchanged." msgstr "Configuraţia neschimbată" -#: ../java/src/org/klomp/snark/SnarkManager.java:759 +#: ../java/src/org/klomp/snark/SnarkManager.java:1027 msgid "Open Tracker list changed - torrent restart required to take effect." msgstr "Trackere deschise schimbat - repornirea torrentui este necesara să aibă efect." -#: ../java/src/org/klomp/snark/SnarkManager.java:769 +#: ../java/src/org/klomp/snark/SnarkManager.java:1037 msgid "Private tracker list changed - affects newly created torrents only." msgstr "Lista trackerilor private schimbat - afectează doar nou-create torrente." -#: ../java/src/org/klomp/snark/SnarkManager.java:815 +#: ../java/src/org/klomp/snark/SnarkManager.java:1083 #, java-format msgid "Unable to save the config to {0}" msgstr "Imposibil de a salva configurarea {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:893 +#: ../java/src/org/klomp/snark/SnarkManager.java:1164 msgid "Connecting to I2P" msgstr "Conectarea la I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:896 +#: ../java/src/org/klomp/snark/SnarkManager.java:1167 msgid "Error connecting to I2P - check your I2CP settings!" msgstr "Eroare la conectarea la I2P - verificați setările I2CP!" -#: ../java/src/org/klomp/snark/SnarkManager.java:905 -#: ../java/src/org/klomp/snark/SnarkManager.java:1681 +#: ../java/src/org/klomp/snark/SnarkManager.java:1176 +#: ../java/src/org/klomp/snark/SnarkManager.java:2133 #, java-format msgid "Error: Could not add the torrent {0}" msgstr "Eroare: Nu sa putut adăuga torentul {0}" #. catch this here so we don't try do delete it below -#: ../java/src/org/klomp/snark/SnarkManager.java:927 +#: ../java/src/org/klomp/snark/SnarkManager.java:1199 #, java-format msgid "Cannot open \"{0}\"" msgstr "Nu se poate deschide \"{0}\"." #. TODO - if the existing one is a magnet, delete it and add the metainfo #. instead? -#: ../java/src/org/klomp/snark/SnarkManager.java:946 -#: ../java/src/org/klomp/snark/SnarkManager.java:1047 -#: ../java/src/org/klomp/snark/SnarkManager.java:1129 -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:159 +#: ../java/src/org/klomp/snark/SnarkManager.java:1218 +#: ../java/src/org/klomp/snark/SnarkManager.java:1352 +#: ../java/src/org/klomp/snark/SnarkManager.java:1440 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:166 #, java-format msgid "Torrent with this info hash is already running: {0}" msgstr "Torrent cu aceste informații hash este deja pornit: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:952 +#: ../java/src/org/klomp/snark/SnarkManager.java:1224 #, java-format msgid "ERROR - No I2P trackers in private torrent \"{0}\"" msgstr "EROARE - Nu sunt trackere I2P in torrent privat \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:954 +#: ../java/src/org/klomp/snark/SnarkManager.java:1226 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and" " DHT only." msgstr "Avertisment - Nu sunt trackere I2P în \"{0}\", va anunța numai la I2P trackers deschise și DHT ." -#: ../java/src/org/klomp/snark/SnarkManager.java:957 +#: ../java/src/org/klomp/snark/SnarkManager.java:1229 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will " "announce to DHT only." msgstr "Avertisment - Nu sunt trackere I2P în \"{0}\", și trackere deschise sunt dezactivate, se va anunța numai prin DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:959 +#: ../java/src/org/klomp/snark/SnarkManager.java:1231 #, java-format msgid "" "Warning - No I2P trackers in \"{0}\", and DHT and open trackers are " @@ -241,34 +248,34 @@ msgid "" "torrent." msgstr "Avertisment - Nu sunt trackere I2P în \"{0}\", și DHT și trackere deschise sunt dezactivate, ar trebui să permiteti trackere deschise sau DHT înainte de a începe torrent." -#: ../java/src/org/klomp/snark/SnarkManager.java:981 +#: ../java/src/org/klomp/snark/SnarkManager.java:1257 #, java-format msgid "Torrent in \"{0}\" is invalid" msgstr "Torrent în \"{0}\" este incorect" -#: ../java/src/org/klomp/snark/SnarkManager.java:988 -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:183 +#: ../java/src/org/klomp/snark/SnarkManager.java:1264 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:193 #, java-format msgid "ERROR - Out of memory, cannot create torrent from {0}" msgstr "EROARE - Out de memorie, nu se pot crea torrent din {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1000 +#: ../java/src/org/klomp/snark/SnarkManager.java:1285 #, java-format msgid "Torrent added and started: \"{0}\"" msgstr "Torrent adăugat și pornit: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1002 +#: ../java/src/org/klomp/snark/SnarkManager.java:1287 #, java-format msgid "Torrent added: \"{0}\"" msgstr "Torrent adăugat: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1058 -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:87 +#: ../java/src/org/klomp/snark/SnarkManager.java:1363 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:93 #, java-format msgid "Fetching {0}" msgstr "Preluarea {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1064 +#: ../java/src/org/klomp/snark/SnarkManager.java:1369 #, java-format msgid "" "Open trackers are disabled and we have no DHT peers. Fetch of {0} may not " @@ -276,311 +283,348 @@ msgid "" "DHT." msgstr "Trackere deschise sunt dezactivate și nu avem colegii DHT. Descarcarea din{0} nu poate reuși până când veți începe un alt torrent, permite trackere deschise, sau permite DHT." -#: ../java/src/org/klomp/snark/SnarkManager.java:1068 +#: ../java/src/org/klomp/snark/SnarkManager.java:1373 #, java-format msgid "Adding {0}" msgstr "Adăugarea {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1100 +#: ../java/src/org/klomp/snark/SnarkManager.java:1406 #, java-format msgid "Download already running: {0}" msgstr "Descarcarea deja rulează: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1139 -#: ../java/src/org/klomp/snark/SnarkManager.java:1162 -#: ../java/src/org/klomp/snark/SnarkManager.java:1600 +#: ../java/src/org/klomp/snark/SnarkManager.java:1451 +#: ../java/src/org/klomp/snark/SnarkManager.java:1477 +#: ../java/src/org/klomp/snark/SnarkManager.java:2052 #, java-format msgid "Failed to copy torrent file to {0}" msgstr " Copierea fisieurului torent in {0} a esuat" -#: ../java/src/org/klomp/snark/SnarkManager.java:1389 +#: ../java/src/org/klomp/snark/SnarkManager.java:1828 #, java-format msgid "Too many files in \"{0}\" ({1}), deleting it!" msgstr "Prea multe fișiere în \"{0}\" ({1}), ștergeti-le!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1391 +#: ../java/src/org/klomp/snark/SnarkManager.java:1830 #, java-format msgid "Torrent file \"{0}\" cannot end in \".torrent\", deleting it!" msgstr "Torrent \"{0}\" nu se poate termina cu \". Torrent\", ștergeti!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1393 +#: ../java/src/org/klomp/snark/SnarkManager.java:1832 #, java-format msgid "No pieces in \"{0}\", deleting it!" msgstr "Nu sunt piese din \"{0}\", ștergeti!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1395 +#: ../java/src/org/klomp/snark/SnarkManager.java:1834 #, java-format msgid "Too many pieces in \"{0}\", limit is {1}, deleting it!" msgstr "Prea multe piese în \"{0}\", limita este de {1}, ștergeti!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1397 +#: ../java/src/org/klomp/snark/SnarkManager.java:1836 #, java-format msgid "Pieces are too large in \"{0}\" ({1}B), deleting it." msgstr "Piese sunt prea mari în \"{0}\" ({1} B), ștergeti." -#: ../java/src/org/klomp/snark/SnarkManager.java:1398 +#: ../java/src/org/klomp/snark/SnarkManager.java:1837 #, java-format msgid "Limit is {0}B" msgstr "Limita este de {0} B" -#: ../java/src/org/klomp/snark/SnarkManager.java:1400 +#: ../java/src/org/klomp/snark/SnarkManager.java:1839 #, java-format msgid "Torrent \"{0}\" has no data, deleting it!" msgstr "Torrent \"{0}\" nu dispune de date, șterge-o!" -#: ../java/src/org/klomp/snark/SnarkManager.java:1408 +#: ../java/src/org/klomp/snark/SnarkManager.java:1847 #, java-format msgid "Torrents larger than {0}B are not supported yet, deleting \"{1}\"" msgstr "Torrents mai mari de {0} B nu sunt acceptate încă, ștergerea \"{1}\"Torrents mai mari de {0} B nu sunt acceptate încă, ștergerea \"{1}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1424 +#: ../java/src/org/klomp/snark/SnarkManager.java:1864 #, java-format msgid "Error: Could not remove the torrent {0}" msgstr "Eroare: Nu am putut șterge torentul {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1445 -#: ../java/src/org/klomp/snark/SnarkManager.java:1463 +#: ../java/src/org/klomp/snark/SnarkManager.java:1887 +#: ../java/src/org/klomp/snark/SnarkManager.java:1906 #, java-format msgid "Torrent stopped: \"{0}\"" msgstr "Torrent oprit: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1484 +#: ../java/src/org/klomp/snark/SnarkManager.java:1926 #, java-format msgid "Torrent removed: \"{0}\"" msgstr "Torrent sters: \"{0}\"" -#: ../java/src/org/klomp/snark/SnarkManager.java:1492 +#: ../java/src/org/klomp/snark/SnarkManager.java:1934 #, java-format msgid "Adding torrents in {0}" msgstr "Adăugarea torrente în {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1523 +#: ../java/src/org/klomp/snark/SnarkManager.java:1966 #, java-format msgid "Up bandwidth limit is {0} KBps" msgstr "Limita de lățime de bandă la incarcarea este {0} Kbps" -#: ../java/src/org/klomp/snark/SnarkManager.java:1545 +#: ../java/src/org/klomp/snark/SnarkManager.java:1993 #, java-format msgid "Download finished: {0}" msgstr "Descarcare finisata: {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1596 +#: ../java/src/org/klomp/snark/SnarkManager.java:2048 #, java-format msgid "Metainfo received for {0}" msgstr "Metainfo primit pentru {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1597 -#: ../java/src/org/klomp/snark/SnarkManager.java:1826 +#: ../java/src/org/klomp/snark/SnarkManager.java:2049 +#: ../java/src/org/klomp/snark/SnarkManager.java:2280 #, java-format msgid "Starting up torrent {0}" msgstr "Pornirea torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1612 +#: ../java/src/org/klomp/snark/SnarkManager.java:2064 #, java-format msgid "Error on torrent {0}" msgstr "Eroare pe torrent {0}" -#: ../java/src/org/klomp/snark/SnarkManager.java:1675 +#: ../java/src/org/klomp/snark/SnarkManager.java:2127 msgid "Unable to connect to I2P!" msgstr "Nu se poate stabili o conexiune la I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1825 -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:124 +#: ../java/src/org/klomp/snark/SnarkManager.java:2279 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:130 msgid "Opening the I2P tunnel" msgstr "Deschiderea tunelului I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1849 +#: ../java/src/org/klomp/snark/SnarkManager.java:2303 msgid "Opening the I2P tunnel and starting all torrents." msgstr "Deschiderea tunelului I2P și pornirea tuturor torrentelor." -#: ../java/src/org/klomp/snark/SnarkManager.java:1912 +#: ../java/src/org/klomp/snark/SnarkManager.java:2366 msgid "Stopping all torrents and closing the I2P tunnel." msgstr "Oprirea tuturor torrentelor și inchiderea tunelului I2P" -#: ../java/src/org/klomp/snark/SnarkManager.java:1931 +#: ../java/src/org/klomp/snark/SnarkManager.java:2385 msgid "Closing I2P tunnel after notifying trackers." msgstr "Închiderea tunelului I2P după notificarea trackere." -#: ../java/src/org/klomp/snark/TrackerClient.java:234 +#: ../java/src/org/klomp/snark/TrackerClient.java:245 #, java-format msgid "No valid trackers for {0} - enable opentrackers or DHT?" msgstr "Nu sunt trackere valabile pentru {0} - permite opentrackers sau DHT?" #: ../java/src/org/klomp/snark/UpdateHandler.java:49 -#: ../java/src/org/klomp/snark/UpdateRunner.java:227 +#: ../java/src/org/klomp/snark/UpdateRunner.java:228 msgid "Updating" msgstr "Actualizare" -#: ../java/src/org/klomp/snark/UpdateRunner.java:114 +#: ../java/src/org/klomp/snark/UpdateRunner.java:115 #, java-format msgid "Updating from {0}" msgstr "Actualizarea din {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:75 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:80 #, java-format msgid "Download torrent file from {0}" msgstr "Descărca fișierul torrent de la {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:97 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:103 #, java-format msgid "Torrent was not retrieved from {0}" msgstr "Torrent nu a fost preluat de la {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:150 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:157 #, java-format msgid "Torrent fetched from {0}" msgstr "Torrent preluat de la {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:171 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:178 #, java-format msgid "Torrent already running: {0}" msgstr "Torrent deja rulează: {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:173 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:180 #, java-format msgid "Torrent already in the queue: {0}" msgstr "Torrent deja în coada de așteptare: {0}" -#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:181 +#: ../java/src/org/klomp/snark/web/FetchAndAdd.java:191 #, java-format msgid "Torrent at {0} was not valid" msgstr "Torrent la {0} nu a fost valid" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:254 -msgid "I2PSnark - Anonymous BitTorrent Client" -msgstr "I2PSnark - BitTorrent Client Anonim" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:267 -msgid "Router is down" -msgstr "Router-ul este deactivat" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:284 -msgid "Torrents" -msgstr "Torente" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:288 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:298 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1486 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:268 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:311 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:322 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1763 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2662 msgid "I2PSnark" msgstr "I2PSnark" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:294 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:273 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2149 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2422 +msgid "Configuration" +msgstr "Configurație" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:275 +msgid "Anonymous BitTorrent Client" +msgstr "Client Bittorrent anonim" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:289 +msgid "Router is down" +msgstr "Router-ul este deactivat" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:306 +msgid "Torrents" +msgstr "Torente" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:317 msgid "Refresh page" msgstr "refresh pagina" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:302 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:326 msgid "Forum" msgstr "Forum" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:315 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:341 msgid "Click \"Add torrent\" button to fetch torrent" msgstr "Faceți clic pe \"Adauga torrent\" pentru a aduce torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:352 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:353 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:394 msgid "clear messages" msgstr "stergerea mesajelor" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:405 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:407 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2440 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2442 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2980 msgid "Status" msgstr "Stare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:418 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:420 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:451 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2994 +#, java-format +msgid "Sort by {0}" +msgstr "Sortează după {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:462 msgid "Hide Peers" msgstr "Ascunde utilizatori" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:430 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:432 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 msgid "Show Peers" msgstr "Arată utilizatori" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:439 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:441 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2269 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:491 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2648 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2681 msgid "Torrent" msgstr "Torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:449 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 +msgid "File type" +msgstr "Tip fișier" + +#. Translators: Please keep short or translate as " " +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:509 +msgid "ETA" +msgstr "eta" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:511 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:512 msgid "Estimated time remaining" msgstr "Estimare timp rămas" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:452 -msgid "ETA" -msgstr "eta" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:457 -msgid "Downloaded" -msgstr "Descărcat" - -#. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:460 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:535 msgid "RX" msgstr "RX" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:465 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:538 +msgid "Downloaded" +msgstr "Descărcat" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2818 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2968 +msgid "Size" +msgstr "Dimensiune" + +#. Translators: Please keep short or translate as " " +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:566 +msgid "TX" +msgstr "TX" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2836 +msgid "Upload ratio" +msgstr "Rată de încărcare" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:569 msgid "Uploaded" msgstr "Încărcat" #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:468 -msgid "TX" -msgstr "TX" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:581 +msgid "RX Rate" +msgstr "RX Rate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:474 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:583 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:584 msgid "Down Rate" msgstr "Rata de descarcare " #. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:477 -msgid "RX Rate" -msgstr "RX Rate" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:483 -msgid "Up Rate" -msgstr "Rata de incarcare " - -#. Translators: Please keep short or translate as " " -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:486 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:596 msgid "TX Rate" msgstr "TX Rate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:501 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:598 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:599 +msgid "Up Rate" +msgstr "Rata de incarcare " + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:615 msgid "Stop all torrents and the I2P tunnel" msgstr "Opreste toate torrentele și tunelul I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:503 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:617 msgid "Stop All" msgstr "Oprește toate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:629 msgid "Start all stopped torrents" msgstr "Începeți toate torrentele oprite" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:517 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:531 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:631 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:645 msgid "Start All" msgstr "Pornește toate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:643 msgid "Start all torrents and the I2P tunnel" msgstr "Porneste toate torrentele și tunelul I2P" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:555 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:668 msgid "No torrents loaded." msgstr "Niciun torent încărcat." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:561 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:674 msgid "Totals" msgstr "Totaluri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:676 #, java-format msgid "1 torrent" msgid_plural "{0} torrents" @@ -588,7 +632,7 @@ msgstr[0] "1 torrent" msgstr[1] "{0} torrente" msgstr[2] "{0} torrentу" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:568 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:681 #, java-format msgid "1 connected peer" msgid_plural "{0} connected peers" @@ -596,7 +640,7 @@ msgstr[0] "{0} utilizator conectat " msgstr[1] "{0} utilizatori conectati" msgstr[2] "{0} utilizatori conectati" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:575 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:688 #, java-format msgid "1 DHT peer" msgid_plural "{0} DHT peers" @@ -604,174 +648,207 @@ msgstr[0] "1 partener DHT" msgstr[1] "{0} parteneri DHT" msgstr[2] "{0} parteneri DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:611 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:695 +msgid "Dest" +msgstr "Dest" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First" msgstr "Primul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:611 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 msgid "First page" msgstr "P&rima pagină" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:622 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Prev" msgstr "Prev" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:622 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:833 msgid "Previous page" msgstr "Pagina anterioară" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next" msgstr "Următorul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:657 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:866 msgid "Next page" msgstr "Pagina următoare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last" msgstr "Ultimul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:667 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:874 msgid "Last page" msgstr "Ultima pagină" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:750 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:960 +msgid "Data directory cannot be created" +msgstr "Directorul de date nu poate fi creat" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:970 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1176 +#, java-format +msgid "Cannot add torrent {0} inside another torrent: {1}" +msgstr "Nu se poate adăuga torrentul {0} în interiorul altui torrent: {1}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:985 #, java-format msgid "Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"" msgstr "URL incorect: trebuie să înceapă cu \"http://\", \"{0}\", sau \"{1}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:793 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:823 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1026 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1055 #, java-format msgid "Magnet deleted: {0}" msgstr "Magnet sters: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:801 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:829 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1061 #, java-format msgid "Torrent file deleted: {0}" msgstr "Fișier torrent șters: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:821 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1053 #, java-format msgid "Download deleted: {0}" msgstr "Descarcă șterse: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:835 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1070 #, java-format msgid "Data file deleted: {0}" msgstr "Fișier data șters: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:837 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:848 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1072 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1081 #, java-format msgid "Data file could not be deleted: {0}" msgstr "Fișier de date nu a putut fi șters: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:863 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:872 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1097 #, java-format msgid "Directory could not be deleted: {0}" msgstr "Dosarul nu a putut fi sters {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:870 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1104 #, java-format msgid "Directory deleted: {0}" msgstr "Directorii șterse: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:942 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1155 +#, java-format +msgid "Cannot add a torrent ending in \".torrent\": {0}" +msgstr "Nu se poate adăuga un torrent terminat în \".torrent\": {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1160 +#, java-format +msgid "Torrent with this name is already running: {0}" +msgstr "Torrentul cu acest nume deja rulează: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1166 +#, java-format +msgid "Cannot add a torrent including an I2P directory: {0}" +msgstr "Nu se poate adăuga un torent ce include un director I2P: {0}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1181 +#, java-format +msgid "Cannot add torrent {0} including another torrent: {1}" +msgstr "Nu se poate adăuga torrent {0} ce include un alt torrent: {1}" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1207 msgid "Error - Cannot include alternate trackers without a primary tracker" msgstr "Eroare - Nu pot conține trackere alternative fără un tracker primar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:955 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1220 msgid "Error - Cannot mix private and public trackers in a torrent" msgstr "Eroare - Nu se poate amesteca trackere publice și private într-un torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:975 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1242 #, java-format msgid "Torrent created for \"{0}\"" msgstr "Torrent creat pentru \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:977 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 #, java-format msgid "" "Many I2P trackers require you to register new torrents before seeding - " "please do so before starting \"{0}\"" msgstr "Multe trackere I2P cer să vă înregistrați torrentele noi înainte de seedat - vă rugăm să faceți acest lucru înainte de a începe \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:979 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1246 #, java-format msgid "Error creating a torrent for \"{0}\"" msgstr "Eroare la crearea unui torrent pentru \"{0}\"" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:983 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1250 #, java-format msgid "Cannot create a torrent for the nonexistent data: {0}" msgstr "Nu se poate crea un torrent pentru datele inexistente: {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:986 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1253 msgid "Error creating torrent - you must enter a file or directory" msgstr "Eroare la crearea torrent - trebuie să introduceți un fișier sau director" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2031 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2406 msgid "Delete selected" msgstr "Șterge pe cel ales" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1017 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2032 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2408 msgid "Save tracker configuration" msgstr "Salvați configurația tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 msgid "Removed" msgstr "Șters" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1063 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2030 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2035 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2405 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2407 msgid "Add tracker" msgstr "Adaugă tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1086 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1089 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1356 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1359 msgid "Enter valid tracker name and URLs" msgstr "Introduceți numele tracker valid și URL-uri" #. "\n" + -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1091 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2034 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" msgstr "Restabileşte implicitele" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1094 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1364 msgid "Restored default trackers" msgstr "Trackers implicite restaurate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1215 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1216 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1472 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1473 msgid "Checking" msgstr "Se verifică" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1218 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1219 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1475 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1476 msgid "Allocating" msgstr "Alocare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1233 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1240 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1490 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1499 msgid "Tracker Error" msgstr "Eroare tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1235 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1263 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1268 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1279 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1284 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1290 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1295 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1492 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1522 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1527 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1538 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1543 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1549 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1554 #, java-format msgid "1 peer" msgid_plural "{0} peers" @@ -779,356 +856,366 @@ msgstr[0] "1 partener" msgstr[1] "{0} parteneri" msgstr[2] "{0} parteneri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1243 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1244 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1503 msgid "Starting" msgstr "Începere" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1252 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1511 msgid "Seeding" msgstr "Încărcare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1256 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1270 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1271 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2382 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2496 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1515 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1529 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2831 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3047 msgid "Complete" msgstr "Complet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1275 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1276 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1281 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1282 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1534 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1535 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1540 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1541 msgid "OK" msgstr "OK" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1286 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1287 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1292 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1293 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1545 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1546 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1551 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1552 msgid "Stalled" msgstr "Întrerupt" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1297 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1298 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1301 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1302 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1557 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1560 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 msgid "No Peers" msgstr "Nu sunt utilizatori" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1304 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1305 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1563 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1564 msgid "Stopped" msgstr "Oprit" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1338 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1593 msgid "Torrent details" msgstr "Detalii torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1367 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1628 msgid "View files" msgstr "Vizualizare fișierilor" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1369 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1630 msgid "Open file" msgstr "Deschide fișier" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1411 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1682 msgid "Stop the torrent" msgstr "Oprește torentul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1413 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 msgid "Stop" msgstr "Stop" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1425 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 msgid "Start the torrent" msgstr "Pornește torentul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1427 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 msgid "Start" msgstr "Start" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1439 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1712 msgid "Remove the torrent from the active list, deleting the .torrent file" msgstr "Scoateți torrent din lista torentelor activi, ștergem fișierul torrent." #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1444 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1717 #, java-format msgid "" "Are you sure you want to delete the file \\''{0}\\'' (downloaded data will " "not be deleted) ?" msgstr "Sigur doriți să ștergeți dosarul \\'' {0} \\'' (datele descărcate nu vor fi șterse)?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1447 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1721 msgid "Remove" msgstr "Șterge" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1459 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1734 msgid "Delete the .torrent file and the associated data file(s)" msgstr "Ștergeți fișierul torrent. Și fișier(e) de date asociat(e)" #. Can't figure out how to escape double quotes inside the onclick string. #. Single quotes in translate strings with parameters must be doubled. #. Then the remaining single quote must be escaped -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1464 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1739 #, java-format msgid "" "Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded " "data?" msgstr "Sigur doriți să ștergeți torrent \\'' {0} \\'' și toate datele descărcate?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1467 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1997 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1743 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2364 msgid "Delete" msgstr "Șterge" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1502 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1779 msgid "Unknown" msgstr "Necunoscut" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1514 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1791 msgid "Seed" msgstr "Seed" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1537 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1814 msgid "Uninteresting (The peer has no pieces we need)" msgstr "Neinteresante (partener nu are piese de care avem nevoie)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1539 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1816 msgid "Choked (The peer is not allowing us to request pieces)" msgstr "Înecat (partener nu ne permite să solicitam bucăți)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1559 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1836 msgid "Uninterested (We have no pieces the peer needs)" msgstr "Neinteresat (Nu avem piese de care are nevoie partener)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1561 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1838 msgid "Choking (We are not allowing the peer to request pieces)" msgstr "partenerSufocare (Noi nu permitem partenerului solicitarea bucăților)" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1616 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1954 #, java-format msgid "Details at {0} tracker" msgstr "Detalii la tracker {0}" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1633 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1971 msgid "Info" msgstr "Info" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1684 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2044 msgid "Add Torrent" msgstr "Adaugă torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1686 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2047 msgid "From URL" msgstr "Din URL" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1689 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2050 msgid "" "Enter the torrent file download URL (I2P only), magnet link, maggot link, or" " info hash" msgstr "Introduceți URL-ul de descarcare fișierilor torrent (I2P numai), link-ul magnet, maggot-link, sau info hash" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1694 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2055 msgid "Add torrent" msgstr "Adaugă torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1697 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2059 +msgid "Data dir" +msgstr "Dir date" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 +#, java-format +msgid "Enter the directory to save the data in (default {0})" +msgstr "Introdu directorul în care să se salveze datele (default {0})" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2066 #, java-format msgid "You can also copy .torrent files to: {0}." msgstr "De asemenea, puteți copia fișiere torrent la: {0}." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1699 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2068 msgid "Removing a .torrent will cause it to stop." msgstr "Stergerea .torrent va face ca acesta să se oprească." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1722 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2081 msgid "Create Torrent" msgstr "Creează un torent" #. out.write("From file:
\n"); -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1725 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2084 msgid "Data to seed" msgstr "Date pentru seedare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1729 -msgid "File or directory to seed (must be within the specified path)" -msgstr "Fișier sau director de seedare (trebuie să fie în calea specificată)" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2088 +#, java-format +msgid "File or directory to seed (full path or within the directory {0} )" +msgstr "Fișier sau director de seedare (calea completă sau în director {0} )" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1731 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1975 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2091 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2337 msgid "Trackers" msgstr "Trackere" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1733 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2093 msgid "Primary" msgstr "Primar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1735 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2095 msgid "Alternates" msgstr "Alternativă" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1738 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2098 msgid "Create torrent" msgstr "Creează un torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1756 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2116 msgid "none" msgstr "nici unul" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1789 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2046 -msgid "Configuration" -msgstr "Configurație" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1793 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2153 msgid "Data directory" msgstr "Dosar cu date" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1797 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2158 msgid "Files readable by all" msgstr "Fișiere lizibile de către toți" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1801 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2162 msgid "If checked, other users may access the downloaded files" msgstr "Dacă este bifată, utilizatorii pot accesa fișierele descărcate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1805 -msgid "Auto start" -msgstr "Start automat" +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2166 +msgid "Auto start torrents" +msgstr "Pornește automat torrente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1809 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2170 msgid "If checked, automatically start torrents that are added" msgstr "Dacă este bifată, începe automat torrentele care sunt adăugate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1813 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2174 msgid "Theme" msgstr "Teme" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1826 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2188 msgid "Refresh time" msgstr "Timp de reîmprospătare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1839 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2201 msgid "Never" msgstr "Niciodată" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1845 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2207 msgid "Startup delay" msgstr "întârziere de pornire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1847 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2209 msgid "minutes" msgstr "minute" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1851 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2213 msgid "Page size" msgstr "Mărimea paginii" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1853 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2215 msgid "torrents" msgstr "Torente" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1877 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2239 msgid "Total uploader limit" msgstr "Limită totală de încărcare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1880 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2242 msgid "peers" msgstr "Parteneri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1884 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2246 msgid "Up bandwidth limit" msgstr "limita de incarcare de lățime de bandă" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1887 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2249 msgid "Half available bandwidth recommended." msgstr "Jumătate lățime de bandă disponibilă este recomandat." -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1889 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2251 msgid "View or change router bandwidth" msgstr "Vizualizeaza sau modifica lățime de bandă router" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1893 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2255 msgid "Use open trackers also" msgstr "Utilizați trackere deschise, de asemenea," -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1897 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2259 msgid "" "If checked, announce torrents to open trackers as well as the tracker listed" " in the torrent file" msgstr "Dacă este bifată, anunta torrente pentru a urmări trackere deschise , precum și trackere listate în fișierul torrent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1901 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2263 msgid "Enable DHT" msgstr "Activează DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1905 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2267 msgid "If checked, use DHT" msgstr "Dacă este bifată, utilizați DHT" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1921 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2283 msgid "Inbound Settings" msgstr "Setări de intrare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1927 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2289 msgid "Outbound Settings" msgstr "Setări de ieșire" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1935 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2297 msgid "I2CP host" msgstr "Portul I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1940 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2302 msgid "I2CP port" msgstr "Portul I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1955 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2317 msgid "I2CP options" msgstr "Opțiuni I2CP" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1960 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2322 msgid "Save configuration" msgstr "Salvare configurări" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1980 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2342 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2953 msgid "Name" msgstr "Nume" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1982 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2344 msgid "Website URL" msgstr "URL website" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1984 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2530 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2346 +msgid "Standard" +msgstr "Standard" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2348 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3080 msgid "Open" msgstr "Deschis" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1986 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2350 msgid "Private" msgstr "Privat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1988 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2352 msgid "Announce URL" msgstr "URL de anuntare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2022 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2396 msgid "Add" msgstr "Adaugă" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2062 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2439 #, java-format msgid "Invalid magnet URL {0}" msgstr "URL-ul magnet invalid {0}" #. * dummies for translation -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2070 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 #, java-format msgid "1 hop" msgid_plural "{0} hops" @@ -1136,7 +1223,7 @@ msgstr[0] "1 hop" msgstr[1] "{0} hop-uri" msgstr[2] "{0} hop-uri" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2071 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2448 #, java-format msgid "1 tunnel" msgid_plural "{0} tunnels" @@ -1144,106 +1231,119 @@ msgstr[0] "1 tunel" msgstr[1] "{0} tunele" msgstr[2] "{0} tunele" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2278 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2691 msgid "Torrent file" msgstr "Fișier torent" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2291 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2699 +msgid "Data location" +msgstr "Locaţie date" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2708 +msgid "Info hash" +msgstr "Informație index" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2727 msgid "Primary Tracker" msgstr "Tracker primar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2300 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2736 msgid "Tracker List" msgstr "Lista Tracker" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2324 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2761 msgid "Comment" msgstr "Comentariu" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2333 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2771 msgid "Created" msgstr "Creat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2343 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2782 msgid "Created By" msgstr "Creat de" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2353 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2794 msgid "Magnet link" msgstr "Legătură Magnet" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2360 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2807 msgid "Private torrent" msgstr "Torrent privat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2370 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2434 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2436 -msgid "Size" -msgstr "Dimensiune" - -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2377 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2827 msgid "Completion" msgstr "Completare" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2387 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2856 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2982 msgid "Remaining" msgstr "Rămas" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2394 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2866 msgid "Files" msgstr "Fișiere" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2399 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2873 msgid "Pieces" msgstr "Piese:" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2403 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2879 msgid "Piece size" msgstr "Dimensiune piesei" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2426 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2430 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2933 msgid "Directory" msgstr "Dosar" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2447 -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2449 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2992 msgid "Priority" msgstr "Prioritate" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2455 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3004 msgid "Up to higher level directory" msgstr "Spre dosarul de nivel superior" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2485 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3038 msgid "Torrent not found?" msgstr "Torrent nu a fost găsit?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2493 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3044 msgid "File not found in torrent?" msgstr "Fișierul nu a fost găsit în torrent?" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2506 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3057 msgid "complete" msgstr "încheiat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2507 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3058 msgid "remaining" msgstr "Rămas" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2556 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3104 msgid "High" msgstr "Ridicat" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2561 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3109 msgid "Normal" msgstr "Normal" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2566 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3114 msgid "Skip" msgstr "Omitere" -#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2575 +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3124 +msgid "Set all high" +msgstr "Configurează toate ca înalte" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3126 +msgid "Set all normal" +msgstr "Configurează toate ca normal" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3128 +msgid "Skip all" +msgstr "Omite tot" + +#: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:3129 msgid "Save priorities" msgstr "Salvați priorități" diff --git a/apps/i2ptunnel/locale-proxy/messages_uk.po b/apps/i2ptunnel/locale-proxy/messages_uk.po index c2ca97ac1..6bb879d82 100644 --- a/apps/i2ptunnel/locale-proxy/messages_uk.po +++ b/apps/i2ptunnel/locale-proxy/messages_uk.po @@ -4,8 +4,9 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Denis Blank , 2011 -# Denis Blank , 2012 +# Denis Lysenko , 2015 +# Denis Lysenko , 2011 +# Denis Lysenko , 2012 # jonny_nut, 2014 # madjong , 2014 # puxud , 2014 @@ -13,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-03-29 14:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"POT-Creation-Date: 2015-05-14 08:33+0000\n" +"PO-Revision-Date: 2015-08-07 17:15+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,7 +37,7 @@ msgstr "" #: ../java/build/Proxy.java:129 ../java/build/Proxy.java:140 #: ../java/build/Proxy.java:151 ../java/build/Proxy.java:164 #: ../java/build/Proxy.java:173 ../java/build/Proxy.java:185 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:207 msgid "Router Console" msgstr "Консоль роутера" @@ -50,7 +51,7 @@ msgstr "Консоль роутера" #: ../java/build/Proxy.java:152 ../java/build/Proxy.java:165 #: ../java/build/Proxy.java:174 ../java/build/Proxy.java:186 msgid "I2P Router Console" -msgstr "Консоль роутера" +msgstr "Консоль роутера I2P" #: ../java/build/Proxy.java:8 ../java/build/Proxy.java:20 #: ../java/build/Proxy.java:30 ../java/build/Proxy.java:40 @@ -61,7 +62,7 @@ msgstr "Консоль роутера" #: ../java/build/Proxy.java:131 ../java/build/Proxy.java:142 #: ../java/build/Proxy.java:153 ../java/build/Proxy.java:166 #: ../java/build/Proxy.java:175 ../java/build/Proxy.java:187 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Configuration" msgstr "Настройки" @@ -74,7 +75,7 @@ msgstr "Настройки" #: ../java/build/Proxy.java:132 ../java/build/Proxy.java:143 #: ../java/build/Proxy.java:154 ../java/build/Proxy.java:167 #: ../java/build/Proxy.java:176 ../java/build/Proxy.java:188 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Help" msgstr "Допомога" @@ -87,7 +88,7 @@ msgstr "Допомога" #: ../java/build/Proxy.java:133 ../java/build/Proxy.java:144 #: ../java/build/Proxy.java:155 ../java/build/Proxy.java:168 #: ../java/build/Proxy.java:177 ../java/build/Proxy.java:189 -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:193 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:208 msgid "Addressbook" msgstr "Адресна книга" @@ -440,15 +441,15 @@ msgid "" "tunnel." msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:610 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:634 msgid "This seems to be a bad destination:" msgstr "Скоріше всього це поганий адрес призначення:" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:611 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:635 msgid "i2paddresshelper cannot help you with a destination like that!" msgstr "i2paddresshelper не може допомогти Вам з місцем призначення як це!" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:684 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:709 #, java-format msgid "" "To visit the destination in your host database, click here." msgstr "Для того щоб перейти по локальному посиланню з локальної адресної книги, натисніть осьтут. Для переходу по новому addresshelper-посиланню, натисніть будь-ласка тут." -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1095 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1119 msgid "Destination lease set not found" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1245 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1271 msgid "Host" msgstr "Адрес" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1249 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1275 msgid "Base 32" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1253 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1279 msgid "Destination" msgstr "Адреса призначення" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1259 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1285 #, java-format msgid "Continue to {0} without saving" msgstr "Продовжити до {0} без збереження" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1265 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1291 #, java-format msgid "Save {0} to router address book and continue to website" msgstr "" #. only blockfile supports multiple books -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1268 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1294 #, java-format msgid "Save {0} to master address book and continue to website" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1269 +#: ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java:1295 #, java-format msgid "Save {0} to private address book and continue to website" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:156 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:169 #, java-format msgid "Added via address helper from {0}" msgstr "Додано через address helper {0}" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:158 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:171 msgid "Added via address helper" msgstr "Додано через address helper" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:175 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:188 msgid "router" msgstr "роутер" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:177 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:190 msgid "master" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:179 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:192 msgid "private" msgstr "" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:186 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 #, java-format msgid "Redirecting to {0}" msgstr "Перенаправляємо до {0}" -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:198 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:213 #, java-format msgid "Saved {0} to the {1} addressbook, redirecting now." msgstr "{0} збережено в {1} адресної книги, перенапрявляємо." -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:199 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:214 #, java-format msgid "Failed to save {0} to the {1} addressbook, redirecting now." msgstr "Не вдалось зберегти {0} в {1} адресної книги, перенаправляємо." -#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:201 +#: ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java:216 msgid "Click here if you are not redirected automatically." msgstr "Клацніть тут якщо вас не перенаправило автоматично." diff --git a/apps/i2ptunnel/locale/messages_sv.po b/apps/i2ptunnel/locale/messages_sv.po index 9a18890a0..9bc348aea 100644 --- a/apps/i2ptunnel/locale/messages_sv.po +++ b/apps/i2ptunnel/locale/messages_sv.po @@ -4,6 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# Anders Nilsson , 2015 # Calle Rundgren , 2013 # cacapo , 2015 # hottuna , 2013 @@ -14,9 +15,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-04-09 17:35+0000\n" -"Last-Translator: cacapo \n" -"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" +"PO-Revision-Date: 2015-08-25 20:41+0000\n" +"Last-Translator: Anders Nilsson \n" +"Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,7 +109,7 @@ msgstr "Standard klient" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:378 msgid "HTTP/HTTPS client" -msgstr "HTTP/HTTPS klient" +msgstr "HTTP/HTTPS-klient" #: ../java/src/net/i2p/i2ptunnel/web/IndexBean.java:379 msgid "IRC client" @@ -163,11 +164,11 @@ msgstr "Ogiltig adress" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:82 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:85 msgid "Hidden Services Manager" -msgstr "Manager Dolda Tjänster" +msgstr "Hanterare för dolda tjänster" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:86 msgid "Edit Client Tunnel" -msgstr "Redigera Klienttunnel" +msgstr "Redigera klienttunnel" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:114 msgid "Edit proxy settings" @@ -240,11 +241,11 @@ msgstr "Utgående proxier" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:245 msgid "SSL Outproxies" -msgstr "SSL Outproxies" +msgstr "SSL-utproxies" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:251 msgid "Use Outproxy Plugin" -msgstr "Använd Outproxy Plugin" +msgstr "Använd Outproxy-plugin" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:255 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:293 @@ -313,22 +314,22 @@ msgstr "Längd" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:318 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:316 msgid "0 hop tunnel (no anonymity)" -msgstr "0 hop tunnel (ingen anonymitet)" +msgstr "0-hopp tunnel (ingen anonymitet)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:322 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:320 msgid "1 hop tunnel (low anonymity)" -msgstr "1 hop tunnel (låg anonymitet)" +msgstr "1-hopp tunnel (låg anonymitet)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:326 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:324 msgid "2 hop tunnel (medium anonymity)" -msgstr "2 hot tunnel (medium anonymitet)" +msgstr "2-hopp tunnel (medium anonymitet)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:330 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:328 msgid "3 hop tunnel (high anonymity)" -msgstr "3 hop tunnel (hög anonymitet)" +msgstr "3-hopp tunnel (hög anonymitet)" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:338 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:336 @@ -519,23 +520,23 @@ msgstr "Lokalt mål" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:524 msgid "Local Base 32" -msgstr "Lokal Base 32" +msgstr "Lokal bas32" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:533 msgid "Pass User-Agent header through" -msgstr "Förmedla User-Agent header" +msgstr "Skicka User-Agent-fältet vidare" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:539 msgid "Pass Referer header through" -msgstr "Förmedla Referer header" +msgstr "Skicka Referer-fältet vidare" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:545 msgid "Pass Accept headers through" -msgstr "Förmedla Accept headers" +msgstr "Skicka Accept-fältet vidare" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:551 msgid "Allow SSL to I2P addresses" -msgstr "Tillåt SSL till I2P adresser" +msgstr "Tillåt SSL till I2P-adresser" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editClient_jsp.java:562 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:618 @@ -591,7 +592,7 @@ msgstr "Spara" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:86 msgid "Edit Hidden Service" -msgstr "Redigera Dold Tjänst" +msgstr "Redigera dold tjänst" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:114 msgid "Edit server settings" @@ -663,7 +664,7 @@ msgstr "Blockera tillgång via inproxies" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:497 msgid "Unique Local Address per Client" -msgstr "Unik Lokal Adress per Klient" +msgstr "Unik lokal adress per klient" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/editServer_jsp.java:503 msgid "Optimize for Multihoming" @@ -745,7 +746,7 @@ msgstr "Starta Om Alla" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:126 msgid "I2P Hidden Services" -msgstr "I2P Dolda Tjänster" +msgstr "I2P Dolda tjänster" #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:130 #: ../jsp/WEB-INF/classes/net/i2p/i2ptunnel/jsp/index_jsp.java:151 diff --git a/apps/i2ptunnel/locale/messages_uk.po b/apps/i2ptunnel/locale/messages_uk.po index 30b9a24a0..206a7a162 100644 --- a/apps/i2ptunnel/locale/messages_uk.po +++ b/apps/i2ptunnel/locale/messages_uk.po @@ -5,8 +5,8 @@ # # Translators: # asteryx , 2015 -# Denis Blank , 2011 -# Denis Blank , 2012 +# Denis Lysenko , 2011 +# Denis Lysenko , 2012 # LinuxChata, 2014 # madjong , 2014-2015 # brianhopes , 2015 @@ -15,9 +15,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-05-07 07:43+0000\n" -"Last-Translator: brianhopes \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 16:31+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/apps/ministreaming/locale/messages_uk.po b/apps/ministreaming/locale/messages_uk.po index c10b20698..fab6b0800 100644 --- a/apps/ministreaming/locale/messages_uk.po +++ b/apps/ministreaming/locale/messages_uk.po @@ -4,6 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# Denis Lysenko , 2015 # madjong , 2015 # puxud , 2014 msgid "" @@ -11,9 +12,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-04-10 13:47+0000\n" -"Last-Translator: madjong \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 17:12+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,11 +23,11 @@ msgstr "" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:69 msgid "Message timeout" -msgstr "" +msgstr "Тайм-аут повідомлення" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:72 msgid "Failed delivery to local destination" -msgstr "" +msgstr "Не вдалось доставити до локального призначення" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:75 #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:108 @@ -51,11 +52,11 @@ msgstr "" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:90 msgid "Buffer overflow" -msgstr "" +msgstr "Буфер заповнено" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:93 msgid "Message expired" -msgstr "" +msgstr "Повідомлення застаріло" #: ../java/src/net/i2p/client/streaming/I2PSocketException.java:96 msgid "Local lease set invalid" diff --git a/apps/routerconsole/locale-countries/messages_pl.po b/apps/routerconsole/locale-countries/messages_pl.po index 077b78902..f8a1f59f8 100644 --- a/apps/routerconsole/locale-countries/messages_pl.po +++ b/apps/routerconsole/locale-countries/messages_pl.po @@ -9,15 +9,16 @@ # polacco , 2014 # polacco , 2012 # PolishAnon , 2011 +# Taporpo Ne , 2015 # Tracerneo , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:08+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" +"PO-Revision-Date: 2015-08-30 16:58+0000\n" +"Last-Translator: Taporpo Ne \n" +"Language-Team: Polish (http://www.transifex.com/otf/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,7 +59,7 @@ msgid "Angola" msgstr "Angola" msgid "Asia/Pacific Region" -msgstr "" +msgstr "Azja Pacyficzna" msgid "Antarctica" msgstr "Antarktyda" @@ -112,7 +113,7 @@ msgid "Benin" msgstr "Benin" msgid "Saint Barthélemy" -msgstr "" +msgstr "Saint Barthélemy" msgid "Bermuda" msgstr "Bermudy" @@ -124,7 +125,7 @@ msgid "Bolivia" msgstr "Boliwia" msgid "Bonaire" -msgstr "" +msgstr "Bonaire" msgid "Brazil" msgstr "Brazylia" @@ -256,7 +257,7 @@ msgid "Falkland Islands (Malvinas)" msgstr "Falklandy (Malwiny)" msgid "Micronesia" -msgstr "" +msgstr "Mikronezja" msgid "Faroe Islands" msgstr "Wyspy Owcze" @@ -358,7 +359,7 @@ msgid "Iraq" msgstr "Irak" msgid "Iran" -msgstr "" +msgstr "Iran" msgid "Iceland" msgstr "Islandia" @@ -397,7 +398,7 @@ msgid "Saint Kitts and Nevis" msgstr "Saint Kitts i Nevis" msgid "North Korea" -msgstr "" +msgstr "Korea Północna" msgid "Republic of Korea" msgstr "Korea Południowa" @@ -442,7 +443,7 @@ msgid "Latvia" msgstr "Łotwa" msgid "Libya" -msgstr "" +msgstr "Libia" msgid "Morocco" msgstr "Maroko" @@ -451,7 +452,7 @@ msgid "Monaco" msgstr "Monako" msgid "Moldova" -msgstr "" +msgstr "Mołdawia" msgid "Montenegro" msgstr "Czarnogóra" @@ -466,7 +467,7 @@ msgid "Marshall Islands" msgstr "Wyspy Marshalla" msgid "Macedonia" -msgstr "" +msgstr "Macedonia" msgid "Mali" msgstr "Mali" @@ -478,7 +479,7 @@ msgid "Mongolia" msgstr "Mongolia" msgid "Macau" -msgstr "" +msgstr "Makao" msgid "Northern Mariana Islands" msgstr "Mariany Północne" @@ -658,7 +659,7 @@ msgid "Suriname" msgstr "Surinam" msgid "South Sudan" -msgstr "" +msgstr "Południowy Sudan" msgid "Sao Tome and Principe" msgstr "Wyspy Świętego Tomasza i Książęca" @@ -667,10 +668,10 @@ msgid "El Salvador" msgstr "Salwador" msgid "Sint Maarten" -msgstr "" +msgstr "Sint Maarten" msgid "Syria" -msgstr "" +msgstr "Syria" msgid "Swaziland" msgstr "Suazi" @@ -721,7 +722,7 @@ msgid "Taiwan" msgstr "Republika Chińska" msgid "Tanzania" -msgstr "" +msgstr "Tanzania" msgid "Ukraine" msgstr "Ukraina" @@ -742,7 +743,7 @@ msgid "Uzbekistan" msgstr "Uzbekistan" msgid "Vatican" -msgstr "" +msgstr "Watykan" msgid "Saint Vincent and the Grenadines" msgstr "Saint Vincent i Grenadyny" @@ -754,7 +755,7 @@ msgid "Virgin Islands" msgstr "Wyspy Dziewicze" msgid "Vietnam" -msgstr "" +msgstr "Wietnam" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_pt.po b/apps/routerconsole/locale-countries/messages_pt.po index d744d7ccf..ab95eb0ec 100644 --- a/apps/routerconsole/locale-countries/messages_pt.po +++ b/apps/routerconsole/locale-countries/messages_pt.po @@ -6,6 +6,7 @@ # Translators: # alfalb.as, 2015 # hxdcmls, 2013 +# wtfisthis , 2015 # rafaelbf, 2013 # Ruthein Alex , 2012 # tuliouel, 2013 @@ -15,9 +16,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:08+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Portuguese (http://www.transifex.com/projects/p/I2P/language/pt/)\n" +"PO-Revision-Date: 2015-07-30 11:57+0000\n" +"Last-Translator: wtfisthis \n" +"Language-Team: Portuguese (http://www.transifex.com/otf/I2P/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,7 +59,7 @@ msgid "Angola" msgstr "Angola" msgid "Asia/Pacific Region" -msgstr "" +msgstr "Ásia/Região do Pacifico" msgid "Antarctica" msgstr "Antártica" @@ -112,7 +113,7 @@ msgid "Benin" msgstr "Benin" msgid "Saint Barthélemy" -msgstr "" +msgstr "Coletividade de São Bartolomeu" msgid "Bermuda" msgstr "Bermudas" @@ -124,7 +125,7 @@ msgid "Bolivia" msgstr "Bolívia" msgid "Bonaire" -msgstr "" +msgstr "Bonaire" msgid "Brazil" msgstr "Brasil" @@ -256,7 +257,7 @@ msgid "Falkland Islands (Malvinas)" msgstr "Ilhas Falkland (Malvinas)" msgid "Micronesia" -msgstr "" +msgstr "Micronésia" msgid "Faroe Islands" msgstr "Ilhas Faroe" @@ -358,7 +359,7 @@ msgid "Iraq" msgstr "Iraque" msgid "Iran" -msgstr "" +msgstr "Irão" msgid "Iceland" msgstr "Islândia" @@ -397,7 +398,7 @@ msgid "Saint Kitts and Nevis" msgstr "São Cristóvão e Nevis" msgid "North Korea" -msgstr "" +msgstr "Correia do Norte" msgid "Republic of Korea" msgstr "República da Koreia" @@ -442,7 +443,7 @@ msgid "Latvia" msgstr "Látvia" msgid "Libya" -msgstr "" +msgstr "Líbia" msgid "Morocco" msgstr "Marrocos" @@ -451,7 +452,7 @@ msgid "Monaco" msgstr "Mónaco" msgid "Moldova" -msgstr "" +msgstr "Moldávia" msgid "Montenegro" msgstr "Montenegro" @@ -466,7 +467,7 @@ msgid "Marshall Islands" msgstr "Ilhas Marshall" msgid "Macedonia" -msgstr "" +msgstr "Macedónia" msgid "Mali" msgstr "Mali" @@ -478,7 +479,7 @@ msgid "Mongolia" msgstr "Mongolia" msgid "Macau" -msgstr "" +msgstr "Macau" msgid "Northern Mariana Islands" msgstr "Ilhas Marianas do Norte" @@ -658,7 +659,7 @@ msgid "Suriname" msgstr "Suriname" msgid "South Sudan" -msgstr "" +msgstr "Sudão do Sul" msgid "Sao Tome and Principe" msgstr "São Tomé e Princípe" @@ -667,10 +668,10 @@ msgid "El Salvador" msgstr "São Salvador" msgid "Sint Maarten" -msgstr "" +msgstr "São Martinho" msgid "Syria" -msgstr "" +msgstr "Síria" msgid "Swaziland" msgstr "Suazilândia" @@ -721,7 +722,7 @@ msgid "Taiwan" msgstr "Taiwan" msgid "Tanzania" -msgstr "" +msgstr "Tanzânia" msgid "Ukraine" msgstr "Ucrânia" @@ -742,7 +743,7 @@ msgid "Uzbekistan" msgstr "Uzbequistão" msgid "Vatican" -msgstr "" +msgstr "Vaticano" msgid "Saint Vincent and the Grenadines" msgstr "São Vicente e Granadinas" @@ -754,7 +755,7 @@ msgid "Virgin Islands" msgstr "Ilhas Virgens" msgid "Vietnam" -msgstr "" +msgstr "Vietname" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_tr.po b/apps/routerconsole/locale-countries/messages_tr.po index 698c18650..248b2b5b8 100644 --- a/apps/routerconsole/locale-countries/messages_tr.po +++ b/apps/routerconsole/locale-countries/messages_tr.po @@ -5,16 +5,16 @@ # # Translators: # Erkin Batu Altunbaş , 2013 -# Kaya Zeren , 2013 +# Kaya Zeren , 2013,2015 # Trans Lator , 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:08+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" +"PO-Revision-Date: 2015-08-05 13:48+0000\n" +"Last-Translator: Kaya Zeren \n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -55,7 +55,7 @@ msgid "Angola" msgstr "Angola" msgid "Asia/Pacific Region" -msgstr "" +msgstr "Asya/Pasifik Bölgesi" msgid "Antarctica" msgstr "Antarktika" @@ -109,7 +109,7 @@ msgid "Benin" msgstr "Benin" msgid "Saint Barthélemy" -msgstr "" +msgstr "Aziz Bartelemi" msgid "Bermuda" msgstr "Bermuda" @@ -121,7 +121,7 @@ msgid "Bolivia" msgstr "Bolivya" msgid "Bonaire" -msgstr "" +msgstr "Bonaire" msgid "Brazil" msgstr "Brezilya" @@ -253,7 +253,7 @@ msgid "Falkland Islands (Malvinas)" msgstr "Falkland Adaları (Malvinalar)" msgid "Micronesia" -msgstr "" +msgstr "Mikronezya" msgid "Faroe Islands" msgstr "Faroe Adaları" @@ -355,7 +355,7 @@ msgid "Iraq" msgstr "Irak" msgid "Iran" -msgstr "" +msgstr "İran" msgid "Iceland" msgstr "İzlanda" @@ -394,7 +394,7 @@ msgid "Saint Kitts and Nevis" msgstr "Aziz Kitts ve Nevis" msgid "North Korea" -msgstr "" +msgstr "Kuzey Kore" msgid "Republic of Korea" msgstr "Kore Cumhuriyeti" @@ -439,7 +439,7 @@ msgid "Latvia" msgstr "Letonya" msgid "Libya" -msgstr "" +msgstr "Libya" msgid "Morocco" msgstr "Fas" @@ -448,7 +448,7 @@ msgid "Monaco" msgstr "Monako" msgid "Moldova" -msgstr "" +msgstr "Moldova" msgid "Montenegro" msgstr "Karadağ" @@ -463,7 +463,7 @@ msgid "Marshall Islands" msgstr "Marşal Adaları" msgid "Macedonia" -msgstr "" +msgstr "Makedonya" msgid "Mali" msgstr "Mali" @@ -475,7 +475,7 @@ msgid "Mongolia" msgstr "Moğolistan" msgid "Macau" -msgstr "" +msgstr "Makau" msgid "Northern Mariana Islands" msgstr "Kuzey Mariyana Adaları" @@ -655,7 +655,7 @@ msgid "Suriname" msgstr "Surinam" msgid "South Sudan" -msgstr "" +msgstr "Güney Sudan" msgid "Sao Tome and Principe" msgstr "Sao Tome ve Principe" @@ -664,10 +664,10 @@ msgid "El Salvador" msgstr "El Salvador" msgid "Sint Maarten" -msgstr "" +msgstr "Aziz Marten" msgid "Syria" -msgstr "" +msgstr "Suriye" msgid "Swaziland" msgstr "Svaziland" @@ -718,7 +718,7 @@ msgid "Taiwan" msgstr "Tayva" msgid "Tanzania" -msgstr "" +msgstr "Tanzanya" msgid "Ukraine" msgstr "Ukrayna" @@ -739,7 +739,7 @@ msgid "Uzbekistan" msgstr "Özbekistan" msgid "Vatican" -msgstr "" +msgstr "Vatikan" msgid "Saint Vincent and the Grenadines" msgstr "Aziz Vincent ve Granadinler" @@ -751,7 +751,7 @@ msgid "Virgin Islands" msgstr "Virgin Adaları" msgid "Vietnam" -msgstr "" +msgstr "Vietnam" msgid "Vanuatu" msgstr "Vanuatu" diff --git a/apps/routerconsole/locale-countries/messages_uk.po b/apps/routerconsole/locale-countries/messages_uk.po index 46fea5e02..cc13aa985 100644 --- a/apps/routerconsole/locale-countries/messages_uk.po +++ b/apps/routerconsole/locale-countries/messages_uk.po @@ -4,15 +4,17 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# asteryx , 2015 # LinuxChata, 2014 +# Maus , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:08+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 16:31+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,7 +55,7 @@ msgid "Angola" msgstr "Ангола" msgid "Asia/Pacific Region" -msgstr "" +msgstr "Азія / Тихоокеанський регіон" msgid "Antarctica" msgstr "Антарктика" @@ -107,7 +109,7 @@ msgid "Benin" msgstr "Бенін" msgid "Saint Barthélemy" -msgstr "" +msgstr "сен- Бартельмі" msgid "Bermuda" msgstr "Бермуда" @@ -119,7 +121,7 @@ msgid "Bolivia" msgstr "Болівія" msgid "Bonaire" -msgstr "" +msgstr "Бонайре" msgid "Brazil" msgstr "Бразилія" @@ -251,7 +253,7 @@ msgid "Falkland Islands (Malvinas)" msgstr "Фолклендські острови (Мальвінські)" msgid "Micronesia" -msgstr "" +msgstr "Мікронезія" msgid "Faroe Islands" msgstr "Фарерські острови" @@ -353,7 +355,7 @@ msgid "Iraq" msgstr "Ірак" msgid "Iran" -msgstr "" +msgstr "Іран" msgid "Iceland" msgstr "Ісландія" @@ -392,7 +394,7 @@ msgid "Saint Kitts and Nevis" msgstr "Федерація Сент-Кіттс і Невіс" msgid "North Korea" -msgstr "" +msgstr "КНДР" msgid "Republic of Korea" msgstr "Республіка Корея" @@ -437,7 +439,7 @@ msgid "Latvia" msgstr "Латвія" msgid "Libya" -msgstr "" +msgstr "Лівія" msgid "Morocco" msgstr "Марокко" @@ -446,7 +448,7 @@ msgid "Monaco" msgstr "Монако" msgid "Moldova" -msgstr "" +msgstr "Молдова" msgid "Montenegro" msgstr "Чорногорія " @@ -461,7 +463,7 @@ msgid "Marshall Islands" msgstr "Маршаллові острови" msgid "Macedonia" -msgstr "" +msgstr "Македонія" msgid "Mali" msgstr "Малі" @@ -473,7 +475,7 @@ msgid "Mongolia" msgstr "Монголія" msgid "Macau" -msgstr "" +msgstr "Аоминь або Макао" msgid "Northern Mariana Islands" msgstr "Північні Маріанські острови" @@ -653,7 +655,7 @@ msgid "Suriname" msgstr "Сурінам" msgid "South Sudan" -msgstr "" +msgstr "Південний Судан" msgid "Sao Tome and Principe" msgstr "Сан-Томе і Принсіпі" @@ -662,10 +664,10 @@ msgid "El Salvador" msgstr "Ель Сальвадор" msgid "Sint Maarten" -msgstr "" +msgstr "Сінт-Мартен" msgid "Syria" -msgstr "" +msgstr "Сірія" msgid "Swaziland" msgstr "Свазиленд" @@ -716,7 +718,7 @@ msgid "Taiwan" msgstr "Тайвань" msgid "Tanzania" -msgstr "" +msgstr "Танзанія" msgid "Ukraine" msgstr "Україна" @@ -737,7 +739,7 @@ msgid "Uzbekistan" msgstr "Узбекістан" msgid "Vatican" -msgstr "" +msgstr "Ватикан" msgid "Saint Vincent and the Grenadines" msgstr "Сент Вінсент і Ґренадіни" @@ -749,7 +751,7 @@ msgid "Virgin Islands" msgstr "Віргінські острови" msgid "Vietnam" -msgstr "" +msgstr "В'єтнам" msgid "Vanuatu" msgstr "Вануату" diff --git a/apps/routerconsole/locale-news/messages_sv.po b/apps/routerconsole/locale-news/messages_sv.po index 766d3987e..dc80a0e5d 100644 --- a/apps/routerconsole/locale-news/messages_sv.po +++ b/apps/routerconsole/locale-news/messages_sv.po @@ -4,6 +4,7 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: +# Anders Nilsson , 2015 # cacapo , 2015 # hottuna , 2013 # hottuna , 2013 @@ -14,9 +15,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-13 21:46+0000\n" -"PO-Revision-Date: 2015-04-09 17:47+0000\n" -"Last-Translator: cacapo \n" -"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/I2P/language/sv_SE/)\n" +"PO-Revision-Date: 2015-08-26 06:24+0000\n" +"Last-Translator: Anders Nilsson \n" +"Language-Team: Swedish (Sweden) (http://www.transifex.com/otf/I2P/language/sv_SE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,7 +25,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations on getting I2P installed!" -msgstr "Grattis för din I2P installation!" +msgstr "Grattis till din I2P-installation!" msgid "Welcome to I2P!" msgstr "Välkommen till I2P!" diff --git a/apps/routerconsole/locale-news/messages_tr.po b/apps/routerconsole/locale-news/messages_tr.po index 090db06b3..4ec097690 100644 --- a/apps/routerconsole/locale-news/messages_tr.po +++ b/apps/routerconsole/locale-news/messages_tr.po @@ -4,15 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Kaya Zeren , 2013 +# Kaya Zeren , 2013,2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-13 21:46+0000\n" -"PO-Revision-Date: 2014-02-23 16:51+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" +"PO-Revision-Date: 2015-08-05 14:03+0000\n" +"Last-Translator: Kaya Zeren \n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -62,4 +62,4 @@ msgstr "Sol tarafta \"paylaşılmış istemci\" hedefi listelendiğinde, lütfen msgid "" "Point your IRC client to {0}localhost:6668{1} and say hi to us on " "{2}#i2p{3}." -msgstr "" +msgstr "IRC istemcinizi {0}localhost:6668{1} adresine yönlendirin ve bize merhaba demek için {2}#i2p{3} kanalını açın." diff --git a/apps/routerconsole/locale-news/messages_uk.po b/apps/routerconsole/locale-news/messages_uk.po index ba8e39a36..9112d4b9d 100644 --- a/apps/routerconsole/locale-news/messages_uk.po +++ b/apps/routerconsole/locale-news/messages_uk.po @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-07-13 21:46+0000\n" -"PO-Revision-Date: 2014-12-25 14:10+0000\n" -"Last-Translator: madjong \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 17:13+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index 2869ea281..a046a3201 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -27,9 +27,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:05+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: German (http://www.transifex.com/projects/p/I2P/language/de/)\n" +"PO-Revision-Date: 2015-08-21 21:13+0000\n" +"Last-Translator: Lars Schimmer \n" +"Language-Team: German (http://www.transifex.com/otf/I2P/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -100,8 +100,8 @@ msgstr[1] "{0} Tage" #, java-format msgid "1 year" msgid_plural "{0} years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1 Jahr" +msgstr[1] "{0} Jahre" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 #: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 @@ -1200,7 +1200,7 @@ msgstr "Keine neue Version unter {0} gefunden" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 msgid "Permanently banned" -msgstr "" +msgstr "permanent gesperrte IP's" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format @@ -4128,7 +4128,7 @@ msgstr "Tunnel, die wir zur Verfügung stellen oder nutzen, um auf Dienste im Ne msgid "" "Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "" +msgstr "Tunnel an denen wir teilnehmen, die direkt Bandbreite dem Netzwerk zur Verfügung stellen." #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" @@ -4352,11 +4352,11 @@ msgstr "ganz oben" #: ../java/src/net/i2p/router/web/SummaryHelper.java:930 msgid "Move to top" -msgstr "" +msgstr "Nach oben verschieben" #: ../java/src/net/i2p/router/web/SummaryHelper.java:940 msgid "Move up" -msgstr "" +msgstr "Nach oben verschieben" #: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" @@ -4364,7 +4364,7 @@ msgstr "runter" #: ../java/src/net/i2p/router/web/SummaryHelper.java:953 msgid "Move down" -msgstr "" +msgstr "nach unten verschieben" #: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" @@ -4372,7 +4372,7 @@ msgstr "ganz unten" #: ../java/src/net/i2p/router/web/SummaryHelper.java:963 msgid "Move to bottom" -msgstr "" +msgstr "Zum Ende verschieben" #: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" @@ -4581,7 +4581,7 @@ msgstr "nach dem Starten die Routerkonsole im Browser anzeigen" #: ../java/strings/Strings.java:37 msgid "shared clients (DSA)" -msgstr "" +msgstr "mehrere Klienten (DSA)" #: ../java/strings/Strings.java:38 msgid "IRC proxy" @@ -4951,11 +4951,11 @@ msgstr "Floodfill-Teilnahme hilft dem Netzwerk, kann aber die Systemressourcen s #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 msgid "This router is currently a floodfill participant." -msgstr "" +msgstr "Dieser Router ist zur Zeit Teilnehmer am FloodFill Netz." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 msgid "This router is not currently a floodfill participant." -msgstr "" +msgstr "Dieser Router ist zur Zeit kein Teilnehmer am FloodFill Netz." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index a3147c16b..3d75da8df 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -25,9 +25,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:05+0000\n" -"PO-Revision-Date: 2015-07-22 09:12+0000\n" +"PO-Revision-Date: 2015-08-14 04:29+0000\n" "Last-Translator: Towinet\n" -"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/otf/I2P/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -3782,7 +3782,7 @@ msgstr "Intégration" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" -msgstr "le pair est-il banni, injoignable, ou alors les tests de tunnels échouent ?" +msgstr "le pair est-il banni, injoignable, ou alors les tests de tunnels échouent-ils ?" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" @@ -6312,7 +6312,7 @@ msgstr "Contrôle de mises à jour" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:451 msgid "News Updates" -msgstr "Mises à jour des nouvelles" +msgstr "Mises à jour des actualités" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:459 msgid "Update In Progress" @@ -6332,7 +6332,7 @@ msgstr "Méthode de mise à jour" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:487 msgid "Fetch news through the eepProxy?" -msgstr "Récupérer news à travers le eepProxy ?" +msgstr "Récupérer les actualités à travers l'eepProxy ?" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:491 msgid "Update through the eepProxy?" diff --git a/apps/routerconsole/locale/messages_ja.po b/apps/routerconsole/locale/messages_ja.po index 136d6df97..0031b451d 100644 --- a/apps/routerconsole/locale/messages_ja.po +++ b/apps/routerconsole/locale/messages_ja.po @@ -6,7 +6,8 @@ # Translators: # a1678991 , 2015 # g3600303 , 2015 -# タカハシ , 2013-2014 +# タカハシ , 2013-2014 +# タカハシ , 2015 # luixxiul, 2013 # rafe , 2015 # rafe , 2015 @@ -17,9 +18,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:05+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n" +"PO-Revision-Date: 2015-08-31 09:17+0000\n" +"Last-Translator: タカハシ \n" +"Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -85,7 +86,7 @@ msgstr[0] "{0} 日" #, java-format msgid "1 year" msgid_plural "{0} years" -msgstr[0] "" +msgstr[0] "{0} 年" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 #: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 @@ -97,13 +98,13 @@ msgstr "n/a" #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" -msgstr[0] "" +msgstr[0] "{0,number,###} ns" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" -msgstr[0] "" +msgstr[0] "{0,number,###} μs" #: ../../../router/java/src/net/i2p/router/Blocklist.java:201 #, java-format @@ -154,40 +155,40 @@ msgstr "OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:312 msgid "IPv4: OK; IPv6: Testing" -msgstr "" +msgstr "IPv4: OK; IPv6: テスト中" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:313 msgid "IPv4: OK; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: OK; IPv6: ファイアーウォール有効" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:314 msgid "IPv4: Testing; IPv6: OK" -msgstr "" +msgstr "IPv4: テスト中; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:315 msgid "IPv4: Firewalled; IPv6: OK" -msgstr "" +msgstr "IPv4: ファイアーウォール有効; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:316 msgid "IPv4: Disabled; IPv6: OK" -msgstr "" +msgstr "IPv4: 無効; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: 対称型NAT; IPv6: OK" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 msgid "Symmetric NAT" -msgstr "" +msgstr "対称型NAT" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:320 msgid "IPv4: Symmetric NAT; IPv6: Testing" -msgstr "" +msgstr "IPv4: 対称型NAT; IPv6: テスト中" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 msgid "IPv4: Firewalled; IPv6: Testing" -msgstr "" +msgstr "IPv4: ファイアーウォール有効; IPv6: テスト中" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:323 @@ -197,23 +198,23 @@ msgstr "警告-ファイアーウォールされ、高速" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:324 msgid "IPv4: Testing; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: テスト中; IPv6: ファイアーウォール有効" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:325 msgid "IPv4: Disabled; IPv6: Testing" -msgstr "" +msgstr "IPv4: 無効; IPv6: テスト中" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:326 msgid "IPv4: Disabled; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: 無効; IPv6: ファイアーウォール有効" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:327 msgid "Disconnected" -msgstr "" +msgstr "切断" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:328 msgid "Port Conflict" -msgstr "" +msgstr "ポート競合" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:329 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 @@ -283,7 +284,7 @@ msgstr "トンネルを拒否中" #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "" +msgstr "再シード中: ファイルからルータ情報を取得 ({0} 成功, {1} 個エラー)。" #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 @@ -351,11 +352,11 @@ msgstr "既知の高速なピア" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:41 msgid "Known integrated (floodfill) peers" -msgstr "" +msgstr "基地の統合された (floodfill) ピア" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" -msgstr "" +msgstr "トンネル受け入れバックログのサイズ" #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:502 msgid "NetDb entry" @@ -373,7 +374,7 @@ msgstr "サポートされていない署名形式です" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:618 msgid "No support for our signature type" -msgstr "" +msgstr "署名タイプに非対応" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622 msgid "Unreachable on any transport" @@ -862,7 +863,7 @@ msgstr "トンネル要求ドロップ: 遅すぎます" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:260 msgid "Dropping tunnel requests: High job lag" -msgstr "" +msgstr "トンネルリクエストを中断: 高いジョブラグ" #. don't even bother, since we are so overloaded locally #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:451 @@ -871,7 +872,7 @@ msgstr "トンネル要求ドロップ: 過負荷" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "" +msgstr "トンネルを拒否: Hidden モード" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" @@ -913,7 +914,7 @@ msgstr "{0}B 転送" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" -msgstr "" +msgstr "{0} からのインストールに失敗" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 @@ -965,7 +966,7 @@ msgstr "{0} へのコピーに失敗" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" -msgstr "" +msgstr "HTTPクライアントプロキシトンネルが起動している必要があります" #. set status before thread to ensure UI feedback #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91 @@ -1180,7 +1181,7 @@ msgstr "{0} に新しいバージョンが見つかりませんでした" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 msgid "Permanently banned" -msgstr "" +msgstr "永久的に禁止されました" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format @@ -1343,7 +1344,7 @@ msgstr "プラグインをインストール" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "" +msgstr "ファイルからプラグインをインストール" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 @@ -1443,11 +1444,11 @@ msgstr "プラグインURLが指定されていません。" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" -msgstr "" +msgstr "ファイルを入力する必要があります" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "ファイルからのインストール失敗" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format @@ -1466,7 +1467,7 @@ msgstr "全てのプラグインをアップデート中" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:528 #, java-format msgid "Installing plugin from {0}" -msgstr "" +msgstr "{0} からプラグインをインストール中" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:549 #, java-format @@ -1963,11 +1964,11 @@ msgstr "ラップトップモードを無効化中" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359 msgid "Disabling inbound IPv4" -msgstr "" +msgstr "着信 IPv4を無効化中" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 msgid "Enabling inbound IPv4" -msgstr "" +msgstr "着信 IPv4を有効化中" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369 msgid "Disabling UDP" @@ -2080,35 +2081,35 @@ msgstr "リシードプロセスを開始" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:32 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491 msgid "Reseed from URL" -msgstr "" +msgstr "URLからリシード" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:37 msgid "You must enter a URL" -msgstr "" +msgstr "URLを入力する必要があります" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:66 msgid "Reseed in progress, check summary bar for status" -msgstr "" +msgstr "リシード進行中、ステータスの概要バーをチェックしてください。" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:68 msgid "Reseed complete, check summary bar for status" -msgstr "" +msgstr "リシード完了、ステータスの概要バーをチェックしてください" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503 msgid "Reseed from file" -msgstr "" +msgstr "ファイルからリシード" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91 msgid "Reseed from file failed" -msgstr "" +msgstr "ファイルからのリシード失敗" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86 #, java-format msgid "Reseed successful, loaded {0} router info from file" msgid_plural "Reseed successful, loaded {0} router infos from file" -msgstr[0] "" +msgstr[0] "リシード成功、ファイルから {0} 件のルータ情報を読み込みました" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:149 msgid "Configuration saved successfully." @@ -2487,11 +2488,11 @@ msgstr "ユーザー {0} を削除しました" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25 msgid "Set theme universally across all apps" -msgstr "" +msgstr "全アプリにテーマを設定" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:37 msgid "Force the mobile console to be used" -msgstr "" +msgstr "モバイルコンソールの使用を強制する" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76 msgid "Arabic" @@ -2499,7 +2500,7 @@ msgstr "アラビア語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77 msgid "Czech" -msgstr "" +msgstr "チェコ語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78 msgid "Danish" @@ -2515,7 +2516,7 @@ msgstr "エストニア語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "Greek" -msgstr "" +msgstr "ギリシャ語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 msgid "English" @@ -2547,7 +2548,7 @@ msgstr "日本語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Malagasy" -msgstr "" +msgstr "マラガシ語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:90 msgid "Dutch" @@ -2576,7 +2577,7 @@ msgstr "ロシア語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Slovak" -msgstr "" +msgstr "スロバキア語" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Swedish" @@ -2636,7 +2637,7 @@ msgstr "利用可能なアップデートなし" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" -msgstr "" +msgstr "ニュース URL を {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 @@ -2648,28 +2649,28 @@ msgstr "内部" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" -msgstr "" +msgstr "プロキシホストを {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" -msgstr "" +msgstr "プロキシのポートを {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" -msgstr "" +msgstr "更新頻度を {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" -msgstr "" +msgstr "二度としない" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" -msgstr "" +msgstr "アップデート設定を {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." @@ -2682,12 +2683,12 @@ msgstr "信頼されているキーを更新中。" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" -msgstr "" +msgstr "未署名の更新 URL を {0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" -msgstr "" +msgstr "署名された開発ビルドの URL を{0} に更新中" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" @@ -2711,7 +2712,7 @@ msgstr "実行を中止しました" #: ../java/src/net/i2p/router/web/EventLogHelper.java:35 msgid "Enabled floodfill" -msgstr "" +msgstr "floodfill を有効化" #: ../java/src/net/i2p/router/web/EventLogHelper.java:36 msgid "Changed IP" @@ -2723,7 +2724,7 @@ msgstr "ポートが変更されました" #: ../java/src/net/i2p/router/web/EventLogHelper.java:38 msgid "Clock shifted" -msgstr "" +msgstr "クロックがシフトされました" #: ../java/src/net/i2p/router/web/EventLogHelper.java:39 msgid "Crashed" @@ -2752,7 +2753,7 @@ msgstr "新しいルーターidentity" #: ../java/src/net/i2p/router/web/EventLogHelper.java:45 msgid "Disabled floodfill" -msgstr "" +msgstr "floodfill が無効になりました" #: ../java/src/net/i2p/router/web/EventLogHelper.java:46 msgid "Out of memory error" @@ -2760,11 +2761,11 @@ msgstr "エラー：メモリ不足" #: ../java/src/net/i2p/router/web/EventLogHelper.java:47 msgid "Reachability change" -msgstr "" +msgstr "到達可能性の変更" #: ../java/src/net/i2p/router/web/EventLogHelper.java:49 msgid "Reseeded router" -msgstr "" +msgstr "ルーターをリシードしました" #: ../java/src/net/i2p/router/web/EventLogHelper.java:50 msgid "Soft restart" @@ -2792,7 +2793,7 @@ msgstr "イベント表示" #: ../java/src/net/i2p/router/web/EventLogHelper.java:106 msgid "Events since" -msgstr "" +msgstr "以降のイベント" #: ../java/src/net/i2p/router/web/EventLogHelper.java:111 msgid "Event type" @@ -2814,17 +2815,17 @@ msgstr "イベントはありません" #: ../java/src/net/i2p/router/web/EventLogHelper.java:171 #, java-format msgid "No events found in previous {0}" -msgstr "" +msgstr "過去 {0} にイベントはありませんでした" #: ../java/src/net/i2p/router/web/EventLogHelper.java:174 #, java-format msgid "No \"{0}\" events found" -msgstr "" +msgstr "\"{0} イベントはありませんでした" #: ../java/src/net/i2p/router/web/EventLogHelper.java:175 #, java-format msgid "No \"{0}\" events found in previous {1}" -msgstr "" +msgstr "\"{0}\" イベントは過去 {1} にありませんでした" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 @@ -2849,7 +2850,7 @@ msgstr "無効なフォームからの送信、おそらくブラウザで「戻 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." -msgstr "" +msgstr "問題が続く場合、クッキーがブラウザで有効になっているか確認してください。" #: ../java/src/net/i2p/router/web/GraphHelper.java:162 msgid "Combined bandwidth graph" @@ -2860,7 +2861,7 @@ msgstr "複合帯域幅グラフ" #: ../java/src/net/i2p/router/web/GraphHelper.java:236 #, java-format msgid "{0} for {1}" -msgstr "" +msgstr "{1} 間 {0}" #: ../java/src/net/i2p/router/web/GraphHelper.java:223 #: ../java/src/net/i2p/router/web/StatSummarizer.java:332 @@ -2870,7 +2871,7 @@ msgstr "帯域幅使用率" #: ../java/src/net/i2p/router/web/GraphHelper.java:238 #, java-format msgid "ending {0} ago" -msgstr "" +msgstr "{0} 前に終了" #: ../java/src/net/i2p/router/web/GraphHelper.java:253 msgid "Larger" @@ -2898,19 +2899,19 @@ msgstr "より遅い" #: ../java/src/net/i2p/router/web/GraphHelper.java:290 msgid "Larger interval" -msgstr "" +msgstr "インターバルを大きく" #: ../java/src/net/i2p/router/web/GraphHelper.java:296 msgid "Smaller interval" -msgstr "" +msgstr "インターバルを小さく" #: ../java/src/net/i2p/router/web/GraphHelper.java:303 msgid "Previous interval" -msgstr "" +msgstr "過去のインターバル" #: ../java/src/net/i2p/router/web/GraphHelper.java:314 msgid "Next interval" -msgstr "" +msgstr "次のインターバル" #: ../java/src/net/i2p/router/web/GraphHelper.java:321 #: ../java/src/net/i2p/router/web/GraphHelper.java:361 @@ -2924,7 +2925,7 @@ msgstr "イベントを図示" #: ../java/src/net/i2p/router/web/GraphHelper.java:324 msgid "All times are UTC." -msgstr "" +msgstr "時間はすべて UTC です。" #: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Configure Graph Display" @@ -2966,11 +2967,11 @@ msgstr "更新遅延" #: ../java/src/net/i2p/router/web/GraphHelper.java:381 msgid "Store graph data on disk?" -msgstr "" +msgstr "ディスク上にグラフデータを保存しますか？" #: ../java/src/net/i2p/router/web/GraphHelper.java:387 msgid "Save settings and redraw graphs" -msgstr "" +msgstr "設定を保温してグラフを再描画する" #: ../java/src/net/i2p/router/web/GraphHelper.java:443 msgid "Graph settings saved" @@ -3088,7 +3089,7 @@ msgstr "FAQ" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Frequently Asked Questions" -msgstr "" +msgstr "よくある質問" #: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "Community forum" @@ -3102,7 +3103,7 @@ msgstr "フォーラム" msgid "" "A public anonymous Git hosting site - supports pulling via Git and HTTP and " "pushing via SSH" -msgstr "" +msgstr "公開匿名 Git ホスティングサイト - Git および HTTP を通じた pull とSSH を通じた push をサポートします" #: ../java/src/net/i2p/router/web/HomeHelper.java:49 msgid "Anonymous Git Hosting" @@ -3110,7 +3111,7 @@ msgstr "Anonymous Git Hosting" #: ../java/src/net/i2p/router/web/HomeHelper.java:50 msgid "HiddenGate" -msgstr "" +msgstr "HiddenGate" #: ../java/src/net/i2p/router/web/HomeHelper.java:51 msgid "Microblog" @@ -3118,7 +3119,7 @@ msgstr "マイクロブログ" #: ../java/src/net/i2p/router/web/HomeHelper.java:51 msgid "Your premier microblogging service on I2P" -msgstr "" +msgstr "I2P で最もよく使う短文投稿サービス" #: ../java/src/net/i2p/router/web/HomeHelper.java:52 msgid "Javadocs" @@ -3135,7 +3136,7 @@ msgstr "技術仕様" #. + I + "education.png" + S + #: ../java/src/net/i2p/router/web/HomeHelper.java:55 msgid "Debian and Tahoe-LAFS repositories" -msgstr "" +msgstr "Debian と Tahoe-LAFS のレポジトリ" #: ../java/src/net/i2p/router/web/HomeHelper.java:56 msgid "Free Web Hosting" @@ -3189,19 +3190,19 @@ msgstr "技術仕様" #: ../java/src/net/i2p/router/web/HomeHelper.java:65 msgid "Trac Wiki" -msgstr "" +msgstr "Trac Wiki" #: ../java/src/net/i2p/router/web/HomeHelper.java:66 msgid "Ugha's Wiki" -msgstr "" +msgstr "Ugha's Wiki" #: ../java/src/net/i2p/router/web/HomeHelper.java:67 msgid "Seedless and the Robert BitTorrent applications" -msgstr "" +msgstr "Seedless および Robert BitTorrent アプリケーション" #: ../java/src/net/i2p/router/web/HomeHelper.java:67 msgid "Sponge's main site" -msgstr "" +msgstr "Sponge のメインサイト" #: ../java/src/net/i2p/router/web/HomeHelper.java:108 msgid "The HTTP proxy is not up" @@ -3210,7 +3211,7 @@ msgstr "HTTPプロキシは起動していません" #: ../java/src/net/i2p/router/web/HomeHelper.java:110 #, java-format msgid "Your browser is not properly configured to use the HTTP proxy at {0}" -msgstr "" +msgstr "あなたのブラウザは {0} で HTTP プロキシを使用するように正しく設定されていません" #: ../java/src/net/i2p/router/web/HomeHelper.java:210 #: ../java/src/net/i2p/router/web/SummaryHelper.java:906 @@ -3223,11 +3224,11 @@ msgstr "URL" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" -msgstr "" +msgstr "I2P ジョブキュー" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" -msgstr "" +msgstr "有効なジョブ" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" @@ -3236,30 +3237,30 @@ msgstr "有効なジョブ" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" -msgstr "" +msgstr "{0} 前に開始" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" -msgstr "" +msgstr "たった今ジョブが終了しました" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" -msgstr "" +msgstr "{0} 前に終了" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" -msgstr "" +msgstr "準備完了/待機中のジョブ" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" -msgstr "" +msgstr "スケジュールされたジョブ" #. translators: {0} is a job name, {1} is a time, e.g. 6 min #: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" -msgstr "" +msgstr "{0} は {1} 後に開始します" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" @@ -3268,7 +3269,7 @@ msgstr "合計ジョブ統計" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" -msgstr "" +msgstr "ジョブ" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" @@ -3276,11 +3277,11 @@ msgstr "キュー" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" -msgstr "" +msgstr "有効" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" -msgstr "" +msgstr "中断" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 @@ -3304,7 +3305,7 @@ msgstr "保留中" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 #: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" -msgstr "" +msgstr "概要" #: ../java/src/net/i2p/router/web/LogsHelper.java:49 #: ../java/src/net/i2p/router/web/LogsHelper.java:103 @@ -3322,22 +3323,22 @@ msgstr "ログメッセージなし" #. 0 #: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" -msgstr "" +msgstr "ローカルルーター" #. 1 #: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" -msgstr "" +msgstr "ルーター調査" #. 2 #: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" -msgstr "" +msgstr "すべてのルーター" #. 3 #: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" -msgstr "" +msgstr "すべてのルーター（全ステータス）" #. 4 #. 5 @@ -3374,7 +3375,7 @@ msgstr "宛先" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" -msgstr "" +msgstr "ローカルのアドレス帳に追加" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 @@ -3433,7 +3434,7 @@ msgstr "次のピアの情報: " #: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" -msgstr "" +msgstr "フルエントリ" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 @@ -3459,7 +3460,7 @@ msgstr "公開済み" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" -msgstr "" +msgstr "署名キー" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" @@ -3495,31 +3496,31 @@ msgstr "NTCP 及びイントロデューサー付き SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" -msgstr "" +msgstr "IPv6 のみ SSU、イントロデューサー" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" -msgstr "" +msgstr "IPv6 SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" -msgstr "" +msgstr "IPv6 SSU、イントロデューサー" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" -msgstr "" +msgstr "IPv6 NTCP" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" -msgstr "" +msgstr "IPv6 NTCP, SSU" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" -msgstr "" +msgstr "IPv6 NTCP, SSU, イントロデューサー" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" -msgstr "" +msgstr "IPv6 のみ NTCP, SSU, イントロデューサー" #: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format @@ -3533,49 +3534,49 @@ msgstr "ニュースは {0} に最終確認。" #: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" -msgstr "" +msgstr "ニュースを非表示" #: ../java/src/net/i2p/router/web/NewsHelper.java:313 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" -msgstr "" +msgstr "ニュースを表示" #: ../java/src/net/i2p/router/web/PluginStarter.java:140 msgid "Checking for plugin updates" -msgstr "" +msgstr "プラグインのアップデートをチェック中" #: ../java/src/net/i2p/router/web/PluginStarter.java:155 msgid "Plugin update check failed" -msgstr "" +msgstr "プラグインのアップデート確認失敗" #: ../java/src/net/i2p/router/web/PluginStarter.java:193 #, java-format msgid "1 plugin updated" msgid_plural "{0} plugins updated" -msgstr[0] "" +msgstr[0] "{0} 個のプラグインをアップデートしました" #: ../java/src/net/i2p/router/web/PluginStarter.java:195 msgid "Plugin update check complete" -msgstr "" +msgstr "プラグインのアップデート確認完了" #. buf.append("

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

\n

"); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." msgid_plural "Showing {0} recent profiles." -msgstr[0] "" +msgstr[0] "{0} 件の最近のプロファイルを表示" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:81 #, java-format msgid "Hiding 1 older profile." msgid_plural "Hiding {0} older profiles." -msgstr[0] "" +msgstr[0] "{0} 件のもっと昔のプロファイルを非表示" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:83 #, java-format msgid "Hiding 1 standard profile." msgid_plural "Hiding {0} standard profiles." -msgstr[0] "" +msgstr[0] "{0} 件の標準プロファイルを非表示" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:88 msgid "Groups (Caps)" @@ -3765,16 +3766,16 @@ msgstr "ステータス" #. 0 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:12 msgid "Floodfill " -msgstr "" +msgstr "Floodfill " #. 2 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:14 msgid "All" -msgstr "" +msgstr "すべて" #: ../java/src/net/i2p/router/web/SearchHelper.java:74 msgid "Select search engine" -msgstr "" +msgstr "検索エンジンを選択" #: ../java/src/net/i2p/router/web/StatsGenerator.java:57 msgid "GO" @@ -3834,7 +3835,7 @@ msgstr "生涯平均頻度" #, java-format msgid "1 event" msgid_plural "{0} events" -msgstr[0] "" +msgstr[0] "{0}件のイベント" #: ../java/src/net/i2p/router/web/StatsGenerator.java:168 msgid "rate" @@ -3852,12 +3853,12 @@ msgstr "最大平均" #, java-format msgid "There was 1 event in this period." msgid_plural "There were {0} events in this period." -msgstr[0] "" +msgstr[0] "この期間中に {0} 件のイベントがありました。" #: ../java/src/net/i2p/router/web/StatsGenerator.java:202 #, java-format msgid "The period ended {0} ago." -msgstr "" +msgstr "その期間は {0} 前に終了しました。" #: ../java/src/net/i2p/router/web/StatsGenerator.java:204 msgid "No events" @@ -3959,13 +3960,13 @@ msgstr "テキストのルーターパフォーマンス統計" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" -msgstr "" +msgstr "ローカルトンネル" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" -msgstr "" +msgstr "Hidden サービスマネージャー" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" @@ -3979,7 +3980,7 @@ msgstr "ローカル識別子は一意な I2P ルーターの識別子であり #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." -msgstr "" +msgstr "実際の IP がばれかねないので、誰にもこれを明かさないでください。" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" @@ -4014,23 +4015,23 @@ msgstr "最適な I2P パフォーマンスを得るためにファイアーウ #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" -msgstr "" +msgstr "wiki 上で詳細を表示" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" -msgstr "" +msgstr "警告: ECDSA が利用できません。 Java または OS を更新してください" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" -msgstr "" +msgstr "I2P のアップデートを構成" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" -msgstr "" +msgstr "I2P アップデート" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" -msgstr "" +msgstr "過去数分/数時間内に通信したピア" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" @@ -4038,7 +4039,7 @@ msgstr "アクティブ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" -msgstr "" +msgstr "クライアントトンネルのビルドに利用できるピアノ数" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" @@ -4092,13 +4093,13 @@ msgstr "予備" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" -msgstr "" +msgstr "ネットワーク上でサービスを提供またはアクセスするために使用しているトンネル" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" "Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "" +msgstr "参加していて、ネットワークの帯域幅に直接貢献しているトンネル" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" @@ -4108,7 +4109,7 @@ msgstr "参加中" msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" -msgstr "" +msgstr "使用するトンネルホップに提供しているトンネルのホップ率 - 1000より大きな値はネットワークへのポジティブな貢献を示します" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" @@ -4124,7 +4125,7 @@ msgstr "混雑状態" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" -msgstr "" +msgstr "ルーターパフォーマンスを表示" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" @@ -4132,7 +4133,7 @@ msgstr "ジョブラグ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" -msgstr "" +msgstr "ほかの I2P のルーターへの送信メッセージが送られた際の速さを表示" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" @@ -4140,7 +4141,7 @@ msgstr "メッセージ遅延" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" -msgstr "" +msgstr "トンネルテストのラウンドトリップ時間" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" @@ -4148,7 +4149,7 @@ msgstr "トンネルラグ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" -msgstr "" +msgstr "トンネルに参加しているほかのルーターからのリクエストをキューに入れました" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" @@ -4156,7 +4157,7 @@ msgstr "バックラグ" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" -msgstr "" +msgstr "ニュースとアップデート" #: ../java/src/net/i2p/router/web/SummaryHelper.java:143 msgid "ERR-Client Manager I2CP Error - check logs" @@ -4169,7 +4170,7 @@ msgstr "ERR-{0} のクロックスキュー" #: ../java/src/net/i2p/router/web/SummaryHelper.java:170 msgid "ERR-Unresolved TCP Address" -msgstr "" +msgstr "エラー - 解決できない TCP アドレス" #: ../java/src/net/i2p/router/web/SummaryHelper.java:174 msgid "ERR-Private TCP Address" @@ -4215,7 +4216,7 @@ msgstr "クライアント及びサーバートンネルを追加・削除・編 #: ../java/src/net/i2p/router/web/SummaryHelper.java:450 msgid "Hidden Service" -msgstr "" +msgstr "Hidden サービス" #: ../java/src/net/i2p/router/web/SummaryHelper.java:454 msgid "Show tunnels" @@ -4274,13 +4275,13 @@ msgstr "バージョン {0} " #: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" -msgstr "" +msgstr "アップデートが利用できます" #. Note to translators: parameter is a version, e.g. "0.8.4" #: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" -msgstr "" +msgstr "{0} のアップデートをダウンロード" #. Note to translators: parameter is a router version, e.g. "0.9.19-16" #.
is optional, to help the browser make the lines even in the button @@ -4289,7 +4290,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" -msgstr "" +msgstr "署名されている
開発アップデートをダウンロード
{0}" #. Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" #.
is optional, to help the browser make the lines even in the button @@ -4298,7 +4299,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" -msgstr "" +msgstr "署名されていない {0}" #: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" @@ -4306,7 +4307,7 @@ msgstr "ファイアーウォールの構成に役立ちます" #: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" -msgstr "" +msgstr "ネットワーク接続および NAT/ファイアーウォールを確認してください" #: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" @@ -4314,39 +4315,39 @@ msgstr "リシード" #: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" -msgstr "" +msgstr "順序" #: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" -msgstr "" +msgstr "上部" #: ../java/src/net/i2p/router/web/SummaryHelper.java:930 msgid "Move to top" -msgstr "" +msgstr "上部に移動" #: ../java/src/net/i2p/router/web/SummaryHelper.java:940 msgid "Move up" -msgstr "" +msgstr "上に移動" #: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" -msgstr "" +msgstr "下" #: ../java/src/net/i2p/router/web/SummaryHelper.java:953 msgid "Move down" -msgstr "" +msgstr "下に移動" #: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" -msgstr "" +msgstr "下部" #: ../java/src/net/i2p/router/web/SummaryHelper.java:963 msgid "Move to bottom" -msgstr "" +msgstr "下部に移動" #: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" -msgstr "" +msgstr "追加するセクションを選択" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format @@ -5307,7 +5308,7 @@ msgstr "IPアドレスが変わった際の動作" msgid "" "Laptop mode - Change router identity and UDP port when IP changes for " "enhanced anonymity" -msgstr "ノートパソコンモード - より良い匿名性のため、IPアドレスが変わった際にルータのIDとUDPポートを変更する" +msgstr "ノートパソコンモード - 匿名性を向上させるため、IPアドレスが変わった際にルータのIDとUDPポートを変更する" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:530 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:560 diff --git a/apps/routerconsole/locale/messages_pl.po b/apps/routerconsole/locale/messages_pl.po index be18a1880..df958ab9a 100644 --- a/apps/routerconsole/locale/messages_pl.po +++ b/apps/routerconsole/locale/messages_pl.po @@ -12,7 +12,8 @@ # polacco , 2012,2015 # PolishAnon , 2011-2012 # seb, 2014 -# seb, 2014 +# seb, 2014-2015 +# Taporpo Ne , 2015 # Tracerneo , 2013 # Warton , 2011-2012 # Tracerneo , 2013 @@ -20,10 +21,10 @@ msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/I2P/language/pl/)\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-08-30 21:53+0000\n" +"Last-Translator: Taporpo Ne \n" +"Language-Team: Polish (http://www.transifex.com/otf/I2P/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -41,8 +42,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -52,8 +53,8 @@ msgstr[2] "{0,number,####} ms" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -63,8 +64,8 @@ msgstr[2] "{0} sek" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -74,8 +75,8 @@ msgstr[2] "{0} min" #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -83,15 +84,9 @@ msgstr[0] "1 godz" msgstr[1] "{0} godz" msgstr[2] "{0} godz" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "n/d" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -99,21 +94,37 @@ msgstr[0] "1 dzień" msgstr[1] "{0} dni" msgstr[2] "{0} dni" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "1 rok" +msgstr[1] "{0} lata" +msgstr[2] "{0} lat" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "n/d" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "1 ns" +msgstr[1] "{0,number,###} ns" +msgstr[2] "{0,number,###} ns" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "1 μs" +msgstr[1] "{0,number,###} μs" +msgstr[2] "{0,number,###} μs" #: ../../../router/java/src/net/i2p/router/Blocklist.java:201 #, java-format @@ -151,7 +162,7 @@ msgstr "Do" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "brak" @@ -164,40 +175,40 @@ msgstr "OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:312 msgid "IPv4: OK; IPv6: Testing" -msgstr "" +msgstr "IPv4: OK; IPv6: Testuję" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:313 msgid "IPv4: OK; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: OK; IPv6: Za zaporą" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:314 msgid "IPv4: Testing; IPv6: OK" -msgstr "" +msgstr "IPv4: Testuję; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:315 msgid "IPv4: Firewalled; IPv6: OK" -msgstr "" +msgstr "IPv4: Za zaporą; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:316 msgid "IPv4: Disabled; IPv6: OK" -msgstr "" +msgstr "IPv4: Wyłączone; IPv6: OK" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: Symetryczny NAT; IPv6: OK" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 msgid "Symmetric NAT" -msgstr "" +msgstr "Symetryczny NAT" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:320 msgid "IPv4: Symmetric NAT; IPv6: Testing" -msgstr "" +msgstr "IPv4: Symetryczny NAT; IPv6: Testuję" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 msgid "IPv4: Firewalled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Za zaporą; IPv6: Testuję" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:323 @@ -207,29 +218,29 @@ msgstr "Za zaporą" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:324 msgid "IPv4: Testing; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Testuję; IPv6: Za zaporą" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:325 msgid "IPv4: Disabled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Wyłączone; IPv6: Testuję" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:326 msgid "IPv4: Disabled; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Wyłączone; IPv6: Za zaporą" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:327 msgid "Disconnected" -msgstr "" +msgstr "Rozłączono" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:328 msgid "Port Conflict" -msgstr "" +msgstr "Konflikt portów" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:329 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:722 msgid "Testing" -msgstr "Testuje" +msgstr "Testuję" #. NPE, too early #. if (_context.router().getRouterInfo().getBandwidthTier().equals("K")) @@ -290,17 +301,17 @@ msgstr "Odrzucanie tuneli: Zamykanie" msgid "Rejecting tunnels" msgstr "Odrzucanie tuneli" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "" +msgstr "Ponowne seedowanie: pobrano informacje o węźle z pliku ({0} udane, {1} błędów)" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Ponowne seedowanie" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -308,26 +319,26 @@ msgstr[0] "Ponowny seed pobrał tylko 1 węzeł." msgstr[1] "Ponowny seed pobrał tylko {0} węzły." msgstr[2] "Ponowny seed pobrał tylko {0} węzłów." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Ponowne seedowanie nie udane" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Zobacz {0} w celu uzyskania pomocy." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "strona ustawień ponownego seedowania" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Ponowne seedowanie: pobieranie URL seeda" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -385,7 +396,7 @@ msgstr "Nieobsługiwany typ podpisu" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:618 msgid "No support for our signature type" -msgstr "" +msgstr "Nieobsługiwany typ naszego podpisu" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622 msgid "Unreachable on any transport" @@ -397,7 +408,7 @@ msgstr "Nieosiągalne na każdym transporcie" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Stan" @@ -412,7 +423,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} jest używane tylko do połączeń wychodzących" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP nie jest włączone" @@ -435,13 +446,13 @@ msgid "" msgstr "Aby zmienić te limity, dodaj ustawienia i2np.ntcp.maxConnections=nnn i i2np.udp.maxConnections=nnn na stronie zaawansowanych ustawień." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Definicje" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -456,7 +467,7 @@ msgstr "Zdalny uczestnik, zidentifikowany przez hash węzła" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Kier." @@ -483,13 +494,13 @@ msgstr "Jak długo od czasu, gdy pakiet został odebrany / wysłany" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Bezczynny" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Wejście / Wyjście" @@ -504,14 +515,14 @@ msgstr "Jak długo od czasu, gdy połączenie zostało ustanowione" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "W górę" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Odchylenie" @@ -560,7 +571,7 @@ msgstr "Obecny maksymalny rozmiar pakietu wysyłania / szacowany maksymalny rozm #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "TX" @@ -570,7 +581,7 @@ msgstr "Całkowita liczba pakietów wysłanych do uczestnika" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "RX" @@ -579,7 +590,7 @@ msgid "The total number of packets received from the peer" msgstr "Całkowita liczba pakietów otrzymanych od uczestnika" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Dup TX" @@ -588,7 +599,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Całkowita liczba pakietów retransmitowanych do uczestnika" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Dup RX" @@ -627,8 +638,8 @@ msgstr "Połączenie WAN PPP" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Czas działania" @@ -723,17 +734,17 @@ msgid "NTCP connections" msgstr "Połączenia NTCP" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Limit" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Limit czasu" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -746,19 +757,19 @@ msgid "Backlogged?" msgstr "Zaległości?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Przychodzące" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Wychodzące" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -766,107 +777,107 @@ msgstr[0] "{0} uczestnik" msgstr[1] "{0} uczestnicy" msgstr[2] "{0} uczestników" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "Połączenia UDP" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Sortuj według hashu uczestnika" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Kierunek/Wprowadzenie" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Sortuj według bezczynnych przychodzących" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Sortuj według bezczynnych wychodzących" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Sortuj według prędkości przychodzących" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Sortuj według prędkości wychodzących" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Sortuj według czasu działania połączenia" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Sortuj według odchylenia zegara" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Sortuj według okna zatłoczenia" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Sortuj według progu powolnego startu" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Sortuj według czasu podróży w obie strony" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Sortuj według limitu czasu retransmisji" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Sortuj według maksymalnej wychodzących jednostki transmisji" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Sortuj według pakietów wysłanych" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Sortuj według pakietów otrzymanych" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Sortuj według pakietów retransmitowanych" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Sortuj według pakietów otrzymanych więcej niż jeden raz" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Zaproponowaliśmy, że ich wprowadzimy" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Zaproponowali, że nas wprowadzą" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Zdławiony" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 porażka" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} nieudanych" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Zbanowany" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "zalogowano" @@ -904,66 +915,66 @@ msgstr "Odrzucanie żądań o tunele: Wysokie obciążenie" msgid "Dropping tunnel requests: Queue time" msgstr "Odrzucanie żądań o tunele: Czas kolejki" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Nowa wersja {0} wtyczki jest dostępna" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Nieudane sprawdzanie aktualizacji dla wtyczki {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Brak nowych wersji dla wtyczki {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} bajtów przesłano" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" -msgstr "" +msgstr "Nieudana instalacja z {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Nieudany transfer z {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Uaktualnienie ściągnięte" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Restartuję" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Zweryfikowano aktualizację" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "z {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Niepodpisana aktualizacja z pliku {0} jest uszkodzona" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Nie udało się skopiować do {0}" @@ -976,7 +987,7 @@ msgstr "Nie udało się skopiować do {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "" @@ -990,20 +1001,20 @@ msgstr "" msgid "Updating" msgstr "Uaktualniam" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Aktualizacje wewnątrz sieciowe wyłączone. Sprawdź managera pakietów." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Brak praw do zapisu w katalogu instalacyjnym I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Najpierw musisz aktualizować do wersji {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Wymagana jest Java w wersji {0}. Obecna zainstalowana wersja to {1}" @@ -1193,16 +1204,20 @@ msgid "No new version found at {0}" msgstr "Nie znaleziono nowej wersji w {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Zbanowany permanentnie" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Tymczasowy ban wygasa w {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Zbanowany aż do restartu lub przez {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "odbanuj teraz" @@ -1303,18 +1318,18 @@ msgstr "odbanuj teraz" msgid "I2P Router Console" msgstr "Konsola Węzła I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Błąd podczas aktualizowania ustawień – zobacz logi błędów" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Konfiguracja zapisana pomyślnie" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1353,7 +1368,7 @@ msgstr "Zainstaluj wtyczkę" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "" +msgstr "Zainstaluj wtyczkę z pliku" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 @@ -1453,11 +1468,11 @@ msgstr "Brak wskazanego URL wtyczki." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" -msgstr "" +msgstr "Musisz podać plik" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "Instalacja z pliku nie powiodła się" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format @@ -1476,7 +1491,7 @@ msgstr "Aktualizowanie wszystkich wtyczek" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:528 #, java-format msgid "Installing plugin from {0}" -msgstr "" +msgstr "Instalowanie wtyczki z {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:549 #, java-format @@ -1522,10 +1537,10 @@ msgid "Add Client" msgstr "Dodaj klienta" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" -msgstr "Klient" +msgstr "Klienckie" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:117 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:203 @@ -1554,9 +1569,9 @@ msgid "Plugin" msgstr "Wtyczka" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Wersja" @@ -1578,7 +1593,8 @@ msgstr "Licencja" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Strona internetowa" @@ -1591,7 +1607,7 @@ msgid "Stop" msgstr "Zatrzymaj" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Sprawdź aktualizacje" @@ -1613,7 +1629,7 @@ msgstr "Usuń" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1623,7 +1639,7 @@ msgstr "Usuń zaznaczone" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1642,7 +1658,7 @@ msgstr "Przywróć domyślne" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1771,8 +1787,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Usuń" @@ -1782,7 +1798,7 @@ msgstr "Wybierz klasę do dodania" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Przepustowość" @@ -1791,7 +1807,7 @@ msgid "Home Page" msgstr "Strona Główna" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Sieć" @@ -1847,9 +1863,9 @@ msgid "UI" msgstr "UI" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Tunele" @@ -1867,15 +1883,15 @@ msgid "Logging" msgstr "Zapisywanie do loga" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Uczestnicy" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Statystyki" @@ -1887,8 +1903,8 @@ msgstr "Zaawansowane" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -1972,11 +1988,11 @@ msgstr "Wyłączenie trybu laptopa" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359 msgid "Disabling inbound IPv4" -msgstr "" +msgstr "Wyłączenie przychodzących IPv4" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 msgid "Enabling inbound IPv4" -msgstr "" +msgstr "Włączenie przychodzących IPv4" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369 msgid "Disabling UDP" @@ -2093,7 +2109,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:37 msgid "You must enter a URL" -msgstr "" +msgstr "Musisz podać URL" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:66 msgid "Reseed in progress, check summary bar for status" @@ -2106,12 +2122,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503 msgid "Reseed from file" -msgstr "" +msgstr "Ponownie udostępnij z pliku" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91 msgid "Reseed from file failed" -msgstr "" +msgstr "Ponowne udostępnienie z pliku zakończone niepowodzeniem" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86 #, java-format @@ -2150,7 +2166,7 @@ msgstr "Natychmiast uruchom ponownie" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Restart" @@ -2593,7 +2609,7 @@ msgstr "Rosyjski" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Slovak" -msgstr "" +msgstr "Słowacki" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Swedish" @@ -2624,8 +2640,8 @@ msgid "User Name" msgstr "Nazwa użytkownika" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Dodaj" @@ -2634,91 +2650,91 @@ msgstr "Dodaj" msgid "Password" msgstr "Hasło" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Trwa już aktualizacja lub sprawdzanie" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Dostępne uaktualnienie , próba ściągnięcia" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Dostępna aktualizacja, kliknij przycisk po lewej, aby pobrać" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Brak dostepnych aktualizacji" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Aktualizowanie URL-a wiadomości do {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "wewnętrzny" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Aktualizacja hosta proxy do {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Aktualizacja portu proxy do {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Aktualizacja częstotliwości odświeżania do {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Nigdy" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Aktualizacja polityki aktualizacji do {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Aktualizaowanie zaktualizowanych adresów URL." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Uaktualnianie zaufanych kluczy" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Co" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Powiadom tylko" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Ściągnij i tylko zweryfikuj" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Ściągnij, zweryfikuj i zrestartuj" @@ -2844,7 +2860,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "Nie znaleziono żadnych \"{0}\" wydarzeń w poprzednim {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Czas" @@ -2994,12 +3010,12 @@ msgid "Graph settings saved" msgstr "Zapisano ustawienia rysowania wykresów" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Książka adresowa" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Zarządzaj swoim plikiem hosta I2P tutaj (nazwa domeny I2P)" @@ -3030,17 +3046,17 @@ msgid "I2P Home Page Configuration" msgstr "Konfiguracja strony domowej I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Anonimowy klient pocztowy" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Email" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Pomoc węzła I2P" @@ -3050,17 +3066,17 @@ msgid "Router Console" msgstr "Konsola węzła" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Wbudowany anonimowy klient sieci BitTorrent" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Torrenty" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Serwer lokalnej sieci" @@ -3229,97 +3245,97 @@ msgstr "HTTP proxy nie działa" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Twoja przeglądarka nie jest poprawnie skonfigurowana, aby używać HTTP proxy na {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Nazwa" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "Kolejka zadań I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Bierzące zadania" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Aktywne zadania" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "rozpoczęto {0} temu" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Niedawno zakończone zadania" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "zakończono {0} temu" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Gotowe/czekające zadania" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Zaplanowane zadania" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} zacznie się za {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Statystyka ogólu zadań" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Zadanie" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "W kolejce" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Uruchomiony" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Średia" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Maksimum" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Minimum" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "Czeka" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Podsumowanie" @@ -3337,223 +3353,223 @@ msgid "No log messages" msgstr "Brak logów" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Węzeł lokalny" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Sprawdź węzeł" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Wszytkie węzły" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Wszytkie węzły z pełnymi statystykami" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Węzeł" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "nie znaleziono w bazie danych sieci" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "Lokalny" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "Nieopublikowany" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "Miejsce przeznaczenia" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Dodaj do lokalnej książki adresowej" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Wygasa {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Wygasło {0} temu" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Brama" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Tunel" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "Nie zainicjalizowany" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Statystyka Sieciowej Bazy Danych Węzła" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Policz" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Transporty" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Kraj" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Nasze informacje" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Info dla uczestnika" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Pełny wpis" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Ukryte" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Uaktualnione" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} temu" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Opublikowane" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Klucz podpisujący" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Adres(y)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "koszt" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "Ukryte lub uruchamia się" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU z przedstawicielami" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP i SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP i SSU z przedstawicielami" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "IPv6 tylko SSU, przedstawiciele" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, przedstawiciele" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, przedstawiciele" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "IPv6 tylko NTCP, SSU, przedstawicieli" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Wiadomości uaktualnione {0} temu." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Wiadomości ostatnio sprawdzono {0} temu." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Ukryj wiadomości" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Pokaż wiadomości" @@ -3607,19 +3623,19 @@ msgid "Groups (Caps)" msgstr "Grupy" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Prędkość" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Wydajność" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Integracja" @@ -3642,7 +3658,7 @@ msgid "Failing" msgstr "" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "Zintegrowani" @@ -3719,71 +3735,71 @@ msgstr "Godzinny Wskaźnik Niepowodzeń" msgid "1d Fail Rate" msgstr "Dniowy Wskaźnik Niepowodzeń" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Progi" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "szybcy uczestnicy" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "uczestnicy o wysokiej wydajności" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "uczestnicy dobrze zintegrowani" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "jak określono przez organizatora profilu" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "grupy" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "ograniczenia" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "szybkość" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "pojemność" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "do ilu tuneli możemy się zwrócić z prośbą o dołączenie w ciągu godziny?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "o ilu nowych uczestnikach powiadomili nas ostatnio?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "integracja" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "czy uczestnik jest zbanowany, nieosiągalny lub nie zalicza testów tunelu?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "stan" @@ -3913,277 +3929,277 @@ msgstr "Wykresu częstotliwości wydarzeń" msgid "Lifetime average value" msgstr "liczba życiowej średniej" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Pomoc węzła I2P oraz Najczęściej zadawane pytania" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Pomoc i FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Konfiguruj rozruch klientów i aplikacji sieciowych (usług); ręcznie uruchom uśpione usługi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Usługi I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Skonfiguruj węzeł I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Wnętrzności I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Wyświetl istniejące tunele i status budowy tunelu" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Pokaż wszystkie aktualne połączenia z uczestnikami" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Pokaż ostatnie profile wydajności uczestników" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Profile" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Pokaż listę wszystkich znanych węzłów I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "NetDB" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Raport zdrowotny" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Logi" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "Wykres wydajności węzła" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Wykresy" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Lokalne tunele" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" -msgstr "Zarządzanie ukrytymi usługami" +msgstr "Zarządzaj ukrytymi usługami" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Ogólne" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Twoja Lokalna Tożsamość jest unikalną tożsamością węzła I2P podobną do adresu IP, lecz zgodną z I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Nigdy jej nikomu nie ujawniaj, gdyż może ona doprowadzić do odkrycia Twojego rzeczywistego ip." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Lokalna Tożsamość" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Twoja unikatowa tożsamość węzłą I2P to" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "nigdy nie pokazuj nikomu" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "pokaż" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Wersja używanego softwaru I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Jak długo trwa aktualna sesja" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Pomóż nam optymalizować wydajność I2P konfigurując zaporę i węzeł" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Więcej informacji zobacz na wiki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Uwaga: ECDSA niedostępne. Zaktualizuj Javę lub system operacyjny." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Konfiguracja aktualizacji I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Aktualizacja I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Uczestnicy, z którymi komunikowaliśmy się przez ostatnie parę minut/ostatnią godzinę" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" -msgstr "Aktywne" +msgstr "Aktywni" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Liczba uczestników dostępnych do budowania tuneli klienta" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Szybcy" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Liczba uczestników dostępna do budowania tuneli rozpoznawczych" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Wysokiej przepustowości" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Ilość uczestników dostępnych do zapytań bazy danych sieci" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Całkowita liczba uczestników w naszej sieciowej bazie danych" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Znani" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Ustaw przydzielanie przepustowości" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" -msgstr "Przepustowość przychodząca/wychodząca" +msgstr "Przepustowość przychodząca / wychodząca" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Razem" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Użyte" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Rozpoznawcze" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Używamy tuneli dla zabezpieczenia lub uzyskania dostępu do usług w sieci" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Uczestnictwo" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Co znajduje się w kolejce zadań węzła?" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Zatłoczenie" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Pokazuje wydajność węzła" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Opóźnienie zadań" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Wskazuje, z jaką prędkością wysyłane są wiadomości do innych węzłów I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Opóźnienie wiadomości" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Opóźnienie tunelu" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Zakolejkowane zapytania z innych węzłów dot. uczestnictwa w tunelach" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Wiadomości i aktualizacje" @@ -4287,26 +4303,26 @@ msgstr "Tworzenie tuneli" msgid "shared clients" msgstr "Współdzielone klienty" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Kliknij Restart by zainstalować" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Kliknij Zamknięcie i zrestartuj, by zainstalować" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Wersja {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Aktualizacja jest dostępna" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Pobierz {0} Uaktualnień" @@ -4315,7 +4331,7 @@ msgstr "Pobierz {0} Uaktualnień" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "" @@ -4324,69 +4340,85 @@ msgstr "" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Pomoc w konfiguracji zapory" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Sprawdź połączenie sieciowe oraz NAT/zaporę" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Ponownie seeduj" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Kolejność" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Góra" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Przenieś na górę" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Przenieś w górę" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "W dół" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "Przenieś w dół" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Dół" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "Przenieś na dół" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Wybierz sekcję, którą chcesz dodać" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "zdarzenia w {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "uśrednione dla {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Zdarzenia przez okres czasu" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "średnia" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "maksimum" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "teraz" @@ -4563,175 +4595,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Przy uruchamianiu węzła otwieraj konsolę w przeglądarce internetowej" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "proxy IRC" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "Serwer internetowy I2P" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP Proxy" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "eepProxy" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "ircProxy" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "klasyczny" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "ciemny" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "jasny" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "północ" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "OgraniczeniePrzepustowości" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "WiadomościKlienta" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Szyfrowanie" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "i2cp" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Tunel I2P" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "KolejkaZadań" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "SieciowaBazaDanych " -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "ntcp" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Strumień" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Transport" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "udp" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "klucz" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "konfiguruj przepustowość" @@ -4900,7 +4884,7 @@ msgid "Share" msgstr "Udostępnij" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "UWAGA" @@ -4941,7 +4925,7 @@ msgid "Advanced network configuration page" msgstr "Strona zaawansowanych ustawień sieciowych" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -4980,27 +4964,35 @@ msgid "" "computer's resources." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 -msgid "Automatic" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 -msgid "Force On" +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 -msgid "Disable" +msgid "Automatic" +msgstr "Automatycznie" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 +msgid "Force On" msgstr "" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 +msgid "Disable" +msgstr "Wyłącz" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Zaawansowana konfiguracja I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Niektóre zmiany mogą wymagać restartu, aby zmiany były widoczne." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "By poczynić zmiany, edytuj plik {0}." @@ -5126,7 +5118,7 @@ msgstr "Wtyczki podane poniżej są uruchamiane przez klienta webConsole." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:616 msgid "Plugin Installation from URL" -msgstr "" +msgstr "Zainstaluj wtyczkę z adresu www" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:618 #, java-format @@ -5139,19 +5131,19 @@ msgstr "Aby zainstalować wtyczkę, proszę wprowadzić adres URL:" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:631 msgid "Plugin Installation from File" -msgstr "" +msgstr "Zainstaluj wtyczkę z pliku" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:635 msgid "Install plugin from file." -msgstr "" +msgstr "Zainstaluj wtyczkę z pliku" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:637 msgid "Select xpi2p or su3 file" -msgstr "" +msgstr "Wypierz plik xpi2p lub su3" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:646 msgid "Update All Plugins" -msgstr "" +msgstr "Aktualizuj wszystkie wtyczki" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:150 msgid "config home" @@ -5369,7 +5361,7 @@ msgstr "Eksperymentalny" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:532 msgid "IPv4 Configuration" -msgstr "" +msgstr "Ustawienia IPv4" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:536 msgid "Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)" @@ -5684,7 +5676,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:744 msgid "WARN - Firewalled with Inbound TCP Enabled" -msgstr "" +msgstr "OSTRZEŻENIE - Włączona zapora akceptująca przychodzące pakiety TCP" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:746 msgid "" @@ -5903,7 +5895,7 @@ msgstr "FAQ" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483 msgid "Manual Reseed from URL" -msgstr "" +msgstr "Ręczne seedowanie z adresu URL" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:485 msgid "Enter zip or su3 URL" @@ -5925,11 +5917,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495 msgid "Manual Reseed from File" -msgstr "" +msgstr "Ręczne seedowanie z pliku" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:497 msgid "Select zip or su3 file" -msgstr "" +msgstr "Wybierz plik zip lub su3" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:505 msgid "Create Reseed File" diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po index ba45d3cbc..1ec786502 100644 --- a/apps/routerconsole/locale/messages_ru.po +++ b/apps/routerconsole/locale/messages_ru.po @@ -7,37 +7,40 @@ # Aleksey Orekhov , 2013 # Alexey Solomin , 2013 # Andrey Lukyanenko , 2013 +# brianhopes , 2015 # dimi , 2013 # ducki2p , 2011 # Eugene, 2013 # Eugene, 2013 # foo , 2009 +# Foster Snowhill, 2015 # gmind, 2012-2013 # gmind, 2013 # gmind, 2012 # Aleksey Orekhov , 2013 # dimi , 2013 # Maxym Mykhalchuk, 2015 +# Maxym Mykhalchuk, 2015 # Nikolay Parukhin , 2014 # Petr Polyakov, 2014 # Petr Polyakov, 2014 # rineri, 2014 -# Roman A. , 2013 -# Roman A. , 2013 +# Foster Snowhill, 2013 +# Foster Snowhill, 2013 # varnav, 2013 # brianhopes , 2015 -# Roman A. , 2013 +# Foster Snowhill, 2013 # yume, 2014-2015 # Andrey Lukyanenko , 2013 -# Roman A. , 2013 +# Foster Snowhill, 2013 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-15 14:49+0000\n" -"Last-Translator: Maxym Mykhalchuk\n" -"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/I2P/language/ru_RU/)\n" +"POT-Creation-Date: 2015-07-17 01:05+0000\n" +"PO-Revision-Date: 2015-07-22 18:26+0000\n" +"Last-Translator: Foster Snowhill\n" +"Language-Team: Russian (Russia) (http://www.transifex.com/otf/I2P/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -55,8 +58,8 @@ msgstr "" #. locale. #. If you want the digit separator in your locale, translate as {0}. #. alternates: msec, msecs -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1527 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1577 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1529 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1582 #, java-format msgid "1 ms" msgid_plural "{0,number,####} ms" @@ -67,8 +70,8 @@ msgstr[3] "{0,number,####} мс" #. seconds #. alternates: secs, sec. 'seconds' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1531 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1579 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1533 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1584 #, java-format msgid "1 sec" msgid_plural "{0} sec" @@ -79,8 +82,8 @@ msgstr[3] "{0} с" #. minutes #. alternates: mins, min. 'minutes' is probably too long. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1535 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1581 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1537 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1586 #, java-format msgid "1 min" msgid_plural "{0} min" @@ -91,8 +94,8 @@ msgstr[3] "{0} мин." #. hours #. alternates: hrs, hr., hrs. -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1539 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1583 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1588 #, java-format msgid "1 hour" msgid_plural "{0} hours" @@ -101,15 +104,9 @@ msgstr[1] "{0} часа" msgstr[2] "{0} часов" msgstr[3] "{0} часов" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1541 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1585 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:343 -msgid "n/a" -msgstr "н/д" - #. days #: ../../../core/java/src/net/i2p/data/DataHelper.java:1544 -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1587 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1591 #, java-format msgid "1 day" msgid_plural "{0} days" @@ -118,7 +115,24 @@ msgstr[1] "{0} дня" msgstr[2] "{0} дней" msgstr[3] "{0} дней" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1573 +#. years +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1547 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1594 +#, java-format +msgid "1 year" +msgid_plural "{0} years" +msgstr[0] "{0} год" +msgstr[1] "{0} года" +msgstr[2] "{0} лет" +msgstr[3] "{0} лет" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:334 +msgid "n/a" +msgstr "н/д" + +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1578 #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" @@ -127,7 +141,7 @@ msgstr[1] "{0,number,###} нс" msgstr[2] "{0,number,###} нс" msgstr[3] "{0,number,###} нс" -#: ../../../core/java/src/net/i2p/data/DataHelper.java:1575 +#: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" @@ -172,7 +186,7 @@ msgstr "Кому" #: ../../../router/java/src/net/i2p/router/Blocklist.java:997 #: ../java/src/net/i2p/router/web/BanlistRenderer.java:48 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:652 #: ../java/src/net/i2p/router/web/SummaryHelper.java:478 msgid "none" msgstr "нет" @@ -311,17 +325,17 @@ msgstr "Не принимаем туннели: маршрутизатор в п msgid "Rejecting tunnels" msgstr "Не принимаем туннели" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:210 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." msgstr "Начальная загрузка: получены данные маршрутизатора из файла ({0} успешно, {1} с ошибкой)." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:282 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" msgstr "Начальная загрузка" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:305 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." @@ -330,26 +344,26 @@ msgstr[1] "При начальной загрузке получены данн msgstr[2] "При начальной загрузке получены данные только о {0} маршрутизаторах." msgstr[3] "При начальной загрузке получены данные только о {0} маршрутизаторах." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:314 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." msgstr "Начальная загрузка не удалась." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:315 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." msgstr "Смотрите {0} для получения помощи." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" msgstr "страница настройки начальной загрузки" -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:564 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:695 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." msgstr "Производится начальная загрузка: загружается URL каталога маршрутизаторов." -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:621 -#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:731 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 +#: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." @@ -419,7 +433,7 @@ msgstr "Недоступен по всем транспортным проток #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:603 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:621 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1348 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2452 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2469 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:92 msgid "Status" msgstr "Состояние" @@ -434,7 +448,7 @@ msgid "{0} is used for outbound connections only" msgstr "{0} используется только для исходящих соединений" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 -#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:278 +#: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" msgstr "UPnP не включен" @@ -457,13 +471,13 @@ msgid "" msgstr "Для переопределения этих пределов добавьте параметры i2np.ntcp.maxConnections=nnn и i2np.udp.maxConnections=nnn на странице расширенных настроек." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:275 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 msgid "Definitions" msgstr "Обозначения" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:726 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1352 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2456 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 #: ../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 @@ -478,7 +492,7 @@ msgstr "Удаленный узел, идентифицируемый хешем #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:727 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" msgstr "Направление" @@ -505,13 +519,13 @@ msgstr "Сколько прошло времени после приема/пе #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:735 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1355 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2462 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2479 msgid "Idle" msgstr "Неактивен" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1356 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" msgstr "Прием/передача" @@ -526,14 +540,14 @@ msgstr "Время жизни соединения" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2472 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:928 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2489 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:935 msgid "Up" msgstr "Подключен" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2474 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" msgstr "Сдвиг" @@ -582,7 +596,7 @@ msgstr "Maximum Transfer Unit. Текущий максимальный р #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2508 msgid "TX" msgstr "Передано" @@ -592,7 +606,7 @@ msgstr "Общее количество отправленных узлу пак #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:749 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1360 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2493 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2510 msgid "RX" msgstr "Принято" @@ -601,7 +615,7 @@ msgid "The total number of packets received from the peer" msgstr "Общее количество принятых от узла пакетов" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2496 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2513 msgid "Dup TX" msgstr "Повт. отправлено" @@ -610,7 +624,7 @@ msgid "The total number of packets retransmitted to the peer" msgstr "Общее количество повторно отправленных узлу пакетов" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2498 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 msgid "Dup RX" msgstr "Повт. принято" @@ -649,8 +663,8 @@ msgstr "PPP WAN-соединение" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:283 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:309 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:288 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:314 msgid "Uptime" msgstr "Время работы" @@ -745,17 +759,17 @@ msgid "NTCP connections" msgstr "NTCP-соединения" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1345 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2449 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2466 msgid "Limit" msgstr "Предел" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1346 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2450 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2467 msgid "Timeout" msgstr "Тайм-аут" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1354 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2461 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 msgid "IPv6" msgstr "IPv6" @@ -768,19 +782,19 @@ msgid "Backlogged?" msgstr "В очереди?" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1375 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2532 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Inbound" msgstr "Входящие" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1377 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2517 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2534 #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:91 msgid "Outbound" msgstr "Исходящие" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1432 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2682 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2699 #, java-format msgid "{0} peer" msgid_plural "{0} peers" @@ -789,107 +803,107 @@ msgstr[1] "{0} пира" msgstr[2] "{0} пиров" msgstr[3] "{0} пиров" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2448 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" msgstr "UDP-соединения" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2458 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" msgstr "Сортировать по хешу узла" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2460 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" msgstr "Направление/посредничество" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2463 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" msgstr "Сортировать по неактивности приема" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" msgstr "Сортировать по неактивности передачи" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2468 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" msgstr "Сортировать по скорости приема" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2470 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" msgstr "Сортировать по скорости передачи" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2473 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" msgstr "Сортировать по времени жизни соединения" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" msgstr "Сортировать по сдвигу часов" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2478 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" msgstr "Сортировать по размеру окна перегрузки" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" msgstr "Сортировать по порогу медленного старта" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2483 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" msgstr "Сортировать по времени прохождения сигнала" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" msgstr "Сортировать по тайм-ауту повторной передачи" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" msgstr "Сортировать по размеру исходящего MTU" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" msgstr "Сортировать по количеству отправленных пакетов" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2494 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" msgstr "Сортировать по количеству принятых пакетов" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" msgstr "Сортировать по количеству повторно отправленных пакетов" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2499 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" msgstr "Сортировать по количеству повторно принятых пакетов" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2519 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" msgstr "Мы предлагаем себя в качестве посредника для этого узла" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2521 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2538 msgid "They offered to introduce us" msgstr "Этот узел предлагает себя в качестве нашего посредника" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2525 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" msgstr "Дросселирован" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2533 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" msgstr "1 сбой" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2535 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2552 #, java-format msgid "{0} fails" msgstr "{0} сбоя(-ев)" #. 1 -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2541 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2558 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" msgstr "Заблокирован" -#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2600 +#: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" msgstr "перегружен" @@ -927,66 +941,66 @@ msgstr "Игнорируем запросы туннелей: высокая н msgid "Dropping tunnel requests: Queue time" msgstr "Игнорируем запросы туннелей: слишком большое время пребывания в очереди" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:858 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" msgstr "Доступна новая версия {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:938 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" msgstr "Ошибка при проверке наличия обновлений для модуля {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:942 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" msgstr "Для модуля {0} нет обновлений" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:966 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" msgstr "{0} байт загружено" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1025 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format msgid "Install failed from {0}" msgstr "Не удалось установить из {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1027 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1053 #: ../java/src/net/i2p/router/update/UpdateRunner.java:298 #, java-format msgid "Transfer failed from {0}" msgstr "Не удалось произвести передачу файлов из {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1302 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1366 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:713 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1328 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1392 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 msgid "Update downloaded" msgstr "Обновление загружено" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1390 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1416 msgid "Restarting" msgstr "Производится перезапуск" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1346 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1372 msgid "Update verified" msgstr "Подлинность обновления проверена" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1355 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1381 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:189 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:306 #, java-format msgid "from {0}" msgstr "из {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1370 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" msgstr "Обнаружено повреждение в неподписанном обновлении, загруженном из {0}" -#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1399 +#: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format msgid "Failed copy to {0}" msgstr "Не удалось скопировать в {0}" @@ -999,7 +1013,7 @@ msgstr "Не удалось скопировать в {0}" #: ../java/src/net/i2p/router/update/UnsignedUpdateRunner.java:41 #: ../java/src/net/i2p/router/update/UpdateRunner.java:155 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:573 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:175 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" msgstr "Клиентский прокси туннель должен быть запущен" @@ -1013,20 +1027,20 @@ msgstr "Клиентский прокси туннель должен быть msgid "Updating" msgstr "Загружается обновление" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:172 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." msgstr "Внутрисетевые обновления отключены. Проверьте менеджер пакетов." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:178 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." msgstr "Отсутствует разрешение на запись в директорию установки I2P." -#: ../java/src/net/i2p/router/update/NewsFetcher.java:186 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" msgstr "Сначала вы должны обновить до версии {0}" -#: ../java/src/net/i2p/router/update/NewsFetcher.java:196 +#: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" msgstr "Требуется Java версии {0} но установлена Java версии {1}" @@ -1216,16 +1230,20 @@ msgid "No new version found at {0}" msgstr "Новая версия не обнаружена на {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 +msgid "Permanently banned" +msgstr "Заблокирован навсегда" + +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format msgid "Temporary ban expiring in {0}" msgstr "Временная блокировка истекает через {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" msgstr "Заблокирован до перезапуска или истечения {0}" -#: ../java/src/net/i2p/router/web/BanlistRenderer.java:79 +#: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" msgstr "разблокировать сейчас" @@ -1326,18 +1344,18 @@ msgstr "разблокировать сейчас" msgid "I2P Router Console" msgstr "Консоль маршрутизатора I2P" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:61 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" msgstr "Ошибка обновления конфигурации — смотрите журналы ошибок" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:71 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:87 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" msgstr "Конфигурация успешно сохранена" -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:73 -#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:89 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 +#: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:622 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:391 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:151 @@ -1545,7 +1563,7 @@ msgid "Add Client" msgstr "Добавить клиент" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:116 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:498 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:503 #: ../java/src/net/i2p/router/web/SummaryHelper.java:452 msgid "Client" msgstr "Клиентские" @@ -1577,9 +1595,9 @@ msgid "Plugin" msgstr "Модуль" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:273 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:299 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:278 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:304 msgid "Version" msgstr "Версия" @@ -1601,7 +1619,8 @@ msgstr "Лицензия" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:294 #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:152 +#: ../java/src/net/i2p/router/web/HomeHelper.java:171 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:157 msgid "Website" msgstr "Веб-сайт" @@ -1614,7 +1633,7 @@ msgid "Stop" msgstr "Остановить" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:362 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:158 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:160 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:463 msgid "Check for updates" msgstr "Проверить наличие обновлений" @@ -1636,7 +1655,7 @@ msgstr "Удалить" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:21 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:19 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:970 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:496 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:516 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 @@ -1646,7 +1665,7 @@ msgstr "Удалить выбранные" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:967 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:989 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:494 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:502 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:514 @@ -1665,7 +1684,7 @@ msgstr "Восстановить умолчания" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:200 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:202 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:482 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 @@ -1794,8 +1813,8 @@ msgstr "WARN" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:85 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:170 -#: ../java/src/net/i2p/router/web/HomeHelper.java:199 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:902 +#: ../java/src/net/i2p/router/web/HomeHelper.java:208 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 msgid "Remove" msgstr "Удалить" @@ -1805,7 +1824,7 @@ msgstr "Выберите класс для добавления" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/strings/Strings.java:57 +#: ../java/strings/Strings.java:58 msgid "Bandwidth" msgstr "Трафик" @@ -1814,7 +1833,7 @@ msgid "Home Page" msgstr "Домашняя страница" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:323 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 msgid "Network" msgstr "Сеть" @@ -1870,9 +1889,9 @@ msgid "UI" msgstr "Интерфейс" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:174 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:481 -#: ../java/strings/Strings.java:72 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:179 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/strings/Strings.java:73 msgid "Tunnels" msgstr "Туннели" @@ -1890,15 +1909,15 @@ msgid "Logging" msgstr "Журналирование" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:180 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:367 -#: ../java/strings/Strings.java:67 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:372 +#: ../java/strings/Strings.java:68 msgid "Peers" msgstr "Узлы" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:455 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:218 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:223 msgid "Stats" msgstr "Статистика" @@ -1910,8 +1929,8 @@ msgstr "Расширенные" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:97 #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:499 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:459 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:479 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:471 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:491 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:479 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:641 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:591 @@ -2174,7 +2193,7 @@ msgstr "Перезапустить немедленно" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:47 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:200 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:201 msgid "Restart" msgstr "Перезапуск" @@ -2651,8 +2670,8 @@ msgid "User Name" msgstr "Имя пользователя" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 -#: ../java/src/net/i2p/router/web/HomeHelper.java:226 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:950 +#: ../java/src/net/i2p/router/web/HomeHelper.java:235 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" msgstr "Добавить" @@ -2661,91 +2680,91 @@ msgstr "Добавить" msgid "Password" msgstr "Пароль" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:165 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" msgstr "Обновление или проверка уже в процессе" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:188 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" msgstr "Доступно обновление, идет попытка загрузки" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" msgstr "Доступно обновление, нажмите кнопку слева для загрузки" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:196 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" msgstr "Нет доступных обновлений" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:214 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" msgstr "Изменение URL новостей на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:221 -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:229 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:53 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:59 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" msgstr "внутренний" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:225 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" msgstr "Изменение узла прокси на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:233 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" msgstr "Изменение порта прокси на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:249 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" msgstr "Изменение частоты обновлений на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:250 -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:129 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 #: ../java/src/net/i2p/router/web/GraphHelper.java:377 msgid "Never" msgstr "Никогда" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:257 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" msgstr "Изменение политики обновлений на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:266 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." msgstr "Обновление URL обновлений." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:278 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." msgstr "Обновление доверенных ключей." -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:290 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" msgstr "Изменение адреса неподписанных обновлений на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:302 +#: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" msgstr "Изменение адреса подписанных тестовых сборок на {0}" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:131 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" msgstr "Каждые" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:149 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" msgstr "Только уведомлять" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:156 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" msgstr "Только скачивать и проверять целостность" -#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:164 +#: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" msgstr "Скачивать, проверять целостность и перезапускать" @@ -2871,7 +2890,7 @@ msgid "No \"{0}\" events found in previous {1}" msgstr "События \"{0}\" не найдены в предыдущих {1}" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" msgstr "Время" @@ -3021,12 +3040,12 @@ msgid "Graph settings saved" msgstr "Настройки графиков сохранены" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:224 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 msgid "Addressbook" msgstr "Адресная книга" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:222 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:227 msgid "Manage your I2P hosts file here (I2P domain name resolution)" msgstr "Управление файлами hosts (единственный механизм, используемый I2P для разрешения доменных имен)" @@ -3057,17 +3076,17 @@ msgid "I2P Home Page Configuration" msgstr "Конфигурация домашней страницы маршрутизатора I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:138 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" msgstr "Анонимный почтовый клиент с веб-интерфейсом" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:140 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" msgstr "Эл. почта" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:246 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 msgid "I2P Router Help" msgstr "Справка маршрутизатора I2P" @@ -3077,17 +3096,17 @@ msgid "Router Console" msgstr "Консоль маршрутизатора I2P" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:144 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 msgid "Built-in anonymous BitTorrent Client" msgstr "Встроенный анонимный BitTorrent-клиент" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:146 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:147 msgid "Torrents" msgstr "Торренты" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:150 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" msgstr "Локальный веб-сервер" @@ -3256,97 +3275,97 @@ msgstr "HTTP-прокси не запущен" msgid "Your browser is not properly configured to use the HTTP proxy at {0}" msgstr "Ваш браузер не настроен должным образом для использования HTTP-прокси {0}" -#: ../java/src/net/i2p/router/web/HomeHelper.java:201 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:904 +#: ../java/src/net/i2p/router/web/HomeHelper.java:210 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" msgstr "Название" -#: ../java/src/net/i2p/router/web/HomeHelper.java:203 +#: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" msgstr "URL" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" msgstr "Очередь задач I2P" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:52 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:51 msgid "Job runners" msgstr "Пускатели задач" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:57 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:56 msgid "Active jobs" msgstr "Активные задачи" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:60 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:59 #, java-format msgid "started {0} ago" msgstr "запущен {0} назад" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:65 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:64 msgid "Just finished jobs" msgstr "Только что завершенные задачи " -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:68 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:67 #, java-format msgid "finished {0} ago" msgstr "завершено {0} назад" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:73 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:72 msgid "Ready/waiting jobs" msgstr "Готовые/ожидающие задачи" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:90 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:89 msgid "Scheduled jobs" msgstr "Запланированные задачи" #. translators: {0} is a job name, {1} is a time, e.g. 6 min -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:100 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:99 #, java-format msgid "{0} will start in {1}" msgstr "{0} запустится через {1}" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:114 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" msgstr "Общая статистика задач" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" msgstr "Задача" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:125 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" msgstr "В очереди" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Runs" msgstr "Запуски" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:142 msgid "Dropped" msgstr "Отклонено" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" msgstr "Среднее" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" msgstr "Макс." -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:147 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" msgstr "Мин." -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" msgstr "В ожидании" -#: ../java/src/net/i2p/router/web/JobQueueHelper.java:198 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:14 +#: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" msgstr "Сводка" @@ -3364,223 +3383,223 @@ msgid "No log messages" msgstr "Нет сообщений" #. 0 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:15 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" msgstr "Локальный маршрутизатор" #. 1 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:16 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" msgstr "Просмотр маршрутизатора" #. 2 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:17 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" msgstr "Все маршрутизаторы" #. 3 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:18 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" msgstr "Все маршрутизаторы с полной статистикой" #. 4 #. 5 -#: ../java/src/net/i2p/router/web/NetDbHelper.java:20 +#: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" msgstr "Список LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 -#: ../java/strings/Strings.java:68 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 +#: ../java/strings/Strings.java:69 msgid "Router" msgstr "Маршрутизатор" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:96 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" msgstr "не найден в сетевой базе данных" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:139 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" msgstr "LeaseSet" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:141 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" msgstr "локальный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:143 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:160 msgid "Unpublished" msgstr "неопубликованный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:144 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:159 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:161 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:176 msgid "Destination" msgstr "адрес назначения" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:168 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" msgstr "Добавить в локальную адресную книгу" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:200 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 #, java-format msgid "Expires in {0}" msgstr "Истекает через {0}" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:175 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:202 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:192 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:219 #, java-format msgid "Expired {0} ago" msgstr "Истек {0} назад" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "Gateway" msgstr "Шлюз" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:194 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" msgstr "Lease" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:196 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" msgstr "Туннель" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:263 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" msgstr "База не инициализирована" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:313 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" msgstr "Статистика маршрутизаторов" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:320 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" msgstr "Количество" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:334 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" msgstr "Транспортный протокол" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" msgstr "Страна" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:411 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" msgstr "Информация о нас" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:413 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" msgstr "Информация об узле" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:415 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" msgstr "Полная запись" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:726 msgid "Hidden" msgstr "Скрытый" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:422 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 msgid "Updated" msgstr "Обновленный" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:423 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:426 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:441 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:444 #, java-format msgid "{0} ago" msgstr "{0} назад" #. shouldnt happen -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:425 -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:443 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:447 msgid "Published" msgstr "Опубликовано" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" msgstr "Подписывающий ключ" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" msgstr "Адрес(а)" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:445 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" msgstr "cost" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" msgstr "В скрытом режиме или недавно запущен" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" msgstr "SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:471 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU with introducers" msgstr "SSU через посредников" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP" msgstr "NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU" msgstr "NTCP и SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:472 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:490 msgid "NTCP and SSU with introducers" msgstr "NTCP и SSU через посредников" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 Only SSU, introducers" msgstr "Только IPv6 SSU, представители" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU" msgstr "IPv6 SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:473 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:491 msgid "IPv6 SSU, introducers" msgstr "IPv6 SSU, представители" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP" msgstr "IPv6 NTCP" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU" msgstr "IPv6 NTCP, SSU" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 NTCP, SSU, introducers" msgstr "IPv6 NTCP, SSU, представители" -#: ../java/src/net/i2p/router/web/NetDbRenderer.java:474 +#: ../java/src/net/i2p/router/web/NetDbRenderer.java:492 msgid "IPv6 Only NTCP, SSU, introducers" msgstr "Только IPv6 NTCP, SSU, представители" -#: ../java/src/net/i2p/router/web/NewsHelper.java:290 +#: ../java/src/net/i2p/router/web/NewsHelper.java:295 #, java-format msgid "News last updated {0} ago." msgstr "Новости последний раз обновлялись {0} назад." -#: ../java/src/net/i2p/router/web/NewsHelper.java:296 +#: ../java/src/net/i2p/router/web/NewsHelper.java:301 #, java-format msgid "News last checked {0} ago." msgstr "Новости последний раз проверялись {0} назад." -#: ../java/src/net/i2p/router/web/NewsHelper.java:305 +#: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" msgstr "Скрыть новости" -#: ../java/src/net/i2p/router/web/NewsHelper.java:308 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:642 +#: ../java/src/net/i2p/router/web/NewsHelper.java:313 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" msgstr "Показать новости" @@ -3638,19 +3657,19 @@ msgid "Groups (Caps)" msgstr "Входит в группы (возможности)" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:89 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:260 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:516 msgid "Speed" msgstr "Скорость" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:90 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:262 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:520 msgid "Capacity" msgstr "Емкость" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:91 -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:273 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:264 msgid "Integration" msgstr "Интеграция" @@ -3673,7 +3692,7 @@ msgid "Failing" msgstr "Сбоящие" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:135 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:406 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:411 msgid "Integrated" msgstr "интегрированные" @@ -3750,71 +3769,71 @@ msgstr "Уровень отказов за 1 час" msgid "1d Fail Rate" msgstr "Уровень отказов за 1 день" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:259 msgid "Thresholds" msgstr "Пороговые значения" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:261 msgid "fast peers" msgstr "быстрые узлы" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:263 msgid "high capacity peers" msgstr "высокоемкие узлы" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:274 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:265 msgid " well integrated peers" msgstr "хорошо интегрированные узлы" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "as determined by the profile organizer" msgstr "определяется автоматически модулем ProfileOrganizer на основании собранной информации о производительности узла" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:276 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:267 msgid "groups" msgstr "Входит в группы" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 msgid "capabilities in the netDb, not used to determine profiles" msgstr "информация об узле, предоставленная сетевой БД; для профилирования не используется" #. capabilities -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:277 -#: ../java/strings/Strings.java:81 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:268 +#: ../java/strings/Strings.java:82 msgid "caps" msgstr "caps" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 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:278 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:269 msgid "speed" msgstr "Скорость" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "capacity" msgstr "емкость" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:279 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:270 msgid "how many tunnels can we ask them to join in an hour?" msgstr "ко скольким туннелям мы можем попросить этот узел присоединиться за час?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "how many new peers have they told us about lately?" msgstr "о скольких новых узлах этот узел сообщил нам в последнее время?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:280 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:271 msgid "integration" msgstr "Интеграция" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "is the peer banned, or unreachable, or failing tunnel tests?" msgstr "заблокирован ли этот узел, недоступен, дает ошибки на тестах?" -#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:281 +#: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:272 msgid "status" msgstr "Состояние" @@ -3946,277 +3965,277 @@ msgstr "График количества событий" msgid "Lifetime average value" msgstr "Среднее значение за время работы" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:120 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:121 msgid "I2P Router Help & FAQ" msgstr "Справка и FAQ маршрутизатора I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:122 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:123 msgid "Help & FAQ" msgstr "Справка и FAQ" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:130 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:131 msgid "" "Configure startup of clients and webapps (services); manually start dormant " "services" msgstr "Настройка автозапуска клиентов и веб-приложений (служб), ручной запуск неактивных приложений" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:132 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:133 msgid "I2P Services" msgstr "Службы I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:164 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:169 msgid "Configure I2P Router" msgstr "Настройка маршрутизатора I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:166 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:171 msgid "I2P Internals" msgstr "Настройки I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:172 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:479 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" msgstr "Отобразить существующие туннели и состояние строящихся" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:178 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:365 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" msgstr "Просмотр списка текущих соединений с узлами" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:184 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" msgstr "Просмотр недавних профилей производительности узлов" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:186 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" msgstr "Профили" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" msgstr "Показать список всех известных I2P-маршрутизаторов" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:192 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" msgstr "Сетевая БД" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:196 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:201 msgid "Health Report" msgstr "Отчет о состоянии маршрутизатора" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:198 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:203 msgid "Logs" msgstr "Журналы" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:209 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" msgstr "График производительности маршрутизатора" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:211 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" msgstr "Графики" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:221 msgid "Textual router performance statistics" msgstr "Статистика производительности маршрутизатора в текстовом виде" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:228 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" msgstr "Локальные туннели" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:230 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:337 msgid "Hidden Services Manager" msgstr "Управление скрытыми сервисами" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:248 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 msgid "General" msgstr "Общая информация" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:253 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:258 msgid "" "Your Local Identity is your unique I2P router identity, similar to an ip " "address but tailored to I2P. " msgstr "Ваш локальный идентификатор — это уникальный идентификатор Вашего I2P-маршрутизатора, как IP-адрес, но применительно к I2P." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:254 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:259 msgid "Never disclose this to anyone, as it can reveal your real world ip." msgstr "Никогда не сообщайте его кому-либо, это может раскрыть Ваш IP-адрес." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:256 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:261 msgid "Local Identity" msgstr "Локальный идентификатор" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:260 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:265 msgid "Your unique I2P router identity is" msgstr "Уникальный идентификатор Вашего I2P-маршрутизатора:" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:264 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" msgstr "никому его не показывайте" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:266 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" msgstr "показать" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:270 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:296 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 msgid "The version of the I2P software we are running" msgstr "Версия запущенного ПО I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:280 -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:306 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:285 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:311 msgid "How long we've been running for this session" msgstr "Время работы маршрутизатора с последнего запуска" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:321 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:326 msgid "" "Help with configuring your firewall and router for optimal I2P performance" msgstr "Помощь в настройке брандмауэра и маршрутизатора для обеспечения оптимальной производительности I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:332 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:337 msgid "See more information on the wiki" msgstr "Подробнее в wiki" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:334 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:339 msgid "Warning: ECDSA is not available. Update your Java or OS" msgstr "Внимание: ECDSA недоступно. Обновите Java или ОС." -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:346 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:351 msgid "Configure I2P Updates" msgstr "Настройка обновления I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:348 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:353 msgid "I2P Update" msgstr "Обновление I2P" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:373 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:378 msgid "Peers we've been talking to in the last few minutes/last hour" msgstr "Узлы, с которыми была связь за последние минуты/часы" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:376 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:381 msgid "Active" msgstr "Активные" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:385 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:390 msgid "The number of peers available for building client tunnels" msgstr "Число узлов, доступных для создания клиентских туннелей" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:388 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:393 msgid "Fast" msgstr "Быстрые" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:394 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:399 msgid "The number of peers available for building exploratory tunnels" msgstr "Число узлов, доступных для создания зондирующих туннелей" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:397 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:402 msgid "High capacity" msgstr "Высокоемкие" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:403 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:408 msgid "The number of peers available for network database inquiries" msgstr "Число узлов, доступных для запросов к сетевой БД" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:412 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:417 msgid "The total number of peers in our network database" msgstr "Общее число узлов в нашей сетевой БД" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:415 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:420 msgid "Known" msgstr "Известные" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:435 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:440 msgid "Configure router bandwidth allocation" msgstr "Настройка ограничений скорости" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:437 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:442 msgid "Bandwidth in/out" msgstr "Трафик (вх./исх.)" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:457 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:462 msgid "Total" msgstr "Всего" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:464 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:469 msgid "Used" msgstr "Объем" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:486 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:491 msgid "" "Used for building and testing tunnels, and communicating with floodfill " "peers" msgstr "Используются для создания и тестирования туннелей и соединения с floodfill-узлами" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:489 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:494 msgid "Exploratory" msgstr "Зондирующие" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:495 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:500 msgid "Tunnels we are using to provide or access services on the network" msgstr "Туннели, используемые для доступа к службам сети или их публикации" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:504 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:509 msgid "" -"Tunnels we are participating in, directly contributing bandwith to the " +"Tunnels we are participating in, directly contributing bandwidth to the " "network" -msgstr "Туннели, в которых мы принимаем участие, непосредственно способствующие пропускной способнсти сети" +msgstr "" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:507 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:512 msgid "Participating" msgstr "Транзитные" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:513 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:518 msgid "" "The ratio of tunnel hops we provide to tunnel hops we use - a value greater " "than 1.00 indicates a positive contribution to the network" msgstr "Доля транзита отображает соотношение предоставляемой нами пропускной способности для транзитных туннелей по отношению к потребляемой нами скорости. Соотношение 1.00 означает положительный вклад в сеть" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:516 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:521 msgid "Share ratio" msgstr "Доля транзита" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:529 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:534 msgid "What's in the router's job queue?" msgstr "Просмотр очереди заданий маршрутизатора" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:531 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 msgid "Congestion" msgstr "Занятость" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:536 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:541 msgid "Indicates router performance" msgstr "Отражает производительность маршрутизатора" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:539 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:544 msgid "Job lag" msgstr "Задержка задач" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:545 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:550 msgid "Indicates how quickly outbound messages to other I2P routers are sent" msgstr "Показывает, как быстро исходящие сообщения отправляются другим I2P-маршрутизаторам" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:548 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:553 msgid "Message delay" msgstr "Задежка сообщений" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:555 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:560 msgid "Round trip time for a tunnel test" msgstr "Тест времени прохождения туннеля" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:558 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:563 msgid "Tunnel lag" msgstr "Задержка туннелей" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:565 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:570 msgid "Queued requests from other routers to participate in tunnels" msgstr "Очередь запросов от других маршрутизаторов, принимающих участие в туннелях" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:568 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:573 msgid "Backlog" msgstr "Очередь" -#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:603 +#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:608 msgid "News & Updates" msgstr "Новости и обновления" @@ -4320,26 +4339,26 @@ msgstr "Построение туннелей" msgid "shared clients" msgstr "коллективных клиентов" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:715 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 msgid "Click Restart to install" msgstr "Перезапустите I2P-маршрутизатор для установки" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:717 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" msgstr "Остановите и снова запустите I2P-маршрутизатор для установки" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:718 -#: ../java/src/net/i2p/router/web/SummaryHelper.java:733 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:720 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:735 #, java-format msgid "Version {0}" msgstr "Версия {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:732 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:734 msgid "Update available" msgstr "Доступно обновление" #. Note to translators: parameter is a version, e.g. "0.8.4" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:756 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:758 #, java-format msgid "Download {0} Update" msgstr "Скачать обновление {0}" @@ -4348,7 +4367,7 @@ msgstr "Скачать обновление {0}" #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:764 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:766 #, java-format msgid "Download Signed
Development Update
{0}" msgstr "Загрузка подписанного
тестового обновления
{0}" @@ -4357,69 +4376,85 @@ msgstr "Загрузка подписанного
тестового обно #.
is optional, to help the browser make the lines even in the button #. If the translation is shorter than the English, you should probably not #. include
-#: ../java/src/net/i2p/router/web/SummaryHelper.java:772 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:774 #, java-format msgid "Download Unsigned
Update {0}" msgstr "Скачать неподписанное
обновление {0}" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:796 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 msgid "Help with firewall configuration" msgstr "Помощь в настройке брандмауэра" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:798 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:800 msgid "Check network connection and NAT/firewall" msgstr "Проверьте сетевое соединение и настройки NAT/брандмауэра" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:817 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" msgstr "Повторить начальную загрузку" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:906 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" msgstr "Порядок" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:923 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:925 msgid "Top" msgstr "Верх" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:936 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:930 +msgid "Move to top" +msgstr "Переместить в начало" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:940 +msgid "Move up" +msgstr "Переместить вверх" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:948 msgid "Down" msgstr "Вниз" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:941 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +msgid "Move down" +msgstr "Переместить вниз" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:958 msgid "Bottom" msgstr "Низ" -#: ../java/src/net/i2p/router/web/SummaryHelper.java:953 +#: ../java/src/net/i2p/router/web/SummaryHelper.java:963 +msgid "Move to bottom" +msgstr "Переместить в конец" + +#: ../java/src/net/i2p/router/web/SummaryHelper.java:975 msgid "Select a section to add" msgstr "Выберите секцию для добавления" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:141 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" msgstr "событий за {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:143 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" msgstr "усредненное за {0}" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:153 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" msgstr "Событий за период" -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:175 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:188 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 msgid "avg" msgstr "сред." -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:176 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:189 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 msgid "max" msgstr "макс." -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:177 -#: ../java/src/net/i2p/router/web/SummaryRenderer.java:190 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:178 +#: ../java/src/net/i2p/router/web/SummaryRenderer.java:191 msgid "now" msgstr "текущ." @@ -4596,175 +4631,127 @@ msgid "Open Router Console in web browser at startup" msgstr "Открывать консоль маршрутизатора в веб-браузере при старте I2P" #: ../java/strings/Strings.java:37 +msgid "shared clients (DSA)" +msgstr "" + +#: ../java/strings/Strings.java:38 msgid "IRC proxy" msgstr "IRC-прокси" -#: ../java/strings/Strings.java:38 +#: ../java/strings/Strings.java:39 msgid "eepsite" msgstr "eepsite" -#: ../java/strings/Strings.java:39 +#: ../java/strings/Strings.java:40 msgid "I2P webserver" msgstr "I2P-веб-сервер" -#: ../java/strings/Strings.java:40 +#: ../java/strings/Strings.java:41 msgid "HTTP Proxy" msgstr "HTTP-прокси" #. older names for pre-0.7.4 installs -#: ../java/strings/Strings.java:42 +#: ../java/strings/Strings.java:43 msgid "eepProxy" msgstr "I2P-прокси" -#: ../java/strings/Strings.java:43 +#: ../java/strings/Strings.java:44 msgid "ircProxy" msgstr "IRC-прокси" #. hardcoded in i2psnark -#: ../java/strings/Strings.java:45 +#: ../java/strings/Strings.java:46 msgid "I2PSnark" msgstr "I2PSnark" #. hardcoded in iMule? -#: ../java/strings/Strings.java:47 +#: ../java/strings/Strings.java:48 msgid "iMule" msgstr "iMule" #. standard themes for ConfigUIHelper -#: ../java/strings/Strings.java:51 +#: ../java/strings/Strings.java:52 msgid "classic" msgstr "Классическая" -#: ../java/strings/Strings.java:52 +#: ../java/strings/Strings.java:53 msgid "dark" msgstr "Темная" -#: ../java/strings/Strings.java:53 +#: ../java/strings/Strings.java:54 msgid "light" msgstr "Светлая" -#: ../java/strings/Strings.java:54 +#: ../java/strings/Strings.java:55 msgid "midnight" msgstr "Полночь" -#: ../java/strings/Strings.java:58 +#: ../java/strings/Strings.java:59 msgid "BandwidthLimiter" msgstr "Ограничитель скорости" -#: ../java/strings/Strings.java:59 +#: ../java/strings/Strings.java:60 msgid "ClientMessages" msgstr "Клиентские сообщения" -#: ../java/strings/Strings.java:60 +#: ../java/strings/Strings.java:61 msgid "Encryption" msgstr "Шифрование" -#: ../java/strings/Strings.java:61 +#: ../java/strings/Strings.java:62 msgid "i2cp" msgstr "I2CP" -#: ../java/strings/Strings.java:62 +#: ../java/strings/Strings.java:63 msgid "I2PTunnel" msgstr "Менеджер туннелей" -#: ../java/strings/Strings.java:63 +#: ../java/strings/Strings.java:64 msgid "InNetPool" msgstr "Сетевой пул" -#: ../java/strings/Strings.java:64 +#: ../java/strings/Strings.java:65 msgid "JobQueue" msgstr "Очередь заданий" -#: ../java/strings/Strings.java:65 +#: ../java/strings/Strings.java:66 msgid "NetworkDatabase" msgstr "Сетевая БД" -#: ../java/strings/Strings.java:66 +#: ../java/strings/Strings.java:67 msgid "ntcp" msgstr "NTCP" -#: ../java/strings/Strings.java:69 +#: ../java/strings/Strings.java:70 msgid "Stream" msgstr "Потоки" -#: ../java/strings/Strings.java:70 +#: ../java/strings/Strings.java:71 msgid "Throttle" msgstr "Регуляция" -#: ../java/strings/Strings.java:71 +#: ../java/strings/Strings.java:72 msgid "Transport" msgstr "Транспортные протоколы" -#: ../java/strings/Strings.java:73 +#: ../java/strings/Strings.java:74 msgid "udp" msgstr "UDP" #. parameters in transport addresses (netdb.jsp) #. may or may not be worth translating -#: ../java/strings/Strings.java:77 +#: ../java/strings/Strings.java:78 msgid "host" msgstr "host" -#: ../java/strings/Strings.java:78 +#: ../java/strings/Strings.java:79 msgid "key" msgstr "key" -#: ../java/strings/Strings.java:79 +#: ../java/strings/Strings.java:80 msgid "port" msgstr "port" -#. introducer host -#: ../java/strings/Strings.java:83 -msgid "ihost0" -msgstr "ihost0" - -#: ../java/strings/Strings.java:84 -msgid "ihost1" -msgstr "ihost1" - -#: ../java/strings/Strings.java:85 -msgid "ihost2" -msgstr "ihost2" - -#. introducer port -#: ../java/strings/Strings.java:87 -msgid "iport0" -msgstr "iport0" - -#: ../java/strings/Strings.java:88 -msgid "iport1" -msgstr "iport1" - -#: ../java/strings/Strings.java:89 -msgid "iport2" -msgstr "iport2" - -#. introducer key -#: ../java/strings/Strings.java:91 -msgid "ikey0" -msgstr "ikey0" - -#: ../java/strings/Strings.java:92 -msgid "ikey1" -msgstr "ikey1" - -#: ../java/strings/Strings.java:93 -msgid "ikey2" -msgstr "ikey2" - -#. introducer tag -#: ../java/strings/Strings.java:95 -msgid "itag0" -msgstr "itag0" - -#: ../java/strings/Strings.java:96 -msgid "itag1" -msgstr "itag1" - -#: ../java/strings/Strings.java:97 -msgid "itag2" -msgstr "itag2" - #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:148 msgid "configure bandwidth" msgstr "настройка полосы пропускания" @@ -4933,7 +4920,7 @@ msgid "Share" msgstr "Доля транзитного трафика" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:479 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:481 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:493 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configtunnels_jsp.java:475 msgid "NOTE" msgstr "ПРИМЕЧАНИЕ" @@ -4974,7 +4961,7 @@ msgid "Advanced network configuration page" msgstr "Расширенные сетевые настройки" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:497 -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:477 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:489 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:498 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:574 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:590 @@ -5013,27 +5000,35 @@ msgid "" "computer's resources." msgstr "Участие в качестве Floodill-узла помогает сети, но может использовать больше ресурсов вашего компьютера." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:445 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:442 +msgid "This router is currently a floodfill participant." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:446 +msgid "This router is not currently a floodfill participant." +msgstr "" + +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 msgid "Automatic" msgstr "Автоматически" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:451 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:463 msgid "Force On" msgstr "Включить принудительно" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:457 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:469 msgid "Disable" msgstr "Отключить" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:461 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:473 msgid "Advanced I2P Configuration" msgstr "Дополнительные настройки I2P" -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:483 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:495 msgid "Some changes may require a restart to take effect." msgstr "Для вступления некоторых изменений в силу может потребоваться перезапуск I2P-маршрутизатора." -#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:486 +#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configadvanced_jsp.java:498 #, java-format msgid "To make changes, edit the file {0}." msgstr "Для внесения изменений отредактируйте файл {0}." diff --git a/apps/routerconsole/locale/messages_tr.po b/apps/routerconsole/locale/messages_tr.po index 6d7aae2fa..b20614289 100644 --- a/apps/routerconsole/locale/messages_tr.po +++ b/apps/routerconsole/locale/messages_tr.po @@ -8,7 +8,7 @@ # Erkin Batu Altunbaş , 2013 # gelomichelan, 2015 # gelomichelan, 2015 -# Kaya Zeren , 2013 +# Kaya Zeren , 2013,2015 # Trans Lator , 2013 # Trans Lator , 2013 msgid "" @@ -16,9 +16,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:05+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" +"PO-Revision-Date: 2015-08-08 07:10+0000\n" +"Last-Translator: Kaya Zeren \n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -84,7 +84,7 @@ msgstr[0] "{0} gün" #, java-format msgid "1 year" msgid_plural "{0} years" -msgstr[0] "" +msgstr[0] "{0} yıl" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 #: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 @@ -96,13 +96,13 @@ msgstr "kullanılamaz" #, java-format msgid "1 ns" msgid_plural "{0,number,###} ns" -msgstr[0] "" +msgstr[0] "{0,number,####} ns" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1580 #, java-format msgid "1 μs" msgid_plural "{0,number,###} μs" -msgstr[0] "" +msgstr[0] "{0,number,###} μs" #: ../../../router/java/src/net/i2p/router/Blocklist.java:201 #, java-format @@ -122,11 +122,11 @@ msgstr "IP blocklist.txt dosyasındaki {0} kayıdıyla engellendi" #: ../../../router/java/src/net/i2p/router/Blocklist.java:920 msgid "IPs Banned Until Restart" -msgstr "" +msgstr "Yeniden Başlatılana Kadar Yasaklanmış IP Adresleri" #: ../../../router/java/src/net/i2p/router/Blocklist.java:957 msgid "IPs Permanently Banned" -msgstr "" +msgstr "Kalıcı Olarak Yasaklanmış IP Adresleri" #: ../../../router/java/src/net/i2p/router/Blocklist.java:959 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 @@ -153,66 +153,66 @@ msgstr "Tamam" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:312 msgid "IPv4: OK; IPv6: Testing" -msgstr "" +msgstr "IPv4: Tamam; IPv6: Sınanıyor" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:313 msgid "IPv4: OK; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Tamam; IPv6: Güvenlik duvarlı" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:314 msgid "IPv4: Testing; IPv6: OK" -msgstr "" +msgstr "IPv4: Sınanıyor; IPv6: Tamam" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:315 msgid "IPv4: Firewalled; IPv6: OK" -msgstr "" +msgstr "IPv4: Güvenlik duvarlı; IPv6: Tamam" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:316 msgid "IPv4: Disabled; IPv6: OK" -msgstr "" +msgstr "IPv4: Devre dışı; IPv6: Tamam" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:317 msgid "IPv4: Symmetric NAT; IPv6: OK" -msgstr "" +msgstr "IPv4: Simetrik NAT; IPv6: Tamam" #. * IPv4 symmetric NAT, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:319 msgid "Symmetric NAT" -msgstr "" +msgstr "Simetrik NAT" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:320 msgid "IPv4: Symmetric NAT; IPv6: Testing" -msgstr "" +msgstr "IPv4: Simetrik NAT; IPv6: Sınanıyor" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:321 msgid "IPv4: Firewalled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Güvenlik duvarlı; IPv6: Sınanıyor" #. * IPv4 firewalled, IPv6 firewalled or disabled or no address #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:323 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:706 msgid "Firewalled" -msgstr "Güvenlik duvarı engellemesi" +msgstr "Güvenlik duvarlı" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:324 msgid "IPv4: Testing; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Sınanıyor; IPv6: Güvenlik duvarlı" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:325 msgid "IPv4: Disabled; IPv6: Testing" -msgstr "" +msgstr "IPv4: Devre dışı; IPv6: Sınanıyor" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:326 msgid "IPv4: Disabled; IPv6: Firewalled" -msgstr "" +msgstr "IPv4: Devre dışı; IPv6: Güvenlik duvarlı" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:327 msgid "Disconnected" -msgstr "" +msgstr "Bağlantı kesildi" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:328 msgid "Port Conflict" -msgstr "" +msgstr "Kapı Çakışması" #: ../../../router/java/src/net/i2p/router/CommSystemFacade.java:329 #: ../java/src/net/i2p/router/web/SummaryHelper.java:155 @@ -229,7 +229,7 @@ msgstr "Sınanıyor" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:135 #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:523 msgid "Rejecting tunnels: Starting up" -msgstr "" +msgstr "Tünelleme red ediliyor: Başlatılıyor" #: ../../../router/java/src/net/i2p/router/RouterThrottleImpl.java:182 msgid "Rejecting tunnels: High message delay" @@ -282,43 +282,43 @@ msgstr "Tünelleme red ediliyor" #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:212 #, java-format msgid "Reseeding: got router info from file ({0} successful, {1} errors)." -msgstr "" +msgstr "Yeniden tohumlanıyor: dosyadan yöneltici bilgileri alındı ({0} başarılı, {1} hata)." #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:284 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:28 msgid "Reseeding" -msgstr "Tekrar düğümleniyor" +msgstr "Yeniden tohumlanıyor" #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:307 #, java-format msgid "Reseed fetched only 1 router." msgid_plural "Reseed fetched only {0} routers." -msgstr[0] "Tekrar düğümleme sadece {0} yönlendirici aldı." +msgstr[0] "Yeniden tohumlama yalnız {0} yöneltici aldı." #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:316 msgid "Reseed failed." -msgstr "Tekrar düğümleme başarısız oldu." +msgstr "Yeniden tohumlama yapılamadı." #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:317 #, java-format msgid "See {0} for help." -msgstr "Yardım için {0}'a bakınız." +msgstr "Yardım için {0} bölümüne bakın." #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:318 msgid "reseed configuration page" -msgstr "tekrar düğümleme düzenleşim sayfası" +msgstr "yeniden tohumlama ayarları sayfası" #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:566 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:697 msgid "Reseeding: fetching seed URL." -msgstr "Tekrar düğümleniyor: düğüm URL'sini alıyor." +msgstr "Yeniden tohumlanıyor: tohum İnternet adresi alınıyor." #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:623 #: ../../../router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java:733 #, java-format msgid "" "Reseeding: fetching router info from seed URL ({0} successful, {1} errors)." -msgstr "Tekrar düğümleniyor: yönlendirici bilgilerini düğümleme URL''sinden alıyor ({0} başarılı, {1} hatalı)." +msgstr "Yeniden tohumlanıyor: Tohum İnternet adresinden yöneltici bilgileri alınıyor ({0} başarılı, {1} hata)." #. NOTE TO TRANSLATORS - each of these phrases is a description for a #. statistic @@ -326,19 +326,19 @@ msgstr "Tekrar düğümleniyor: yönlendirici bilgilerini düğümleme URL''sind #. Please keep relatively short so it will fit on the graphs. #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:33 msgid "Message receive rate (bytes/sec)" -msgstr "" +msgstr "İleti alma hızı (bayt/saniye)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:34 msgid "Message send rate (bytes/sec)" -msgstr "" +msgstr "İleti gönderme hızı (bayt/saniye)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:35 msgid "Low-level send rate (bytes/sec)" -msgstr "" +msgstr "Düşük düzey gönderme hızı (bayt/saniye)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:36 msgid "Low-level receive rate (bytes/sec)" -msgstr "" +msgstr "Düşük düzey alma hızı (bayt/saniye)" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:37 msgid "How many peers we are actively talking with" @@ -346,25 +346,25 @@ msgstr "Etkin olarak görüşülen eş sayısı" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:40 msgid "Known fast peers" -msgstr "" +msgstr "Bilinen hızlı eşler" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:41 msgid "Known integrated (floodfill) peers" -msgstr "" +msgstr "Bilinen tümleştirilmiş (floodfill) eşler" #: ../../../router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java:42 msgid "Size of tunnel acceptor backlog" -msgstr "" +msgstr "Tünel onaylayıcı geri günlüğünün boyutu" #: ../../../router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java:502 msgid "NetDb entry" -msgstr "NetDb girişi" +msgstr "NetDb kaydı" #. This used to be "no common transports" but it is almost always no #. transports at all #: ../../../router/java/src/net/i2p/router/transport/GetBidsJob.java:73 msgid "No transports (hidden or starting up?)" -msgstr "Taşıma yok (gizli mi, yeni mi başlıyor?)" +msgstr "Aktarım yok (gizli ya da yeni mi başlıyor)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:601 msgid "Unsupported signature type" @@ -372,11 +372,11 @@ msgstr "Desteklenmeyen imza tipi" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:618 msgid "No support for our signature type" -msgstr "" +msgstr "İmza tipimiz desteklenmiyor" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:622 msgid "Unreachable on any transport" -msgstr "Hiçbir taşımada erişilebilir değil" +msgstr "Hiçbir aktarım için erişilebilir değil" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:674 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:565 @@ -391,17 +391,17 @@ msgstr "Durum" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:692 msgid "Router Transport Addresses" -msgstr "Yönlendirici Taşıma Adresleri" +msgstr "Yöneltici Aktarım Adresleri" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:700 #, java-format msgid "{0} is used for outbound connections only" -msgstr "{0} yalnızca giden bağlantılar içindir." +msgstr "{0} yalnız giden bağlantılar için kullanılır" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:711 #: ../../../router/java/src/net/i2p/router/transport/UPnPManager.java:283 msgid "UPnP is not enabled" -msgstr "UPnp etkin değil" +msgstr "UPnP etkin değil" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:720 #: ../java/src/net/i2p/router/web/HomeHelper.java:34 @@ -413,13 +413,13 @@ msgstr "Yardım" msgid "" "Your transport connection limits are automatically set based on your " "configured bandwidth." -msgstr "Taşıma bağlantı sınırlarınız ayarlı kuşak genişliğiniz taban alınarak otomatikman belirlenmiştir." +msgstr "Aktarım bağlantı sınırlarınız ayarlanmış bant genişliğinize göre kendiliğinden belirlenmiştir." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:723 msgid "" "To override these limits, add the settings i2np.ntcp.maxConnections=nnn and " "i2np.udp.maxConnections=nnn on the advanced configuration page." -msgstr "Bu sınırları geçersiz kılmak için i2np.ntcp.maxConnections=nnn ve i2np.udp.maxConnections=nnn ayarlarını gelişmiş ayarlar sayfasında ekleyin." +msgstr "Bu sınırları değiştirmek için gelişmiş ayarlar bölümünden i2np.ntcp.maxConnections=nnn ve i2np.udp.maxConnections=nnn ayarlarını ekleyin." #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:725 #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:266 @@ -445,7 +445,7 @@ msgstr "Uzak eş, yönlendirici hash'i tarafından tespit edilmiş" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1353 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Dir" -msgstr "Dizin" +msgstr "Klasör" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:728 msgid "Inbound connection" @@ -479,15 +479,15 @@ msgstr "Boşta" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2484 #: ../java/src/net/i2p/router/web/TunnelRenderer.java:162 msgid "In/Out" -msgstr "Girdi/Çıktı" +msgstr "Giriş/Çıkış" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:736 msgid "The smoothed inbound / outbound transfer rate (KBytes per second)" -msgstr "Düzleştirilmiş gelen / giden aktarım oranı (saniyede KBayt)" +msgstr "Düzeltilmiş gelen / giden aktarım hızı (KBayt/saniye)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 msgid "How long ago this connection was established" -msgstr "" +msgstr "Bu bağlantının ne kadar zaman önce kurulduğu" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:737 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1357 @@ -500,7 +500,7 @@ msgstr "Yukarı" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" -msgstr "Kayma" +msgstr "Sapma" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 msgid "The difference between the peer's clock and your own" @@ -510,7 +510,7 @@ msgstr "Eşin ve sizin saatleriniz arasındaki ayrım" msgid "" "The congestion window, which is how many bytes can be sent without an " "acknowledgement" -msgstr "Tıkanıklık penceresi, yani bir onay olmadan kaç bayt gönderilebileceği" +msgstr "Tıkanma eşiği, bir onay olmadan kaç bayt gönderilebileceğini belirler" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:740 msgid "The number of sent messages awaiting acknowledgement" @@ -518,11 +518,11 @@ msgstr "Onay bekleyen gönderilmiş ileti sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:741 msgid "The maximum number of concurrent messages to send" -msgstr "" +msgstr "Aynı gönderilebilecek en fazla ileti sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:742 msgid "The number of pending sends which exceed congestion window" -msgstr "Tıkanıklık penceresini aşan ve gönderilmeyi bekleyen ileti sayısı" +msgstr "Tıkanma eşiğini aşan ve gönderilmeyi bekleyen ileti sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:743 msgid "The slow start threshold" @@ -530,20 +530,20 @@ msgstr "Yavaş başlangıç eşiği" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:744 msgid "The round trip time in milliseconds" -msgstr "Milisaniyelerle gidiş-dönüş" +msgstr "Milisaniye cinsinden gidiş-dönüş süresi" #. "").append(_("Dev")).append(": ").append(_("The #. standard deviation of the round trip time in #. milliseconds")).append("
\n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 msgid "The retransmit timeout in milliseconds" -msgstr "Milisaniylerle yeniden iletim zaman aşımı" +msgstr "Milisaniye cinsinden yeniden aktarım zaman aşımı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:747 msgid "" "Current maximum send packet size / estimated maximum receive packet size " "(bytes)" -msgstr "Mevcut azami gönderilen paket boyu / tahmini azami alınan paket boyu (bayt)" +msgstr "Geçerli en büyük gönderilen paket boyutu / öngörülen en büyük alınan paket boyutu (bayt)" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:748 #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1359 @@ -572,7 +572,7 @@ msgstr "Dup TX" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:750 msgid "The total number of packets retransmitted to the peer" -msgstr "Eşe yeniden iletilen paket sayısı" +msgstr "Eşe yeniden aktarılan toplam paket sayısı" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2515 @@ -581,7 +581,7 @@ msgstr "Dup RX" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:751 msgid "The total number of duplicate packets received from the peer" -msgstr "Eşten alınan çifte paket sayısı" +msgstr "Eşten alınan toplam çift paket sayısı" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:560 #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:26 @@ -590,27 +590,27 @@ msgstr "Hizmet" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:564 msgid "WAN Common Interface Configuration" -msgstr "" +msgstr "Ortak WAN Arabirimi Ayarları" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:567 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:587 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:614 msgid "Type" -msgstr "" +msgstr "Tip" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:569 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:589 msgid "Upstream" -msgstr "" +msgstr "Yükleme" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:571 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:591 msgid "Downstream" -msgstr "" +msgstr "İndirme" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:575 msgid "WAN PPP Connection" -msgstr "" +msgstr "WAN PPP Bağlantısı" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:583 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:610 @@ -622,31 +622,31 @@ msgstr "Çalışma süresi" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:593 #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:616 msgid "External IP" -msgstr "" +msgstr "Dış IP Adresi" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:597 msgid "Layer 3 Forwarding" -msgstr "" +msgstr "Layer 3 İletme" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:598 msgid "Default Connection Service" -msgstr "" +msgstr "Varsayılan Bağlantı Hizmeti" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:602 msgid "WAN IP Connection" -msgstr "" +msgstr "WAN IP Bağlantısı" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:620 msgid "WAN Ethernet Link Configuration" -msgstr "" +msgstr "WAN Ethernet Bağlantısı Ayarı" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:641 msgid "Found Device" -msgstr "" +msgstr "Aygıt Bulundu" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:643 msgid "Subdevice" -msgstr "" +msgstr "Alt aygıt" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:664 msgid "UPnP Status" @@ -654,13 +654,13 @@ msgstr "UPnP Durumu" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:668 msgid "Disabled UPnP Devices" -msgstr "" +msgstr "UPnP Aygıtlarını Devre Dışı Bırak" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:682 msgid "" "UPnP has been disabled; Do you have more than one UPnP Internet Gateway " "Device on your LAN ?" -msgstr "" +msgstr "UPnP devre dışı bırakıldı. yerel ağınızda birden fazla UPnP İnternet geçidi olabilir mi?" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:685 msgid "UPnP has not found any UPnP-aware, compatible device on your LAN." @@ -673,7 +673,7 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:695 msgid "The current external IP address is not available." -msgstr "" +msgstr "Geçerli dış IP adresi kullanılamıyor." #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:699 #, java-format @@ -692,12 +692,12 @@ msgstr "" #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:709 #, java-format msgid "{0} port {1,number,#####} was successfully forwarded by UPnP." -msgstr "" +msgstr "{0} kapısı {1,number,#####} UPnP tarafından yönlendirildi." #: ../../../router/java/src/net/i2p/router/transport/UPnP.java:711 #, java-format msgid "{0} port {1,number,#####} was not forwarded by UPnP." -msgstr "" +msgstr "{0} kapısı {1,number,#####} UPnP tarafından yönlendirilmedi." #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:561 #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:877 @@ -749,7 +749,7 @@ msgstr "Giden" #, java-format msgid "{0} peer" msgid_plural "{0} peers" -msgstr[0] "" +msgstr[0] "{0} eş" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2465 msgid "UDP connections" @@ -757,7 +757,7 @@ msgstr "UDP bağlantılari" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2475 msgid "Sort by peer hash" -msgstr "Eş hash'lerine göre sırala" +msgstr "Eş karmasına göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" @@ -765,19 +765,19 @@ msgstr "Yönerge/Giriş" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" -msgstr "Boşta gelenlere göre sırala" +msgstr "Geliş boşta beklemesine göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" -msgstr "Boşta gidenlere göre sırala" +msgstr "Gidiş boşta beklemesine göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" -msgstr "Gelen oranına göre sırala" +msgstr "Geliş hızına göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" -msgstr "Giden oranına göre sırala" +msgstr "Gidiş hızına göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" @@ -785,7 +785,7 @@ msgstr "Bağlantı süresine göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" -msgstr "Saat kaymasına göre sırala" +msgstr "Saat sapmasına göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" @@ -801,11 +801,11 @@ msgstr "Gidiş-dönüş süresine göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" -msgstr "Yeniden iletim zaman aşımına göre sırala" +msgstr "Yeniden aktarım zaman aşımına göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" -msgstr "Giden azami iletim birimine göre sırala" +msgstr "Gidiş en fazla aktarım birimine göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" @@ -817,7 +817,7 @@ msgstr "Alınan paketlere göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" -msgstr "Yeniden iletilen paketlere göre sırala" +msgstr "Yeniden aktarılan paketlere göre sırala" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" @@ -833,7 +833,7 @@ msgstr "Bize tanıştırma önerildi" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" -msgstr "Tıkalı" +msgstr "Tıkanmış" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" @@ -849,7 +849,7 @@ msgstr "{0} başarısızlık" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" -msgstr "Yasaklı" +msgstr "Yasaklanmış" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" @@ -861,20 +861,20 @@ msgstr "Tünel istekleri atılıyor: Çok yavaş" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:260 msgid "Dropping tunnel requests: High job lag" -msgstr "" +msgstr "Tünel istekleri atılıyor: Yüksek görev gecikmesi" #. don't even bother, since we are so overloaded locally #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:451 msgid "Dropping tunnel requests: Overloaded" -msgstr "Tünel istekleri atılıyor: Aşırı yük" +msgstr "Tünel istekleri atılıyor: Aşırı yüklenme" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "" +msgstr "Tüneller red ediliyor: Gizli kip" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" -msgstr "Tüneller reddediliyor: İstek aşırı yükü" +msgstr "Tüneller reddediliyor: İstek aşırı yüklenmiş" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:752 msgid "Rejecting tunnels: Connection limit" @@ -883,31 +883,31 @@ msgstr "Tüneller reddediliyor: Bağlantı sınırı" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:964 #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:997 msgid "Dropping tunnel requests: High load" -msgstr "Tünel istekleri atılıyor: Yüksek yük" +msgstr "Tünel istekleri atılıyor: Yüksek yüklenme" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1076 msgid "Dropping tunnel requests: Queue time" -msgstr "Tünel talepleri atılıyor: Kuyruk süresi" +msgstr "Tünel istekleri atılıyor: Kuyruk süresi" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format msgid "New plugin version {0} is available" -msgstr "Yeni eklenti sürümü {0} mevcut" +msgstr "Yeni uygulama eki {0} sürümü yayınlanmış" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:964 #, java-format msgid "Update check failed for plugin {0}" -msgstr "{0} eklentisi için güncelleme denetimi başarısız" +msgstr "{0} uygulama eki güncellemesi denetlenemedi" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:968 #, java-format msgid "No new version is available for plugin {0}" -msgstr "{0} eklentisi için yeni sürüm mevcut değil" +msgstr "{0} uygulama eki için yeni bir sürüm yayınlanmamış" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:992 #, java-format msgid "{0}B transferred" -msgstr "{0}B iletildi" +msgstr "{0}B aktarıldı" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1051 #, java-format @@ -964,7 +964,7 @@ msgstr "{0} üzerine kopyalanamadı" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:177 #: ../java/src/net/i2p/router/web/PluginStarter.java:157 msgid "HTTP client proxy tunnel must be running" -msgstr "" +msgstr "HTTP istemci vekil sunucu tüneli çalışıyor olmalıdır" #. set status before thread to ensure UI feedback #: ../java/src/net/i2p/router/update/DevSU3UpdateHandler.java:91 @@ -977,26 +977,26 @@ msgstr "Güncelleniyor" #: ../java/src/net/i2p/router/update/NewsFetcher.java:209 msgid "In-network updates disabled. Check package manager." -msgstr "" +msgstr "Ağ içi güncellemeler devre dışı. Paket yöneticisini denetleyin." #: ../java/src/net/i2p/router/update/NewsFetcher.java:215 msgid "No write permission for I2P install directory." -msgstr "" +msgstr "I2P kurulum klasörüne yazma izni yok." #: ../java/src/net/i2p/router/update/NewsFetcher.java:223 #, java-format msgid "You must first update to version {0}" -msgstr "" +msgstr "Önce {0} sürümüne güncellemelisiniz" #: ../java/src/net/i2p/router/update/NewsFetcher.java:233 #, java-format msgid "Requires Java version {0} but installed Java version is {1}" -msgstr "" +msgstr "Java {0} sürümü gerekli ancak yüklü Java sürümü {1}" #: ../java/src/net/i2p/router/update/PluginUpdateChecker.java:62 #, java-format msgid "Checking for update of plugin {0}" -msgstr "{0} eklentisi için güncellemeler denetleniyor" +msgstr "{0} uygulama ekinin güncellemesi denetleniyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:90 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:519 @@ -1004,33 +1004,33 @@ msgstr "{0} eklentisi için güncellemeler denetleniyor" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:72 #, java-format msgid "Bad URL {0}" -msgstr "" +msgstr "{0} İnternet adresi geçersiz" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:95 #, java-format msgid "Attempting to install from file {0}" -msgstr "" +msgstr "{0} dosyasından yüklenmeye çalışılıyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:98 #, java-format msgid "Failed to install from file {0}, copy failed." -msgstr "" +msgstr "{0} dosyasından yüklenemedi, kopyalanamadı" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:118 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:530 #, java-format msgid "Downloading plugin from {0}" -msgstr "{0}'dan eklenti indiriliyor" +msgstr "Uygulama eki {0} üzerinden indiriliyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:139 msgid "Plugin downloaded" -msgstr "Eklenti indirildi" +msgstr "Uygulama eki indirildi" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:144 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:506 #, java-format msgid "Cannot create plugin directory {0}" -msgstr "{0} eklenti dizni yaratılamıyor" +msgstr "{0} uygulama eki klasörü oluşturulamadı" #. updateStatus("" + "Plugin contains an invalid key" + ' ' + pubkey + ' ' #. + signer + ""); @@ -1039,7 +1039,7 @@ msgstr "{0} eklenti dizni yaratılamıyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:318 #, java-format msgid "Plugin from {0} contains an invalid key" -msgstr "{0}'dan gelen eklenti geçersiz anahtar içeriyor" +msgstr "{0} üzerinden alınan uygulama eki içindeki anahtar geçersiz" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:247 #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:257 @@ -1047,90 +1047,90 @@ msgstr "{0}'dan gelen eklenti geçersiz anahtar içeriyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:329 #, java-format msgid "Plugin signature verification of {0} failed" -msgstr "{0} için eklenti imzası onaylaması başarısız oldu" +msgstr "{0} için uygulama eki imzası doğrulanamadı" #. don't display signer, we're really checking the key not the signer name #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:280 msgid "Plugin not installed - signer is untrusted" -msgstr "" +msgstr "Uygulama eki yüklenemedi - imzalayana güvenilmiyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:345 #, java-format msgid "Plugin from {0} is corrupt" -msgstr "{0}'dan gelen eklenti bozuk" +msgstr "{0} üzerinden alınan uygulama eki bozuk" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:355 #, java-format msgid "Plugin from {0} does not contain the required configuration file" -msgstr "{0}'dan gelen eklenti gerekli düzenleşim dosyasını içermiyor" +msgstr "{0} üzerinden alınan uygulama ekinde bulunması gereken ayar dosyası yok" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:377 #, java-format msgid "Plugin from {0} has invalid name or version" -msgstr "{0}'dan gelen eklenti geçersiz isim'e veya versiyon'a sahip " +msgstr "{0} üzerinden alınan uygulama ekinin adı ya da sürümü geçersiz" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:382 #, java-format msgid "Plugin {0} has mismatched versions" -msgstr "{0} eklentisinin uyuşmayan sürümleri var" +msgstr "{0} uygulama ekinin sürümleri uyuşmuyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:393 #, java-format msgid "This plugin requires I2P version {0} or higher" -msgstr "Bu eklenti I2P sürüm {0} veya üstünü gerektirir" +msgstr "Bu uygulama eki için I2P {0} sürümü ya da üzeri gereklidir" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:401 #, java-format msgid "This plugin requires Java version {0} or higher" -msgstr "Bu eklenti Java sürüm {0} veya üstünü gerektirir" +msgstr "Bu uygulama eki için Java {0} sürümü ya da üzeri gerekir" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:410 msgid "" "Downloaded plugin is for new installs only, but the plugin is already " "installed" -msgstr "İndirilmiş eklenti sadece yeni yüklemeler için geçerli, fakat halihazırda eklenti yüklenmiş durumda" +msgstr "İndirilmiş uygulama eki yalnız yeni yüklemeler için kullanılabilir, ancak uygulama eki zaten yüklü" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:420 msgid "Installed plugin does not contain the required configuration file" -msgstr "Yüklenmiş eklenti gerekli düzenleşim dosyasını içermiyor" +msgstr "Yüklenmiş uygulama ekin bulunaması gereken ayar dosyası yok" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:428 msgid "Signature of downloaded plugin does not match installed plugin" -msgstr "İndirilmiş eklentinin imzası yüklü eklentinin imzası ile uyuşmuyor" +msgstr "İndirilmiş uygulama ekini imzası yüklü uygulama eki ile uyuşmuyor" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:435 #, java-format msgid "Downloaded plugin version {0} is not newer than installed plugin" -msgstr "İndirilmiş eklenti sürüm {0} yüklü olan eklentiden daha yeni değil" +msgstr "İndirilen uygulama ekinin sürümü {0} yüklü olan uygulama ekinden daha yeni değil" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:442 #, java-format msgid "Plugin update requires installed plugin version {0} or higher" -msgstr "Eklenti güncellemesi yüklü eklentinin sürüm {0} ve üstünü gerektiriyor" +msgstr "Uygulama ekinin güncellenebilmesi için yüklenmiş uygulama eki sürümü {0} ya da üzerinde olmalıdır" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:449 #, java-format msgid "Plugin update requires installed plugin version {0} or lower" -msgstr "Uygulama eki güncellenmesi için yüklenmiş uygulama eki sürümü {0} ya da daha düşük olmalıdır" +msgstr "Uygulama ekinin güncellenebilmesi için yüklenmiş uygulama eki sürümü {0} ya da altında olmalıdır" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:457 #, java-format msgid "Plugin requires Jetty version {0} or higher" -msgstr "" +msgstr "Uygulama eki için Jetty {0} ya da üzerindeki bir sürüm gerekli" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:464 #, java-format msgid "Plugin requires Jetty version {0} or lower" -msgstr "" +msgstr "Uygulama eki için Jetty {0} ya da önceki bir sürüm gerekli" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:473 #, java-format msgid "Cannot copy plugin to directory {0}" -msgstr "" +msgstr "Uygulama eki {0} klasörüne kopyalanamadı" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:483 msgid "Plugin will be installed on next restart." -msgstr "" +msgstr "Uygulama eki sonraki yeniden başlatmada yüklenecek" #: ../java/src/net/i2p/router/update/PluginUpdateRunner.java:501 msgid "Plugin is for upgrades only, but the plugin is not installed" @@ -1179,7 +1179,7 @@ msgstr "{0} üzerinde yeni bir sürüm bulunamadı" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 msgid "Permanently banned" -msgstr "" +msgstr "Kalıcı olarak yasaklandı" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format @@ -1189,7 +1189,7 @@ msgstr "Geçici yasaklama {0} içinde kaldırılacak" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" -msgstr "Yeniden başlatılana ya da {0} yapılana kadar yasaklı" +msgstr "Yeniden başlatılana kadar ya da {0} süresince yasaklı" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" @@ -1290,17 +1290,17 @@ msgstr "yasağı kaldırın" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:237 msgid "I2P Router Console" -msgstr "I2P Yönlendirici Sergeni" +msgstr "I2P Yöneltici Konsolu" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:62 msgid "Error updating the configuration - please see the error logs" -msgstr "Düzenleşimi güncellerken hata - lütfen hata kütüklerine bakınız" +msgstr "Ayarlar güncellenirken bir sorun çıktı - lütfen hata günlüklerine bakın" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:72 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:96 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:389 msgid "Configuration saved successfully" -msgstr "Düzenleşim başarıyla saklandı" +msgstr "Ayarlar kaydedildi" #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:74 #: ../java/src/net/i2p/router/web/ConfigAdvancedHandler.java:98 @@ -1310,18 +1310,18 @@ msgstr "Düzenleşim başarıyla saklandı" msgid "" "Error saving the configuration (applied but not saved) - please see the " "error logs" -msgstr "Düzenleşim kaydedilirken hata (uygulandı ancak kaydedilmedi) - lütfen hata kütüklerine bakınız" +msgstr "Ayarlar kaydedilirken bir sorun çıktı (uygulandı ancak kaydedilmedi) - lütfen hata günlüklerine bakın" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:48 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:506 msgid "Save Client Configuration" -msgstr "İstemci Düzenleşimini Kaydet" +msgstr "İstemci Ayarlarını Kaydet" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:52 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:572 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:576 msgid "Save Interface Configuration" -msgstr "Arayüz Düzenleşimini Kaydet" +msgstr "Arabirim Ayarlarını Kaydet" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:56 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:592 @@ -1331,55 +1331,55 @@ msgstr "WebApp Ayarlarını Kaydedin" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:61 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:609 msgid "Save Plugin Configuration" -msgstr "Eklenti Düzenleşimini Kaydet" +msgstr "Uygulama Eki Ayarlarını Kaydet" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:68 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:625 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:629 msgid "Install Plugin" -msgstr "Eklenti Yükle" +msgstr "Uygulama Eki Yükle" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:77 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:639 msgid "Install Plugin from File" -msgstr "" +msgstr "Dosyadan Uygulama Eki Yükle" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:86 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:650 msgid "Update All Installed Plugins" -msgstr "" +msgstr "Tüm Yüklü Uygulama Eklerini Güncelle" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:138 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:175 #, java-format msgid "Error stopping plugin {0}" -msgstr "{0} eklentisini durdururken hata" +msgstr "{0} eklentisi durdurulurken bir sorun çıktı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:143 #, java-format msgid "Deleted plugin {0}" -msgstr "{0} eklentisi silindi" +msgstr "{0} uygullama eki silindi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:145 #, java-format msgid "Error deleting plugin {0}" -msgstr "{0} eklentisini silerken hata" +msgstr "{0} uygulama eki silinirken bir sorun çıktı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:170 #, java-format msgid "Stopped plugin {0}" -msgstr "{0} eklentisi durduruldu" +msgstr "{0} uygulama eki durduruldu" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:180 #, java-format msgid "Stopped webapp {0}" -msgstr "" +msgstr "Webapp {0} durduruldu" #. label (IE) #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:209 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:352 msgid "Start" -msgstr "Başla" +msgstr "Başlat" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:282 msgid "New client added" @@ -1387,36 +1387,36 @@ msgstr "Yeni istemci eklendi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:287 msgid "Client configuration saved successfully" -msgstr "" +msgstr "İstemci ayarları kaydedildi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:297 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:323 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:338 msgid "Bad client index." -msgstr "Kötü istemci dizni." +msgstr "İstemci dizini kötü" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:306 #, java-format msgid "Client {0} stopped" -msgstr "" +msgstr "{0} istemcisi durduruldu" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:328 #, java-format msgid "Client {0} started" -msgstr "" +msgstr "{0} istemcisi başlatıldı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:343 #, java-format msgid "Client {0} deleted" -msgstr "" +msgstr "{0} istemcisi siilindi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:358 msgid "WebApp configuration saved." -msgstr "WebApp düzenleşimi kaydedildi." +msgstr "WebApp ayarları kaydedildi." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:372 msgid "Plugin configuration saved." -msgstr "Eklenti düzenleşimi kaydedildi." +msgstr "Uygulama eki ayarları kaydedildi." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202 @@ -1425,11 +1425,11 @@ msgstr "WebApp" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 msgid "started" -msgstr "başladı" +msgstr "başlatıldı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:389 msgid "Failed to start" -msgstr "Başlayamadı" +msgstr "Başlatılamadı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:394 msgid "Failed to find server." @@ -1437,60 +1437,60 @@ msgstr "Sunucu bulunamadı." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:400 msgid "No plugin URL specified." -msgstr "Eklenti URL'si belirtilmedi." +msgstr "Uygulama ekinin İnternet adresi belirtilmemiş." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:421 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:79 msgid "You must enter a file" -msgstr "" +msgstr "Bir dosya belirtmelisiniz" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:464 msgid "Install from file failed" -msgstr "" +msgstr "Dosyadan yüklenemedi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:479 #, java-format msgid "No update URL specified for {0}" -msgstr "{0} için güncelleme URL'si belirtilmedi." +msgstr "{0} için bir güncelleme İnternet adresi belirtilmemiş" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:512 msgid "Plugin or update download already in progress." -msgstr "Eklenti veya güncelleme indirme daha sürüyor." +msgstr "Uygulama eki ya da güncelleme indirmesi sürüyor." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:493 msgid "Updating all plugins" -msgstr "" +msgstr "Tüm uygulama ekleri güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:528 #, java-format msgid "Installing plugin from {0}" -msgstr "" +msgstr "Uygulama eki {0} üzerinden yükleniyor" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:549 #, java-format msgid "Checking plugin {0} for updates" -msgstr "{0} eklentisi güncellemeler için denetleniyor" +msgstr "{0} uygulama ekinin güncellemeleri denetleniyor" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:580 #, java-format msgid "Started plugin {0}" -msgstr "{0} eklentisi başladı" +msgstr "{0} uygulama eki başlatıldı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:582 #, java-format msgid "Error starting plugin {0}" -msgstr "{0} eklentisi başlatılırken hata" +msgstr "{0} uygulama eki başlatılırken bir sorun çıktı" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:604 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:93 #, java-format msgid "Added user {0}" -msgstr "" +msgstr "{0} kullanıcısı eklendi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:619 msgid "Interface configuration saved" -msgstr "" +msgstr "Arabirim ayarları kaydedildi" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:620 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:342 @@ -1498,7 +1498,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:94 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:118 msgid "Restart required to take effect" -msgstr "" +msgstr "Değişikliklerin etkili olması için yeniden başlatmalısınız" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:98 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:359 @@ -1520,7 +1520,7 @@ msgstr "İstemci" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:203 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:232 msgid "Run at Startup?" -msgstr "Başlangıçta Çalıştır?" +msgstr "Başlangıçta Çalıştırılsın" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:118 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:204 @@ -1530,17 +1530,17 @@ msgstr "Denetim" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:119 msgid "Class and arguments" -msgstr "Sınıf ve argümanlar" +msgstr "Sınıf ve değişkenler" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:205 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:234 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:284 msgid "Description" -msgstr "Tanım" +msgstr "Açıklama" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:231 msgid "Plugin" -msgstr "Eklenti" +msgstr "Uygulama Eki" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:248 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 @@ -1559,7 +1559,7 @@ msgstr "Tarih" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:273 msgid "Author" -msgstr "Yazar" +msgstr "Geliştirici" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:289 msgid "License" @@ -1594,7 +1594,7 @@ msgstr "Güncelle" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:369 #, java-format msgid "Are you sure you want to delete {0}?" -msgstr "{0}ı silmek istediğinize emin misiniz?" +msgstr "{0} ögesini silmek istediğinize emin misiniz?" #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:371 msgid "Delete" @@ -1609,7 +1609,7 @@ msgstr "Sil" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:532 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:473 msgid "Delete selected" -msgstr "" +msgstr "Seçilmişleri silin" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:22 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:23 @@ -1621,14 +1621,14 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:530 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:538 msgid "Add item" -msgstr "" +msgstr "Öge ekleyin" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:23 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:500 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:520 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:536 msgid "Restore defaults" -msgstr "" +msgstr "Varsayılanları geri yükleyin" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:24 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:26 @@ -1637,33 +1637,33 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:486 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configupdate_jsp.java:542 msgid "Save" -msgstr "" +msgstr "Kaydet" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:29 msgid "Home page changed" -msgstr "" +msgstr "Ana sayfa değiştirildi" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:51 msgid "Restored default settings" -msgstr "" +msgstr "Varsayılan ayarlar geri yüklendi" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:63 msgid "No name entered" -msgstr "" +msgstr "Bir ad yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:68 msgid "No URL entered" -msgstr "" +msgstr "Bİr İnternet adresi yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:81 msgid "Added" -msgstr "" +msgstr "Eklendi" #: ../java/src/net/i2p/router/web/ConfigHomeHandler.java:101 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:107 msgid "Removed" -msgstr "" +msgstr "Silindi" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:18 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:505 @@ -1673,21 +1673,21 @@ msgstr "Anahtar ekle" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:19 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configkeyring_jsp.java:503 msgid "Delete key" -msgstr "Anahtar sil" +msgstr "Anahtarı sil" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:21 msgid "You must enter a destination" -msgstr "Bir hedef girmelisiniz" +msgstr "Bir hedef yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:23 msgid "You must enter a key" -msgstr "Bir anahtar girmelisiniz" +msgstr "Bir anahtar yazmalısınız" #: ../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 "Şunun anahtarı" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:34 msgid "added to keyring" @@ -1695,42 +1695,42 @@ msgstr "anahtarlığa eklendi" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:36 msgid "Invalid destination or key" -msgstr "Geçersiz hedef veya anahtar" +msgstr "Hedef ya da anahtar geçersiz" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:41 msgid "removed from keyring" -msgstr "anahtarlıktan silindi" +msgstr "anahtarlıktan çıkarıldı" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:43 msgid "not found in keyring" -msgstr "anahtarlıkta bulunmadı" +msgstr "anahtarlıkta bulunamadı" #: ../java/src/net/i2p/router/web/ConfigKeyringHandler.java:45 msgid "Invalid destination" -msgstr "Geçersiz hedef" +msgstr "Hedef geçersiz" #: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:82 msgid "Log overrides updated" -msgstr "" +msgstr "Günlük değişiklikleri güncellendi" #: ../java/src/net/i2p/router/web/ConfigLoggingHandler.java:163 msgid "Log configuration saved" -msgstr "Kütük düzenleşimi kaydedildi" +msgstr "Günlük ayarları kaydedildi" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:45 msgid "" "Add additional logging statements above. Example: net.i2p.router.tunnel=WARN" -msgstr "Yukarıya ek kütük deyimleri ekleyin. Örnek: net.i2p.router.tunnel=UYAR" +msgstr "Yukarıdan ek günlük durumları ekleyin. Örnek: net.i2p.router.tunnel=UYAR" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:46 msgid "" "Or put entries in the logger.config file. Example: " "logger.record.net.i2p.router.tunnel=WARN" -msgstr "Veya girdileri logger.config dosyasına koyun. Örnek: logger.record.net.i2p.router.tunnel=UYAR" +msgstr "Ya da kayıtları logger.config dosyasına ekleyin. Örnek: logger.record.net.i2p.router.tunnel=UYAR" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:47 msgid "Valid levels are DEBUG, INFO, WARN, ERROR, CRIT" -msgstr "AYIKLA, BİLGİ, UYAR, HATA ve ACİL geçerli düzeylerdir." +msgstr "Geçerli düzeyler: AYIKLA, BİLGİ, UYAR, HATA ve ACİL" #. Homeland Security Advisory System #. http://www.dhs.gov/xinfoshare/programs/Copy_of_press_release_0046.shtm @@ -1768,7 +1768,7 @@ msgstr "Sil" #: ../java/src/net/i2p/router/web/ConfigLoggingHelper.java:122 msgid "Select a class to add" -msgstr "Eklemek için sınıf seçin" +msgstr "Eklenecek sınıfı seçin" #. stat groups for stats.jsp #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 @@ -1778,7 +1778,7 @@ msgstr "Bant genişliği" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 msgid "Home Page" -msgstr "" +msgstr "Ana Sayfa" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:328 @@ -1830,7 +1830,7 @@ msgstr "Ağ" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:292 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:310 msgid "Summary Bar" -msgstr "" +msgstr "Özet Çubuğu" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:25 msgid "UI" @@ -1854,7 +1854,7 @@ msgstr "Anahtarlık" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 msgid "Logging" -msgstr "Kütük" +msgstr "Günlükleme" #: ../java/src/net/i2p/router/web/ConfigNavHelper.java:27 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:185 @@ -1893,16 +1893,16 @@ msgstr "IP adresi güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:234 msgid "Updating IPv6 setting" -msgstr "" +msgstr "IPv6 ayarları güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:251 msgid "Disabling TCP completely" -msgstr "TCP bütünüyle devre dışı bırakılıyor" +msgstr "TCP tümüyle devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:256 #, java-format msgid "Updating TCP address to {0}" -msgstr "" +msgstr "TCP adresi {0} olarak güncelleniyor " #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:263 msgid "Disabling inbound TCP" @@ -1910,31 +1910,31 @@ msgstr "Gelen TCP devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:265 msgid "Updating inbound TCP address to auto" -msgstr "Gelen TCP adresi kendiliğinden olarak güncelleniyor" +msgstr "Gelen TCP adresi otomatik olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:278 #, java-format msgid "Updating TCP port to {0}" -msgstr "" +msgstr "TCP kapısı {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:280 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:305 msgid "Warning - ports less than 1024 are not recommended" -msgstr "" +msgstr "Uyarı - 1024 değerinden küçük kapı değerlerinin kullanılması önerilmez" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:284 #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:311 msgid "Invalid port" -msgstr "" +msgstr "Kapı geçersiz" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:289 msgid "Updating inbound TCP port to auto" -msgstr "Gelen TCP kapısı kendiliğinden olarak güncelleniyor" +msgstr "Gelen TCP kapısı otomatik olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:303 #, java-format msgid "Updating UDP port to {0}" -msgstr "" +msgstr "UDP kapısı {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:328 msgid "Gracefully restarting into Hidden Router Mode" @@ -1946,11 +1946,11 @@ msgstr "Gizli Yönlendirici Kipi'nden çıkmak için incelikle yeniden başlatı #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:339 msgid "Enabling UPnP" -msgstr "" +msgstr "UPnP etkinleştiriliyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:341 msgid "Disabling UPnP" -msgstr "" +msgstr "UPnP devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:350 msgid "Enabling laptop mode" @@ -1962,19 +1962,19 @@ msgstr "Dizüstü kipi devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:359 msgid "Disabling inbound IPv4" -msgstr "" +msgstr "Geliş için IPv4 devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:361 msgid "Enabling inbound IPv4" -msgstr "" +msgstr "Geliş için IPv4 etkinleştiriliyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:369 msgid "Disabling UDP" -msgstr "" +msgstr "UDP devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:371 msgid "Enabling UDP" -msgstr "" +msgstr "UDP devre dışı bırakılıyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:378 msgid "Requiring SSU introducers" @@ -1982,7 +1982,7 @@ msgstr "SSU tanıştırıcıları gerekiyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:436 msgid "Invalid address" -msgstr "" +msgstr "Adres geçersiz" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:442 #, java-format @@ -1991,11 +1991,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:467 msgid "Updating bandwidth share percentage" -msgstr "Kuşak genişliği pay yüzdesi güncelleniyor" +msgstr "Bant genişliği paylaşım yüzdesi güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigNetHandler.java:497 msgid "Updated bandwidth limits" -msgstr "Kuşak genişliği sınırları güncellendi" +msgstr "Bant genişliği sınırlamaları güncellendi" #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:46 #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:49 @@ -2004,32 +2004,32 @@ msgstr "bilinmeyen" #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:256 msgid "bits per second" -msgstr "saniye başına bit" +msgstr "saniyedeki bit" #: ../java/src/net/i2p/router/web/ConfigNetHelper.java:257 #, java-format msgid "or {0} bytes per month maximum" -msgstr "veya ay başına azami {0} bayt" +msgstr "ya da aylık en fazla {0} bayt" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:20 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:496 msgid "Ban peer until restart" -msgstr "Yeniden başlatana dek eşi yasakla" +msgstr "Yeniden başlatılana dek eşi yasakla" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 #, java-format msgid "Manually banned via {0}" -msgstr "{0} ile elle yasaklandı" +msgstr "{0} tarafından el ile yasaklandı" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 msgid "banned until restart" -msgstr "yeniden başlayana dek yasaklı" +msgstr "yeniden başlatılana dek yasaklı" #: ../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 "Geçersiz eş" +msgstr "Eş geçersiz" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:28 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:498 @@ -2038,24 +2038,24 @@ msgstr "Eşin yasağını kaldır" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:33 msgid "unbanned" -msgstr "yasak kalktı" +msgstr "yasak kaldırıldı" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:35 msgid "is not currently banned" -msgstr "yasaklı değil" +msgstr "şu anda yasaklı değil" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:39 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configpeer_jsp.java:524 msgid "Adjust peer bonuses" -msgstr "Eş primlerini ayarla" +msgstr "Eş hediyelerini ayarla" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:47 msgid "Bad speed value" -msgstr "Kötü hız değeri" +msgstr "Hız değer kötü" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:52 msgid "Bad capacity value" -msgstr "Kötü kapasite değeri" +msgstr "Kapasite değeri kötü" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:61 msgid "Unsupported" @@ -2064,54 +2064,54 @@ msgstr "Desteklenmiyor" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:24 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:589 msgid "Save changes and reseed now" -msgstr "Değişiklikleri kaydet ve tekrar düğümle" +msgstr "Değişiklikleri kaydet ve yeniden tohumla" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:27 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:49 msgid "Reseeding is already in progress" -msgstr "Halihazırda tekrar düğümleme süreci içinde" +msgstr "Yeniden tohumlama işlemi sürüyor" #. skip the nonce checking in ReseedHandler #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:30 msgid "Starting reseed process" -msgstr "Tekrar düğümleme süreci başlatılıyor" +msgstr "Yeniden tohumlama süreci başlatılıyor" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:32 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:491 msgid "Reseed from URL" -msgstr "" +msgstr "İnternet Adresinden Yeniden Tohumla" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:37 msgid "You must enter a URL" -msgstr "" +msgstr "Bir İnternet adresi yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:66 msgid "Reseed in progress, check summary bar for status" -msgstr "" +msgstr "Yeniden tohumlama sürüyor, durum için özet çubuğuna bakın" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:68 msgid "Reseed complete, check summary bar for status" -msgstr "" +msgstr "Yeniden tohumlama tamamlandı, durum için özet çubuğuna bakın" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:74 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:503 msgid "Reseed from file" -msgstr "" +msgstr "Dosyadan yeniden tohumla" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:84 #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:91 msgid "Reseed from file failed" -msgstr "" +msgstr "Dosyadan yeniden tohumlanamadı" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:86 #, java-format msgid "Reseed successful, loaded {0} router info from file" msgid_plural "Reseed successful, loaded {0} router infos from file" -msgstr[0] "" +msgstr[0] "Yeniden tohumlandı, dosyadan {0} yöneltici bilgisi yüklendi" #: ../java/src/net/i2p/router/web/ConfigReseedHandler.java:149 msgid "Configuration saved successfully." -msgstr "Düzenleşim başarıyla kaydedildi" +msgstr "Ayarlar kaydedildi." #. Normal browsers send value, IE sends button label #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:34 @@ -2119,21 +2119,21 @@ msgstr "Düzenleşim başarıyla kaydedildi" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:208 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:473 msgid "Shutdown immediately" -msgstr "Derhal kapat" +msgstr "Hemen kapat" #. ctx.router().shutdown(Router.EXIT_HARD); // never returns #. give the UI time to respond #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:39 msgid "Cancel shutdown" -msgstr "Kapanmayı iptal et" +msgstr "Kapatmayı iptal et" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:40 msgid "Cancel restart" -msgstr "Yeniden başlamayı iptal et" +msgstr "Yeniden başlatmayı iptal et" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:42 msgid "Restart immediately" -msgstr "Derhal yeniden başlat" +msgstr "Hemen yeniden başlat" #. ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns #. give the UI time to respond @@ -2148,16 +2148,16 @@ msgstr "Kapat" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:65 msgid "Restart imminent" -msgstr "Yeniden başlamak üzere" +msgstr "Yeniden başlatılmak üzere" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:67 msgid "Shutdown imminent" -msgstr "Kapanmak üzere" +msgstr "Kapatılmak üzere" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:71 #, java-format msgid "Shutdown in {0}" -msgstr "{0} içinde kapanıyor" +msgstr "{0} içinde kapatılıyor" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:74 #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:85 @@ -2169,7 +2169,7 @@ msgstr[0] "" #: ../java/src/net/i2p/router/web/ConfigRestartBean.java:82 #, java-format msgid "Restart in {0}" -msgstr "{0} içinde yeniden başlıyor" +msgstr "{0} içinde yeniden başlatılıyor" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:199 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:471 @@ -2226,12 +2226,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:232 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:519 msgid "Run I2P on startup" -msgstr "I2P'yi başlangıçta çalıştır" +msgstr "Başlangıçta I2P çalıştırılsın" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:234 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:521 msgid "Don't run I2P on startup" -msgstr "I2P'yi başlangıçta çalıştırma" +msgstr "Başlangıçta I2P çalıştırılmasın" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:236 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:545 @@ -2246,20 +2246,20 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:244 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:553 msgid "View console on startup" -msgstr "Başlangıçta sergeni görüntüle" +msgstr "Başlangıçta konsol görüntülensin" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:246 msgid "Console is to be shown on startup" -msgstr "Başlangıçta sergen gösterilecek" +msgstr "Başlangıçta konsol görüntülenecek" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:247 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:555 msgid "Do not view console on startup" -msgstr "Başlangıçta sergen görüntülenecek" +msgstr "Başlangıçta konsol görüntülenmesin" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:249 msgid "Console is not to be shown on startup" -msgstr "Başlangıçta sergen görüntülenmeyecek" +msgstr "Başlangıçta konsol görüntülenmeyecek" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:250 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:541 @@ -2272,7 +2272,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:261 msgid "Service installed" -msgstr "Hizmet Yüklendi" +msgstr "Hizmet yüklendi" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:263 msgid "Warning: unable to install the service" @@ -2284,7 +2284,7 @@ msgstr "Hizmet silindi" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:272 msgid "Warning: unable to remove the service" -msgstr "Uyarı: Hitmet silinemiyor" +msgstr "Uyarı: Hitmet silinemedi" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:116 msgid "Stat filter and location updated successfully to" @@ -2292,11 +2292,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:119 msgid "Full statistics enabled" -msgstr "" +msgstr "Tam istatistikler etkinleştirildi" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:121 msgid "Full statistics disabled" -msgstr "" +msgstr "Tam istatistikler devre dışı bırakıldı" #: ../java/src/net/i2p/router/web/ConfigStatsHandler.java:125 #, java-format @@ -2307,35 +2307,35 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:24 msgid "Save order" -msgstr "" +msgstr "Sıralamayı kaydedin" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:31 msgid "Refresh interval changed" -msgstr "" +msgstr "Yenileme sıklığı değiştirildi" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:33 #, java-format msgid "Refresh interval must be at least {0} seconds" -msgstr "" +msgstr "Yenileme sıklığı en az {0} saniye olmalıdır" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:35 msgid "Refresh interval must be a number" -msgstr "" +msgstr "Yenileme sıklığı bir sayı olmalıdır" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:38 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:494 msgid "Restore full default" -msgstr "" +msgstr "Tüm varsayılanları geri yükleyin" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:40 msgid "Full summary bar default restored." -msgstr "" +msgstr "Tüm özet çubuğu varsayılanları geri yüklendi" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:41 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:45 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:137 msgid "Summary bar will refresh shortly." -msgstr "" +msgstr "Özet çubuğu kısa süre içinde yenilenecek." #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:42 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configsidebar_jsp.java:496 @@ -2350,34 +2350,34 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:83 #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:131 msgid "Order must be an integer" -msgstr "" +msgstr "Sıralama bir tamsayı olmalıdır" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:68 msgid "No section selected" -msgstr "" +msgstr "Bir bölüm seçilmemiş" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:73 msgid "No order entered" -msgstr "" +msgstr "Bir sıralama yazılmamış" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:129 msgid "Moved" -msgstr "" +msgstr "Taşındı" #: ../java/src/net/i2p/router/web/ConfigSummaryHandler.java:136 msgid "Saved order of sections." -msgstr "" +msgstr "Bölüm sıralaması kaydedildi." #. the count isn't really correct anyway, since we don't check for actual #. changes #. addFormNotice("Updated settings for " + updated + " pools."); #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:130 msgid "Updated settings for all pools." -msgstr "Tüm havuzlar için ayarlar güncellendi." +msgstr "Tüm havuzların ayarları güncellendi." #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:135 msgid "Exploratory tunnel configuration saved successfully." -msgstr "Araştırma tünel düzenleşimi başarıyla kaydedildi." +msgstr "Araştırma tüneli ayarları kaydedildi." #: ../java/src/net/i2p/router/web/ConfigTunnelsHandler.java:137 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:73 @@ -2386,7 +2386,7 @@ msgstr "Araştırma tünel düzenleşimi başarıyla kaydedildi." msgid "" "Error saving the configuration (applied but not saved) - please see the " "error logs." -msgstr "Düzenleşim kaydedilirken hata (uygulandı ancak kaydedilmedi) - lütfen hata kütüklerine bakınız." +msgstr "Ayarlar kaydedilirken bir sorun çıktı (uygulandı ancak kaydedilmedi) - lütfen hata günlüklerine bakın." #. * dummies for translation #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:14 @@ -2425,7 +2425,7 @@ msgstr "BAŞARIM UYARISI - Ayarlar çok uzun tüneller içeriyor." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:89 msgid "PERFORMANCE WARNING - Settings include high tunnel quantities." -msgstr "BAŞARIM UYARISI - Ayarlar yüksek tünel nicelikleri içeriyor." +msgstr "BAŞARIM UYARISI - Ayarlar çok fazla sayıda tünel içeriyor." #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:97 msgid "Length" @@ -2434,7 +2434,7 @@ msgstr "Uzunluk" #. tunnel depth variance #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:114 msgid "Randomization" -msgstr "Rasgeleleştirme" +msgstr "Rastgeleleştirme" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:139 msgid "Quantity" @@ -2442,7 +2442,7 @@ msgstr "Nicelik" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:157 msgid "Backup quantity" -msgstr "Yedek niceliği" +msgstr "Yedekleme sayısı" #: ../java/src/net/i2p/router/web/ConfigTunnelsHelper.java:179 msgid "Inbound options" @@ -2456,11 +2456,11 @@ msgstr "Giden ayarları" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:471 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configui_jsp.java:477 msgid "Add user" -msgstr "" +msgstr "Kullanıcı ekle" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:63 msgid "Theme change saved." -msgstr "Biçem değişikliği kaydedildi." +msgstr "Tema değişikliği kaydedildi." #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:65 #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:70 @@ -2469,20 +2469,20 @@ msgstr "Görmek için sayfayı yenileyin." #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:68 msgid "Mobile console option saved." -msgstr "" +msgstr "Mobil konsol ayarları kaydedildi." #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:80 msgid "No user name entered" -msgstr "" +msgstr "Bir kullanıcı adı yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:85 msgid "No password entered" -msgstr "" +msgstr "Bir parola yazmalısınız" #: ../java/src/net/i2p/router/web/ConfigUIHandler.java:111 #, java-format msgid "Removed user {0}" -msgstr "" +msgstr "{0} kullanıcısı silindi" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:25 msgid "Set theme universally across all apps" @@ -2494,15 +2494,15 @@ msgstr "" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:76 msgid "Arabic" -msgstr "" +msgstr "Arapça" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:77 msgid "Czech" -msgstr "" +msgstr "Çekce" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:78 msgid "Danish" -msgstr "" +msgstr "Danimarkaca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:79 msgid "German" @@ -2510,11 +2510,11 @@ msgstr "Almanca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:80 msgid "Estonian" -msgstr "" +msgstr "Estonca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:81 msgid "Greek" -msgstr "" +msgstr "Yunanca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:82 msgid "English" @@ -2526,7 +2526,7 @@ msgstr "İspanyolca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:84 msgid "Finnish" -msgstr "" +msgstr "Fince" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:85 msgid "French" @@ -2534,19 +2534,19 @@ msgstr "Fransızca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:86 msgid "Hungarian" -msgstr "" +msgstr "Macarca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:87 msgid "Italian" -msgstr "" +msgstr "İtalyanca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:88 msgid "Japanese" -msgstr "" +msgstr "Japonca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:89 msgid "Malagasy" -msgstr "" +msgstr "Malagazca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:90 msgid "Dutch" @@ -2554,11 +2554,11 @@ msgstr "Felemence" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:91 msgid "Norwegian Bokmaal" -msgstr "" +msgstr "Norveç Bokmaal" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:92 msgid "Polish" -msgstr "" +msgstr "Lehçe" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:93 #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:94 @@ -2567,7 +2567,7 @@ msgstr "Portekizce" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:95 msgid "Romanian" -msgstr "" +msgstr "Romence" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:96 msgid "Russian" @@ -2575,7 +2575,7 @@ msgstr "Rusça" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:97 msgid "Slovak" -msgstr "" +msgstr "Slovakça" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:98 msgid "Swedish" @@ -2583,15 +2583,15 @@ msgstr "İsveççe" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:99 msgid "Turkish" -msgstr "" +msgstr "Türkçe" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:100 msgid "Ukrainian" -msgstr "" +msgstr "Ukraynaca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:101 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamca" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:102 msgid "Chinese" @@ -2599,65 +2599,65 @@ msgstr "Çince" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:166 msgid "Add a user and password to enable." -msgstr "" +msgstr "Etkinleştirmek için bir kullanıcı adı ve parola yazın." #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:172 msgid "User Name" -msgstr "" +msgstr "Kullanıcı Adı" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:183 #: ../java/src/net/i2p/router/web/HomeHelper.java:235 #: ../java/src/net/i2p/router/web/SummaryHelper.java:972 msgid "Add" -msgstr "" +msgstr "Ekle" #: ../java/src/net/i2p/router/web/ConfigUIHelper.java:186 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configclients_jsp.java:562 msgid "Password" -msgstr "" +msgstr "Parola" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:167 msgid "Update or check already in progress" -msgstr "" +msgstr "Güncelleme ya da denetim sürüyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:190 msgid "Update available, attempting to download now" -msgstr "Güncelleme mevcut, şimdi indirmeye çalışılıyor" +msgstr "Güncelleme yayınlanmış, şimdi indirilmeye çalışılıyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:192 msgid "Update available, click button on left to download" -msgstr "Güncelleme mevcut, indirmek için soldaki düğmeye tıklayın" +msgstr "Güncelleme yayınlanmış, indirmek için soldaki düğmeye tıklayın" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:198 msgid "No update available" -msgstr "Güncelleme mevcut değil" +msgstr "Yayınlanmış bir güncelleme yok" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:216 #, java-format msgid "Updating news URL to {0}" -msgstr "" +msgstr "Haber İnternet adresi {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:223 #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:231 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:54 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:60 msgid "internal" -msgstr "" +msgstr "iç" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:227 #, java-format msgid "Updating proxy host to {0}" -msgstr "" +msgstr "Vekil sunucu {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:235 #, java-format msgid "Updating proxy port to {0}" -msgstr "" +msgstr "Vekil sunucu kapısı {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:251 #, java-format msgid "Updating refresh frequency to {0}" -msgstr "" +msgstr "Yenileme sıklığı {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:252 #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:130 @@ -2668,11 +2668,11 @@ msgstr "Asla" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:259 #, java-format msgid "Updating update policy to {0}" -msgstr "" +msgstr "Güncelleme ilkesi {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:268 msgid "Updating update URLs." -msgstr "Güncelleme URLleri güncelleniyor." +msgstr "Güncelleme İnternet adresleri güncelleniyor." #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:280 msgid "Updating trusted keys." @@ -2681,16 +2681,16 @@ msgstr "Güvenilen anahtarlar güncelleniyor." #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:292 #, java-format msgid "Updating unsigned update URL to {0}" -msgstr "" +msgstr "İmzalanmamış güncelleme adresi {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHandler.java:304 #, java-format msgid "Updating signed development build URL to {0}" -msgstr "" +msgstr "İmzalanmış geliştirme yapımı adresi {0} olarak güncelleniyor" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:132 msgid "Every" -msgstr "Hep" +msgstr "Her" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:150 msgid "Notify only" @@ -2698,122 +2698,122 @@ msgstr "Yalnızca bildir" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:157 msgid "Download and verify only" -msgstr "Yalnızca indir ve onayla" +msgstr "Yalnızca indir ve doğrula" #: ../java/src/net/i2p/router/web/ConfigUpdateHelper.java:165 msgid "Download, verify, and restart" -msgstr "İndir, onayla ve yeniden başlat" +msgstr "İndir, doğrula ve yeniden başlat" #: ../java/src/net/i2p/router/web/EventLogHelper.java:34 msgid "Aborted startup" -msgstr "" +msgstr "Başlangıç durduruldu" #: ../java/src/net/i2p/router/web/EventLogHelper.java:35 msgid "Enabled floodfill" -msgstr "" +msgstr "Floodfill etkinleştirildi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:36 msgid "Changed IP" -msgstr "" +msgstr "IP değiştirildi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:37 msgid "Changed port" -msgstr "" +msgstr "Kapı değiştirildi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:38 msgid "Clock shifted" -msgstr "" +msgstr "Saat kaydırıldı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:39 msgid "Crashed" -msgstr "" +msgstr "Çöktü" #: ../java/src/net/i2p/router/web/EventLogHelper.java:40 msgid "Critical error" -msgstr "" +msgstr "Kritik hata" #: ../java/src/net/i2p/router/web/EventLogHelper.java:41 msgid "Installed new version" -msgstr "" +msgstr "Yeni sürüm yüklendi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:42 msgid "Install failed" -msgstr "" +msgstr "Yüklenemedi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:43 msgid "Network error" -msgstr "" +msgstr "Ağ hatası" #: ../java/src/net/i2p/router/web/EventLogHelper.java:44 #: ../java/src/net/i2p/router/web/EventLogHelper.java:48 msgid "New router identity" -msgstr "" +msgstr "Yeni yöneltici kimliği" #: ../java/src/net/i2p/router/web/EventLogHelper.java:45 msgid "Disabled floodfill" -msgstr "" +msgstr "Floodfill devre dışı bırakıldı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:46 msgid "Out of memory error" -msgstr "" +msgstr "Bellek taşma hatası" #: ../java/src/net/i2p/router/web/EventLogHelper.java:47 msgid "Reachability change" -msgstr "" +msgstr "Erişilebilirlik değişimi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:49 msgid "Reseeded router" -msgstr "" +msgstr "Yöneltici yeniden tohumlandı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:50 msgid "Soft restart" -msgstr "" +msgstr "Yumuşak yeniden başlatma" #: ../java/src/net/i2p/router/web/EventLogHelper.java:51 msgid "Started router" -msgstr "" +msgstr "Yöneltici başlatıldı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:52 msgid "Stopped router" -msgstr "" +msgstr "Yöneltici durduruldu" #: ../java/src/net/i2p/router/web/EventLogHelper.java:53 msgid "Updated router" -msgstr "" +msgstr "Yöneltici güncellendi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:54 msgid "Watchdog warning" -msgstr "" +msgstr "Bekçi köğeği uyarısı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:102 msgid "Display Events" -msgstr "" +msgstr "Görüntülenecek Etkinlikler" #: ../java/src/net/i2p/router/web/EventLogHelper.java:106 msgid "Events since" -msgstr "" +msgstr "Etkinlik başlangıcı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:111 msgid "Event type" -msgstr "" +msgstr "Etkinlik tipi" #: ../java/src/net/i2p/router/web/EventLogHelper.java:117 #: ../java/src/net/i2p/router/web/EventLogHelper.java:148 msgid "All events" -msgstr "" +msgstr "Tüm etkinlikler" #: ../java/src/net/i2p/router/web/EventLogHelper.java:122 msgid "Filter events" -msgstr "" +msgstr "Etkinlikleri süzün" #: ../java/src/net/i2p/router/web/EventLogHelper.java:170 msgid "No events found" -msgstr "" +msgstr "Bir etkinlik bulunamadı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:171 #, java-format msgid "No events found in previous {0}" -msgstr "" +msgstr "Önceki {0} içinde bir etkinlik bulunamadı" #: ../java/src/net/i2p/router/web/EventLogHelper.java:174 #, java-format @@ -2828,15 +2828,15 @@ msgstr "" #: ../java/src/net/i2p/router/web/EventLogHelper.java:179 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 msgid "Time" -msgstr "" +msgstr "Zaman" #: ../java/src/net/i2p/router/web/EventLogHelper.java:182 msgid "Event" -msgstr "" +msgstr "Etkinlik" #: ../java/src/net/i2p/router/web/EventLogHelper.java:184 msgid "Details" -msgstr "" +msgstr "Ayrıntılar" #: ../java/src/net/i2p/router/web/FormHandler.java:251 msgid "" @@ -2848,11 +2848,11 @@ msgstr "Geçersiz form gönderisi, olasılıkla tarayıcınızın \"geri\" veya msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." -msgstr "" +msgstr "Sorun sürerse, tarayıcınızda çerezlerin etkinleştirilmiş olduğuna emin olun." #: ../java/src/net/i2p/router/web/GraphHelper.java:162 msgid "Combined bandwidth graph" -msgstr "Bileşik kuşak genişliği grafiği" +msgstr "Bileşik bant genişliği grafiği" #. e.g. "statname for 60m" #: ../java/src/net/i2p/router/web/GraphHelper.java:174 @@ -2873,61 +2873,61 @@ msgstr "" #: ../java/src/net/i2p/router/web/GraphHelper.java:253 msgid "Larger" -msgstr "" +msgstr "Daha Büyük" #: ../java/src/net/i2p/router/web/GraphHelper.java:259 msgid "Smaller" -msgstr "" +msgstr "Daha Küçük" #: ../java/src/net/i2p/router/web/GraphHelper.java:265 msgid "Taller" -msgstr "" +msgstr "Daha Uzun" #: ../java/src/net/i2p/router/web/GraphHelper.java:271 msgid "Shorter" -msgstr "" +msgstr "Daha Kısa" #: ../java/src/net/i2p/router/web/GraphHelper.java:277 msgid "Wider" -msgstr "" +msgstr "Daha Geniş" #: ../java/src/net/i2p/router/web/GraphHelper.java:283 msgid "Narrower" -msgstr "" +msgstr "Daha Dar" #: ../java/src/net/i2p/router/web/GraphHelper.java:290 msgid "Larger interval" -msgstr "" +msgstr "Daha büyük sıklık" #: ../java/src/net/i2p/router/web/GraphHelper.java:296 msgid "Smaller interval" -msgstr "" +msgstr "Daha küçük sıklık" #: ../java/src/net/i2p/router/web/GraphHelper.java:303 msgid "Previous interval" -msgstr "" +msgstr "Önceki sıklık" #: ../java/src/net/i2p/router/web/GraphHelper.java:314 msgid "Next interval" -msgstr "" +msgstr "Sonraki sıklık" #: ../java/src/net/i2p/router/web/GraphHelper.java:321 #: ../java/src/net/i2p/router/web/GraphHelper.java:361 msgid "Plot averages" -msgstr "Grafik ortalamaları" +msgstr "Ortalamalar çizilsin" #: ../java/src/net/i2p/router/web/GraphHelper.java:321 #: ../java/src/net/i2p/router/web/GraphHelper.java:362 msgid "plot events" -msgstr "çizelge olayları" +msgstr "olaylar çizilsin" #: ../java/src/net/i2p/router/web/GraphHelper.java:324 msgid "All times are UTC." -msgstr "" +msgstr "Tüm zamanlar UTC saat dilimindedir." #: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Configure Graph Display" -msgstr "Grafik Gösterimini Ayarlayın" +msgstr "Çizelge Görünümü Ayarları" #: ../java/src/net/i2p/router/web/GraphHelper.java:356 msgid "Select Stats" @@ -2935,7 +2935,7 @@ msgstr "İstatistikleri Seçin" #: ../java/src/net/i2p/router/web/GraphHelper.java:360 msgid "Periods" -msgstr "Dönemler" +msgstr "Aralıklar" #: ../java/src/net/i2p/router/web/GraphHelper.java:362 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:517 @@ -2944,7 +2944,7 @@ msgstr "ya da" #: ../java/src/net/i2p/router/web/GraphHelper.java:363 msgid "Image sizes" -msgstr "resim boyları" +msgstr "Görsel boyutları" #: ../java/src/net/i2p/router/web/GraphHelper.java:363 msgid "width" @@ -2965,15 +2965,15 @@ msgstr "Yenileme gecikmesi" #: ../java/src/net/i2p/router/web/GraphHelper.java:381 msgid "Store graph data on disk?" -msgstr "" +msgstr "Çizelge verisi diskte saklansın" #: ../java/src/net/i2p/router/web/GraphHelper.java:387 msgid "Save settings and redraw graphs" -msgstr "" +msgstr "Ayarlar kaydedilip çizelgeleri yeniden oluşturulsun" #: ../java/src/net/i2p/router/web/GraphHelper.java:443 msgid "Graph settings saved" -msgstr "Grafik ayarları kaydedildi" +msgstr "Çizelge ayarları kaydedildi" #: ../java/src/net/i2p/router/web/HomeHelper.java:29 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:229 @@ -2987,39 +2987,39 @@ msgstr "I2P hosts dosyasını buradan yönetin (I2P etki alanı çözümlemesi)" #: ../java/src/net/i2p/router/web/HomeHelper.java:30 msgid "Configure Bandwidth" -msgstr "" +msgstr "Bant Genişliği Ayarları" #: ../java/src/net/i2p/router/web/HomeHelper.java:30 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:330 msgid "I2P Bandwidth Configuration" -msgstr "" +msgstr "I2P Bant Genişliği Ayarları" #: ../java/src/net/i2p/router/web/HomeHelper.java:31 msgid "Configure Language" -msgstr "" +msgstr "Dil Ayarları" #: ../java/src/net/i2p/router/web/HomeHelper.java:31 msgid "Console Language Selection" -msgstr "" +msgstr "Konsol Dili Seçimi" #: ../java/src/net/i2p/router/web/HomeHelper.java:32 msgid "Customize Home Page" -msgstr "" +msgstr "Ana Sayfayı Özelleştirin" #: ../java/src/net/i2p/router/web/HomeHelper.java:32 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confighome_jsp.java:346 msgid "I2P Home Page Configuration" -msgstr "" +msgstr "I2P Ana Sayfa Ayarları" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:139 msgid "Anonymous webmail client" -msgstr "Anonim webposta istemcisi" +msgstr "Anonim web posta istemcisi" #: ../java/src/net/i2p/router/web/HomeHelper.java:33 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:141 msgid "Email" -msgstr "" +msgstr "E-posta" #: ../java/src/net/i2p/router/web/HomeHelper.java:34 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:251 @@ -3029,7 +3029,7 @@ msgstr "I2P Yöneltici Yardımı" #: ../java/src/net/i2p/router/web/HomeHelper.java:35 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/error500_jsp.java:161 msgid "Router Console" -msgstr "" +msgstr "Yöneltici Konsolu" #: ../java/src/net/i2p/router/web/HomeHelper.java:36 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:145 @@ -3044,7 +3044,7 @@ msgstr "Torrentler" #: ../java/src/net/i2p/router/web/HomeHelper.java:37 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:155 msgid "Local web server" -msgstr "" +msgstr "Yerel web sunucusu" #: ../java/src/net/i2p/router/web/HomeHelper.java:41 msgid "The Anoncoin project" @@ -3052,26 +3052,26 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:42 msgid "Bug Reports" -msgstr "" +msgstr "Hata Bildirimleri" #: ../java/src/net/i2p/router/web/HomeHelper.java:42 msgid "Bug tracker" -msgstr "" +msgstr "Hata izleyici" #. "colombo-bt.i2p" + S + _x("The Italian Bittorrent Resource") + S + "http #. ://colombo-bt.i2p/" + S + I + "colomboicon.png" + S + #: ../java/src/net/i2p/router/web/HomeHelper.java:44 msgid "Dev Forum" -msgstr "" +msgstr "Geliştirici Forumu" #: ../java/src/net/i2p/router/web/HomeHelper.java:44 msgid "Development forum" -msgstr "" +msgstr "Geliştirici Forumu" #: ../java/src/net/i2p/router/web/HomeHelper.java:45 #: ../java/src/net/i2p/router/web/HomeHelper.java:60 msgid "Bittorrent tracker" -msgstr "" +msgstr "Bittorrent izleyici" #: ../java/src/net/i2p/router/web/HomeHelper.java:45 msgid "diftracker" @@ -3079,23 +3079,23 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:46 msgid "I2P Applications" -msgstr "" +msgstr "I2P Uygulamaları" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "FAQ" -msgstr "" +msgstr "SSS" #: ../java/src/net/i2p/router/web/HomeHelper.java:47 msgid "Frequently Asked Questions" -msgstr "" +msgstr "Sık Sorulan Sorular" #: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "Community forum" -msgstr "" +msgstr "Topluluk forumu" #: ../java/src/net/i2p/router/web/HomeHelper.java:48 msgid "Forum" -msgstr "" +msgstr "Forum" #: ../java/src/net/i2p/router/web/HomeHelper.java:49 msgid "" @@ -3170,33 +3170,33 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:61 msgid "I2P home page" -msgstr "" +msgstr "I2P ana sayfası" #: ../java/src/net/i2p/router/web/HomeHelper.java:61 msgid "Project Website" -msgstr "" +msgstr "Proje Web Sitesi" #. "Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + #. "salt_console.png" + S + #: ../java/src/net/i2p/router/web/HomeHelper.java:63 msgid "I2P Network Statistics" -msgstr "" +msgstr "I2P Ağ İstatistikleri" #: ../java/src/net/i2p/router/web/HomeHelper.java:64 msgid "Technical Docs" -msgstr "" +msgstr "Teknik Belgeler" #: ../java/src/net/i2p/router/web/HomeHelper.java:65 msgid "Trac Wiki" -msgstr "" +msgstr "Trac Wiki" #: ../java/src/net/i2p/router/web/HomeHelper.java:66 msgid "Ugha's Wiki" -msgstr "" +msgstr "Ugha's Wiki" #: ../java/src/net/i2p/router/web/HomeHelper.java:67 msgid "Seedless and the Robert BitTorrent applications" -msgstr "" +msgstr "Seedless ve Robert BitTorrent uygulamaları" #: ../java/src/net/i2p/router/web/HomeHelper.java:67 msgid "Sponge's main site" @@ -3204,7 +3204,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:108 msgid "The HTTP proxy is not up" -msgstr "" +msgstr "HTTP vekil sunucusu çalışmıyor" #: ../java/src/net/i2p/router/web/HomeHelper.java:110 #, java-format @@ -3214,11 +3214,11 @@ msgstr "" #: ../java/src/net/i2p/router/web/HomeHelper.java:210 #: ../java/src/net/i2p/router/web/SummaryHelper.java:906 msgid "Name" -msgstr "" +msgstr "Ad" #: ../java/src/net/i2p/router/web/HomeHelper.java:212 msgid "URL" -msgstr "" +msgstr "İnternet Adresi" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:50 msgid "I2P Job Queue" @@ -3262,12 +3262,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:113 msgid "Total Job Statistics" -msgstr "" +msgstr "Toplam Görev İstatistikleri" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:141 msgid "Job" -msgstr "" +msgstr "Görev" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:124 msgid "Queued" @@ -3284,26 +3284,26 @@ msgstr "" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:143 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Avg" -msgstr "" +msgstr "Ortalama" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Max" -msgstr "" +msgstr "En Büyük" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:144 #: ../java/src/net/i2p/router/web/JobQueueHelper.java:146 msgid "Min" -msgstr "" +msgstr "En Küçük" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:145 msgid "Pending" -msgstr "" +msgstr "Bekleyen" #: ../java/src/net/i2p/router/web/JobQueueHelper.java:197 #: ../java/src/net/i2p/router/web/NetDbHelper.java:16 msgid "Summary" -msgstr "" +msgstr "Özet" #: ../java/src/net/i2p/router/web/LogsHelper.java:49 #: ../java/src/net/i2p/router/web/LogsHelper.java:103 @@ -3316,38 +3316,38 @@ msgstr "Dosya bulunamadı" #: ../java/src/net/i2p/router/web/LogsHelper.java:118 msgid "No log messages" -msgstr "Kütük iletisi yok" +msgstr "Henüz bir günlük iletisi yok" #. 0 #: ../java/src/net/i2p/router/web/NetDbHelper.java:17 msgid "Local Router" -msgstr "" +msgstr "Yerel Yöneltici" #. 1 #: ../java/src/net/i2p/router/web/NetDbHelper.java:18 msgid "Router Lookup" -msgstr "" +msgstr "Yöneltici Tarama" #. 2 #: ../java/src/net/i2p/router/web/NetDbHelper.java:19 msgid "All Routers" -msgstr "" +msgstr "Tüm Yönelticiler" #. 3 #: ../java/src/net/i2p/router/web/NetDbHelper.java:20 msgid "All Routers with Full Stats" -msgstr "" +msgstr "Tam İstatistkler ile Tüm Yönelticiler" #. 4 #. 5 #: ../java/src/net/i2p/router/web/NetDbHelper.java:22 msgid "LeaseSets" -msgstr "" +msgstr "Kiralama Kümeleri" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:105 #: ../java/strings/Strings.java:69 msgid "Router" -msgstr "Yönlendirici" +msgstr "Yöneltici" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:112 msgid "not found in network database" @@ -3355,7 +3355,7 @@ msgstr "ağ veritabanında bulunamadı" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:156 msgid "LeaseSet" -msgstr "" +msgstr "Kiralama Kümesi" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:158 msgid "Local" @@ -3373,7 +3373,7 @@ msgstr "Hedef" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:173 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:185 msgid "Add to local addressbook" -msgstr "" +msgstr "Yerel adres defterine ekleyin" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:190 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:217 @@ -3394,7 +3394,7 @@ msgstr "Geçit" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:211 msgid "Lease" -msgstr "" +msgstr "Kiralama" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:213 msgid "Tunnel" @@ -3402,21 +3402,21 @@ msgstr "Tünel" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:280 msgid "Not initialized" -msgstr "Başlatılmadı" +msgstr "Başlatılmamış" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:330 msgid "Network Database Router Statistics" -msgstr "Ağ Veritabanı Yönlendirici İstatistikleri" +msgstr "Ağ Veritabanı Yöneltici İstatistikleri" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:337 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 #: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Count" -msgstr "Sayım" +msgstr "Sayı" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:352 msgid "Transports" -msgstr "Taşımalar" +msgstr "Aktarımlar" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:370 msgid "Country" @@ -3424,7 +3424,7 @@ msgstr "Ülke" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:429 msgid "Our info" -msgstr "Bilgimiz" +msgstr "Bilgilerimiz" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:431 msgid "Peer info for" @@ -3432,7 +3432,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:433 msgid "Full entry" -msgstr "Tam girdi" +msgstr "Tam kayıt" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:440 #: ../java/src/net/i2p/router/web/SummaryHelper.java:152 @@ -3458,7 +3458,7 @@ msgstr "Yayınlanmış" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:449 msgid "Signing Key" -msgstr "" +msgstr "İmzalama Anahtarı" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:451 msgid "Address(es)" @@ -3466,11 +3466,11 @@ msgstr "Adres(ler)" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:463 msgid "cost" -msgstr "tutar" +msgstr "maliyet" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "Hidden or starting up" -msgstr "Gizli veya yeniden başlıyor" +msgstr "Gizli ya da başlatılıyor" #: ../java/src/net/i2p/router/web/NetDbRenderer.java:489 msgid "SSU" @@ -3532,30 +3532,30 @@ msgstr "Haberler en son {0} önce denetlendi." #: ../java/src/net/i2p/router/web/NewsHelper.java:310 msgid "Hide news" -msgstr "" +msgstr "Haberleri gizle" #: ../java/src/net/i2p/router/web/NewsHelper.java:313 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:647 msgid "Show news" -msgstr "" +msgstr "Haberleri görüntüle" #: ../java/src/net/i2p/router/web/PluginStarter.java:140 msgid "Checking for plugin updates" -msgstr "" +msgstr "Uygulama ekleri için güncellemeler denetleniyor" #: ../java/src/net/i2p/router/web/PluginStarter.java:155 msgid "Plugin update check failed" -msgstr "" +msgstr "Uygulama eki güncellemeleri denetlenemedi" #: ../java/src/net/i2p/router/web/PluginStarter.java:193 #, java-format msgid "1 plugin updated" msgid_plural "{0} plugins updated" -msgstr[0] "" +msgstr[0] "{0} uygulama eki güncellendi" #: ../java/src/net/i2p/router/web/PluginStarter.java:195 msgid "Plugin update check complete" -msgstr "" +msgstr "Uygulama eki güncelleme denetimi tamamlandı" #. buf.append("

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

\n

"); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 @@ -3622,7 +3622,7 @@ msgstr "Tümleştirilmiş" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:168 msgid "Unreachable" -msgstr "Erişlemiyor" +msgstr "Erişilemeyen" #. hide if < 10% #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:176 @@ -3643,7 +3643,7 @@ msgstr "Tümleştirme Değeri" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:203 msgid "Last Heard About" -msgstr "Son Duyulan" +msgstr "Son Duyulma" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:204 msgid "Last Heard From" @@ -3764,24 +3764,24 @@ msgstr "durum" #. 0 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:12 msgid "Floodfill " -msgstr "" +msgstr "Floodfill " #. 2 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:14 msgid "All" -msgstr "" +msgstr "Tümü" #: ../java/src/net/i2p/router/web/SearchHelper.java:74 msgid "Select search engine" -msgstr "" +msgstr "Arama motorunu seçin" #: ../java/src/net/i2p/router/web/StatsGenerator.java:57 msgid "GO" -msgstr "Gidin" +msgstr "Git" #: ../java/src/net/i2p/router/web/StatsGenerator.java:60 msgid "Statistics gathered during this router's uptime" -msgstr "Bu yönelticinin çalıştığı sürece toplanan istatistikler" +msgstr "Bu yönelticinin çalıştığı sürede toplanan istatistikler" #: ../java/src/net/i2p/router/web/StatsGenerator.java:63 msgid "" @@ -3833,11 +3833,11 @@ msgstr "Ömür boyu ortalama sıklığı" #, java-format msgid "1 event" msgid_plural "{0} events" -msgstr[0] "" +msgstr[0] "{0} etkinlik" #: ../java/src/net/i2p/router/web/StatsGenerator.java:168 msgid "rate" -msgstr "oran" +msgstr "hız" #: ../java/src/net/i2p/router/web/StatsGenerator.java:170 msgid "Average" @@ -3860,7 +3860,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/StatsGenerator.java:204 msgid "No events" -msgstr "Etkinlik yok" +msgstr "Henüz bir etkinlik yok" #: ../java/src/net/i2p/router/web/StatsGenerator.java:209 msgid "Average event count" @@ -3868,15 +3868,15 @@ msgstr "Ortalama etkinlik sayısı" #: ../java/src/net/i2p/router/web/StatsGenerator.java:211 msgid "Events in peak period" -msgstr "En yoğun aralıktaki etkinlikler" +msgstr "En yoğun dönemdeki etkinlikler" #: ../java/src/net/i2p/router/web/StatsGenerator.java:219 msgid "Graph Data" -msgstr "Grafik Verisi" +msgstr "Çizelge Verisi" #: ../java/src/net/i2p/router/web/StatsGenerator.java:222 msgid "Graph Event Count" -msgstr "Grafik Etkinliği Sayısı" +msgstr "Çizelgedeki Etkinlik Sayısı" #. Display the strict average #: ../java/src/net/i2p/router/web/StatsGenerator.java:231 @@ -3912,16 +3912,16 @@ msgstr "I2P Bilgileri" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:177 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:484 msgid "View existing tunnels and tunnel build status" -msgstr "Varolan tünel ve tünel yapım durumlarına bakın" +msgstr "Varolan tünel ve tünel yapım durumlarını görüntüle" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:183 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:370 msgid "Show all current peer connections" -msgstr "Tüm geçerli eş bağlantılarına bakın" +msgstr "Tüm geçerli eş bağlantılarını görüntüle" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:189 msgid "Show recent peer performance profiles" -msgstr "Geçenlerdeki eş başarım profillerine bakın" +msgstr "Yaınlardaki eş başarım profillerini görüntüle" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:191 msgid "Profiles" @@ -3929,7 +3929,7 @@ msgstr "Profiller" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:195 msgid "Show list of all known I2P routers" -msgstr "Tüm bilinen I2P yönelticilerinin listesi görüntülensin" +msgstr "Tüm bilinen I2P yönelticilerinin listesini görüntüle" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:197 msgid "NetDB" @@ -3945,7 +3945,7 @@ msgstr "Günlükler" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:214 msgid "Graph router performance" -msgstr "Yöneltici başarım çizelgesi" +msgstr "Yöneltici başarımı çizelgesi" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:216 msgid "Graphs" @@ -3958,7 +3958,7 @@ msgstr "Metin bazlı yöneltici başarım istatistikleri" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:233 #: ../java/src/net/i2p/router/web/SummaryHelper.java:438 msgid "Local Tunnels" -msgstr "" +msgstr "Yerel Tüneller" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:235 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/i2ptunnelmgr_jsp.java:164 @@ -3990,11 +3990,11 @@ msgstr "Eşsiz I2P yöneltici kimliğiniz" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:269 msgid "never reveal it to anyone" -msgstr "asla kimseye söyelemeyin" +msgstr "asla kimseye söylemeyin" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:271 msgid "show" -msgstr "bakın" +msgstr "görüntüle" #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:275 #: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:301 @@ -4164,7 +4164,7 @@ msgstr "HATA-İstemci yöneticisi I2CP hatası - günlüklere bakın" #: ../java/src/net/i2p/router/web/SummaryHelper.java:150 #, java-format msgid "ERR-Clock Skew of {0}" -msgstr "HATA-Saat sapması {0}" +msgstr "HATA-Saat Sapması {0}" #: ../java/src/net/i2p/router/web/SummaryHelper.java:170 msgid "ERR-Unresolved TCP Address" @@ -4180,7 +4180,7 @@ msgstr "HATA-SimetrikNAT" #: ../java/src/net/i2p/router/web/SummaryHelper.java:183 msgid "WARN-Firewalled with Inbound TCP Enabled" -msgstr "UYARI-Güvenlik duvarı engellemesi gelen TCP etkinleştirilmiş " +msgstr "UYARI-Gelen TCP güvenlik duvarı engellemesi etkinleştirilmiş " #: ../java/src/net/i2p/router/web/SummaryHelper.java:188 msgid "WARN-Firewalled and Floodfill" @@ -4206,7 +4206,7 @@ msgstr "HATA-UDP devre dışı ve Gelen TCP sunucu/kapı ayarlanmamış" #: ../java/src/net/i2p/router/web/SummaryHelper.java:211 msgid "WARN-Firewalled with UDP Disabled" -msgstr "UYARI-Güvenlik duvarı engellemesi UDP devre dışı" +msgstr "UYARI-UDP ile güvenlik duvarı engellemesi devre dışı" #: ../java/src/net/i2p/router/web/SummaryHelper.java:437 msgid "Add/remove/edit & control your client and server tunnels" @@ -4263,7 +4263,7 @@ msgstr "Yüklemek için yeniden başlatın" #: ../java/src/net/i2p/router/web/SummaryHelper.java:719 msgid "Click Shutdown and restart to install" -msgstr "Kapatın düğmesine tıklayıp yüklemek için yeniden başlatın" +msgstr "Yüklemek için kapatıp yeniden başlatın" #: ../java/src/net/i2p/router/web/SummaryHelper.java:720 #: ../java/src/net/i2p/router/web/SummaryHelper.java:735 @@ -4309,7 +4309,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:819 msgid "Reseed" -msgstr "Tekrar düğümleme" +msgstr "Yeniden tohumlama" #: ../java/src/net/i2p/router/web/SummaryHelper.java:908 msgid "Order" @@ -4350,12 +4350,12 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:142 #, java-format msgid "events in {0}" -msgstr "{0} etkinlikleri" +msgstr "{0} içindeki etkinlikler" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:144 #, java-format msgid "averaged for {0}" -msgstr "{0} ortalamaları" +msgstr "{0} içindeki ortalamalar" #: ../java/src/net/i2p/router/web/SummaryRenderer.java:154 msgid "Events per period" @@ -4380,7 +4380,7 @@ msgstr "şimdi" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:62 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/logs_jsp.java:415 msgid "configure" -msgstr "ayarlayın" +msgstr "ayarla" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:60 msgid "Client tunnels for" @@ -4396,7 +4396,7 @@ msgstr "Katılınan tüneller" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:71 msgid "Receive on" -msgstr "Alındığı zaman" +msgstr "Alınma zamanı" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:72 msgid "Expiration" @@ -4408,7 +4408,7 @@ msgstr "Gönderilme zamanı" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Rate" -msgstr "Oran" +msgstr "Hız" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:73 msgid "Role" @@ -4421,7 +4421,7 @@ msgstr "Kullanım" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:111 msgid "grace period" -msgstr "çalıştığı aralık" +msgstr "deneme süresi" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:121 msgid "Outbound Endpoint" @@ -4469,11 +4469,11 @@ msgstr "Yapılıyor" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:211 msgid "inbound" -msgstr "gelen" +msgstr "geliş" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:218 msgid "outbound" -msgstr "giden" +msgstr "gidiş" #: ../java/src/net/i2p/router/web/TunnelRenderer.java:223 msgid "No tunnels; waiting for the grace period to end." @@ -4511,14 +4511,14 @@ msgstr "susidns" #: ../java/strings/Strings.java:17 msgid "routerconsole" -msgstr "yöneltici paneli" +msgstr "yonelticipanosu" #. clients, taken from clients.config, for ConfigClientsHelper #. note that if the wording changes in clients.config, we have to #. keep the old string here as well for existing installs #: ../java/strings/Strings.java:22 msgid "Web console" -msgstr "Web paneli" +msgstr "Web panosu" #: ../java/strings/Strings.java:23 msgid "SAM application bridge" @@ -4546,7 +4546,7 @@ msgstr "BOB uygulama köprüsü" #: ../java/strings/Strings.java:30 msgid "Open Router Console in web browser at startup" -msgstr "Yöneltici paneli başlangıçta web tarayıcı içinde açılsın" +msgstr "Yöneltici panosu başlangıçta web tarayıcı içinde açılsın" #: ../java/strings/Strings.java:37 msgid "shared clients (DSA)" @@ -4630,7 +4630,7 @@ msgstr "InNet Havuzu" #: ../java/strings/Strings.java:65 msgid "JobQueue" -msgstr "İş Kuyruğu" +msgstr "Görev Kuyruğu" #: ../java/strings/Strings.java:66 msgid "NetworkDatabase" @@ -4813,7 +4813,7 @@ msgstr "Yenileme (s)" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/viewprofile_jsp.java:309 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/webmail_jsp.java:327 msgid "Enable" -msgstr "Etkinleştirin" +msgstr "Etkinleştir" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/config_jsp.java:437 msgid "Bandwidth limiter" @@ -5668,13 +5668,13 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760 msgid "ERR - Clock Skew" -msgstr "" +msgstr "HATA-Saat Sapması" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762 msgid "" "Your system's clock is skewed, which will make it difficult to participate " "in the network." -msgstr "" +msgstr "Sistem saatiniz sapmış olduğundan ağa katılmanız zorlaşıyor." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764 msgid "Correct your clock setting if this error persists." @@ -5824,7 +5824,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:359 msgid "I2P Reseeding Configuration" -msgstr "" +msgstr "I2P Yeniden Tohumlama Ayarları" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:475 msgid "" @@ -5849,7 +5849,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:483 msgid "Manual Reseed from URL" -msgstr "" +msgstr "İnternet Adresinden El İle Yeniden Tohumlama" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:485 msgid "Enter zip or su3 URL" @@ -5871,7 +5871,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:495 msgid "Manual Reseed from File" -msgstr "" +msgstr "Dosyadan El İle Yeniden Tohumlama" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:497 msgid "Select zip or su3 file" @@ -5879,7 +5879,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:505 msgid "Create Reseed File" -msgstr "" +msgstr "Yeniden Tohumla Dosyası Oluşturun" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:507 msgid "" @@ -5892,11 +5892,11 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:511 msgid "Create reseed file" -msgstr "" +msgstr "Yeniden tohumlama dosyası oluştur" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:515 msgid "Reseeding Configuration" -msgstr "" +msgstr "Yeniden Tohumlama Ayarları" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:519 msgid "" @@ -5906,7 +5906,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:521 msgid "Reseed URL Selection" -msgstr "" +msgstr "Yeniden Tohumlama Adresi Seçimi" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:525 msgid "Try SSL first then non-SSL" @@ -5922,7 +5922,7 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:535 msgid "Reseed URLs" -msgstr "" +msgstr "Yeniden Tohumlama İnternet Adresleri" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configreseed_jsp.java:539 msgid "Enable HTTP Proxy?" diff --git a/apps/routerconsole/locale/messages_uk.po b/apps/routerconsole/locale/messages_uk.po index 226aa0a94..1232b560b 100644 --- a/apps/routerconsole/locale/messages_uk.po +++ b/apps/routerconsole/locale/messages_uk.po @@ -6,15 +6,16 @@ # Translators: # naeto , 2012 # Anton Zub , 2014 -# Denis Blank , 2011 -# Denis Blank , 2011 -# Denis Blank , 2011 +# Denis Lysenko , 2011,2015 +# Denis Lysenko , 2011 +# Denis Lysenko , 2011 # jonny_nut, 2014 # jonny_nut, 2014 # LinuxChata, 2014 # LinuxChata, 2014 # madjong , 2015 # madjong , 2015 +# Maxym Mykhalchuk, 2015 # naeto , 2012 # puxud , 2014 # puxud , 2014 @@ -24,9 +25,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-17 01:05+0000\n" -"PO-Revision-Date: 2015-07-17 01:31+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 16:30+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -102,9 +103,9 @@ msgstr[2] "{0} днів" #, java-format msgid "1 year" msgid_plural "{0} years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "{0} рік" +msgstr[1] "{0} роки" +msgstr[2] "{0} років" #: ../../../core/java/src/net/i2p/data/DataHelper.java:1549 #: ../../../core/java/src/net/i2p/data/DataHelper.java:1596 @@ -526,7 +527,7 @@ msgstr "Підключений" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1358 #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2491 msgid "Skew" -msgstr "Нахил" +msgstr "Відхилення" #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:738 msgid "The difference between the peer's clock and your own" @@ -729,7 +730,7 @@ msgstr "{0} порт {1,number,#####} не пропущено через UPnP." #: ../../../router/java/src/net/i2p/router/transport/ntcp/EstablishState.java:877 #, java-format msgid "Excessive clock skew: {0}" -msgstr "" +msgstr "Надмірне відхилення годинника: {0}" #: ../../../router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java:1344 msgid "NTCP connections" @@ -789,67 +790,67 @@ msgstr "Сортування по хешу вузла" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2477 msgid "Direction/Introduction" -msgstr "" +msgstr "Напрямок/Введення" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2480 msgid "Sort by idle inbound" -msgstr "Порядком за вхідню бездіяльність" +msgstr "Сортувати за простоєм на вході" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2482 msgid "Sort by idle outbound" -msgstr "Порядком за вихідню бездіяльність" +msgstr "Сортувати за простоєм на виході" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2485 msgid "Sort by inbound rate" -msgstr "Порядком за вхідну ставку" +msgstr "Сортувати за швидкістю на вході" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2487 msgid "Sort by outbound rate" -msgstr "Порядком за вихідну ставку" +msgstr "Сортувати за швидкістю на виході" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2490 msgid "Sort by connection uptime" -msgstr "Порядком за тривалість зв'язку" +msgstr "Сортувати за тривалістю роботи" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2492 msgid "Sort by clock skew" -msgstr "Порядком за нахилом такту" +msgstr "Сортувати за відхиленням годинника" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2495 msgid "Sort by congestion window" -msgstr "" +msgstr "Сортувати за вікном затору" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2497 msgid "Sort by slow start threshold" -msgstr "" +msgstr "Сортувати за порогом повільного старту" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2500 msgid "Sort by round trip time" -msgstr "" +msgstr "Сортувати за часом проходження сигналу туди і назад" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2504 msgid "Sort by retransmission timeout" -msgstr "" +msgstr "Сортувати за таймаутом ретрансляції" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2507 msgid "Sort by outbound maximum transmit unit" -msgstr "" +msgstr "Сортувати за максимальною одиницею передачі на виході" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2509 msgid "Sort by packets sent" -msgstr "" +msgstr "Сортувати за кількістю переданих пакетів" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2511 msgid "Sort by packets received" -msgstr "" +msgstr "Сортувати за кількістю отриманих пакетів" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2514 msgid "Sort by packets retransmitted" -msgstr "" +msgstr "Сортувати за кількістю ретрансльованих пакетів" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2516 msgid "Sort by packets received more than once" -msgstr "" +msgstr "Сортувати за кількістю отриманих пакетів отриманих декілька разів" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2536 msgid "We offered to introduce them" @@ -861,7 +862,7 @@ msgstr "Вони пропонують представити нас" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2542 msgid "Choked" -msgstr "" +msgstr "Давка" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2550 msgid "1 fail" @@ -877,7 +878,7 @@ msgstr "{0} збоїв" #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:166 #: ../java/src/net/i2p/router/web/ProfilesHelper.java:13 msgid "Banned" -msgstr "Забороненo" +msgstr "Забанений" #: ../../../router/java/src/net/i2p/router/transport/udp/UDPTransport.java:2617 msgid "backlogged" @@ -885,11 +886,11 @@ msgstr "перевантажений" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:250 msgid "Dropping tunnel requests: Too slow" -msgstr "Відхиляю запити на тунелі: надто повільно працює" +msgstr "Відхиляю запити на тунелі: занадто повільна обробка запитів" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:260 msgid "Dropping tunnel requests: High job lag" -msgstr "" +msgstr "Відхиляю запити на тунелі: велике відставання обробки запитів" #. don't even bother, since we are so overloaded locally #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:451 @@ -898,15 +899,15 @@ msgstr "Відхиляю запити на тунелі: перевантаже #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:693 msgid "Rejecting tunnels: Hidden mode" -msgstr "Видхилення тунелів: прихований режим" +msgstr "Не приймаємо тунелі: прихований режим" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:721 msgid "Rejecting tunnels: Request overload" -msgstr "Видхилення тунелів: забагато запитів" +msgstr "Не приймаємо тунелі: забагато запитів" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:752 msgid "Rejecting tunnels: Connection limit" -msgstr "Відхиляю тунелі: обмеження кількості з’єднань" +msgstr "Не приймаємо тунелі: досягнутий ліміт кількості з'єднань" #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:964 #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:997 @@ -915,7 +916,7 @@ msgstr "Відхиляю запити на тунелі: високе наван #: ../../../router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java:1076 msgid "Dropping tunnel requests: Queue time" -msgstr "" +msgstr "Відхиляю запити на тунелі: завеликий час у черзі" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:884 #, java-format @@ -974,7 +975,7 @@ msgstr "з {0}" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1396 #, java-format msgid "Unsigned update file from {0} is corrupt" -msgstr "" +msgstr "Непідписане оновлення з {0} пошкоджено" #: ../java/src/net/i2p/router/update/ConsoleUpdateManager.java:1425 #, java-format @@ -1207,7 +1208,7 @@ msgstr "Нової версії на {0} не знайдено" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:65 msgid "Permanently banned" -msgstr "" +msgstr "Забанений назавжди" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:67 #, java-format @@ -1217,7 +1218,7 @@ msgstr "Тимчасовий бан завершується через {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:69 #, java-format msgid "Banned until restart or in {0}" -msgstr "" +msgstr "Забанений до перезапуску або до {0}" #: ../java/src/net/i2p/router/web/BanlistRenderer.java:82 msgid "unban now" @@ -1401,7 +1402,7 @@ msgstr "Зупинено плагін {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:180 #, java-format msgid "Stopped webapp {0}" -msgstr "" +msgstr "Зупинено веб-додаток {0}" #. label (IE) #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:209 @@ -1449,11 +1450,11 @@ msgstr "Конфігурацію плагіна збережено" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 #: ../java/src/net/i2p/router/web/ConfigClientsHelper.java:202 msgid "WebApp" -msgstr "WebApp" +msgstr "Web-додаток" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:387 msgid "started" -msgstr "почато" +msgstr "запущено" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:389 msgid "Failed to start" @@ -1461,7 +1462,7 @@ msgstr "Помилка запуску" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:394 msgid "Failed to find server." -msgstr "Провал пошуку за сервер" +msgstr "Не вдалося знайти сервер." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:400 msgid "No plugin URL specified." @@ -1484,7 +1485,7 @@ msgstr "Не вказано URL оновлення для {0}" #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:488 #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:512 msgid "Plugin or update download already in progress." -msgstr "" +msgstr "Плагін або оновлення вже завантажується." #: ../java/src/net/i2p/router/web/ConfigClientsHandler.java:493 msgid "Updating all plugins" @@ -2047,7 +2048,7 @@ msgstr "Забанити пір до наступного запуску" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:23 #, java-format msgid "Manually banned via {0}" -msgstr "" +msgstr "Заблоковані вручну задопомогою {0}" #: ../java/src/net/i2p/router/web/ConfigPeerHandler.java:24 msgid "banned until restart" @@ -2210,12 +2211,12 @@ msgstr "М’яка зупинка" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:203 msgid "Graceful shutdown initiated" -msgstr "" +msgstr "Запущена м'яка зупинка" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:209 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:477 msgid "Cancel graceful shutdown" -msgstr "" +msgstr "М'яка зупинка відмінена" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:211 msgid "Graceful shutdown cancelled" @@ -2228,12 +2229,12 @@ msgstr "М’який перезапуск" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:217 msgid "Graceful restart requested" -msgstr "" +msgstr "Запитаний м'який перезапуск " #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:218 #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configservice_jsp.java:493 msgid "Hard restart" -msgstr "" +msgstr "Жорсткий перезапуск" #: ../java/src/net/i2p/router/web/ConfigServiceHandler.java:223 msgid "Hard restart requested" @@ -4212,7 +4213,7 @@ msgstr "" #: ../java/src/net/i2p/router/web/SummaryHelper.java:150 #, java-format msgid "ERR-Clock Skew of {0}" -msgstr "" +msgstr "ПОМИЛКА-Відхилення годинника {0}" #: ../java/src/net/i2p/router/web/SummaryHelper.java:170 msgid "ERR-Unresolved TCP Address" @@ -5716,13 +5717,13 @@ msgstr "" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:760 msgid "ERR - Clock Skew" -msgstr "" +msgstr "ПОМИЛКА - Відхилення годинника" #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:762 msgid "" "Your system's clock is skewed, which will make it difficult to participate " "in the network." -msgstr "" +msgstr "Ваш системний годинник занадто відхилився, вам буде важко приймати участь у мережі." #: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/confignet_jsp.java:764 msgid "Correct your clock setting if this error persists." diff --git a/apps/susidns/locale/messages_ja.po b/apps/susidns/locale/messages_ja.po index d069b5dd3..42651fe90 100644 --- a/apps/susidns/locale/messages_ja.po +++ b/apps/susidns/locale/messages_ja.po @@ -4,16 +4,17 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# タカハシ , 2013-2014 +# タカハシ , 2013-2014 +# タカハシ , 2015 # rafe , 2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/I2P/language/ja/)\n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-08-31 08:07+0000\n" +"Last-Translator: タカハシ \n" +"Language-Team: Japanese (http://www.transifex.com/otf/I2P/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -219,7 +220,7 @@ msgstr "エラー: アドレスブックファイルに書き込めません。" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -228,14 +229,14 @@ msgstr "無効なフォームからの送信、おそらく、ブラウザで「 #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "問題が続く場合、クッキーがブラウザで有効になっているか確認してください。" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -246,7 +247,7 @@ msgid "Configuration saved." msgstr "設定が保存されました。" #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -275,16 +276,16 @@ msgstr "ネーミング・サービス {1} への {0} の宛先を追加する msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "ネーミング・サービス {1} から {0} の宛先を削除するのに失敗しました" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "購読が保存されました、現在購読ソースからアドレスブックを更新しています。" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "購読が保存されました。" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "購読が再読込されました。" @@ -432,7 +433,7 @@ msgstr "キャンセル" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "hosts.txt 形式でエクスポート" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." diff --git a/apps/susidns/locale/messages_tr.po b/apps/susidns/locale/messages_tr.po index 267a58f1d..5ce6b3963 100644 --- a/apps/susidns/locale/messages_tr.po +++ b/apps/susidns/locale/messages_tr.po @@ -4,15 +4,15 @@ # To contribute translations, see http://www.i2p2.de/newdevelopers # # Translators: -# Kaya Zeren , 2013 +# Kaya Zeren , 2013,2015 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/I2P/language/tr_TR/)\n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-08-05 15:31+0000\n" +"Last-Translator: Kaya Zeren \n" +"Language-Team: Turkish (Turkey) (http://www.transifex.com/otf/I2P/language/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,58 +22,58 @@ msgstr "" #: ../src/java/src/i2p/susi/dns/AddressBean.java:131 #, java-format msgid "Host name \"{0}\" contains illegal character {1}" -msgstr "" +msgstr "\"{0}\" sunucu adında {1} geçersiz karakteri bulunuyor" #: ../src/java/src/i2p/susi/dns/AddressBean.java:144 #: ../src/java/src/i2p/susi/dns/AddressBean.java:146 #: ../src/java/src/i2p/susi/dns/AddressBean.java:153 #, java-format msgid "Host name cannot start with \"{0}\"" -msgstr "" +msgstr "Sunucu adı \"{0}\" ile başlayamaz" #: ../src/java/src/i2p/susi/dns/AddressBean.java:148 #: ../src/java/src/i2p/susi/dns/AddressBean.java:150 #, java-format msgid "Host name cannot end with \"{0}\"" -msgstr "" +msgstr "Sunucu adı \"{0}\" ile bitemez" #: ../src/java/src/i2p/susi/dns/AddressBean.java:155 #, java-format msgid "Host name cannot contain \"{0}\"" -msgstr "" +msgstr "Sunucu adında \"{0}\" bulunamaz" #: ../src/java/src/i2p/susi/dns/AddressBean.java:158 #, java-format msgid "" "Host name \"{0}\" requires conversion to ASCII but the conversion library is" " unavailable in this JVM" -msgstr "" +msgstr "\"{0}\" sunucu adının ASCII karakterlerine dönüştürülmesi gerekiyor ancak bu JVM için dönüştürme kitaplığı kullanılamıyor" #: ../src/java/src/i2p/susi/dns/AddressBean.java:219 msgid "None" -msgstr "" +msgstr "Yok" #: ../src/java/src/i2p/susi/dns/AddressBean.java:227 msgid "Hashcash" -msgstr "" +msgstr "Hashcash" #: ../src/java/src/i2p/susi/dns/AddressBean.java:229 msgid "Hidden" -msgstr "" +msgstr "Gizli" #: ../src/java/src/i2p/susi/dns/AddressBean.java:231 msgid "Signed" -msgstr "" +msgstr "İmzalanmış" #: ../src/java/src/i2p/susi/dns/AddressBean.java:233 msgid "Key" -msgstr "" +msgstr "Anahtar" #: ../src/java/src/i2p/susi/dns/AddressBean.java:235 #: ../src/java/src/i2p/susi/dns/AddressBean.java:260 #, java-format msgid "Type {0}" -msgstr "" +msgstr "Tip {0}" #: ../src/java/src/i2p/susi/dns/AddressBean.java:247 #: ../src/java/src/i2p/susi/dns/AddressBean.java:254 @@ -85,25 +85,25 @@ msgstr "DSA 1024 bit" #, java-format msgid "One result for search within filtered list." msgid_plural "{0} results for search within filtered list." -msgstr[0] "" +msgstr[0] "Süzülmüş listede arama için {0} sonuç bulundu" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:192 #, java-format msgid "Filtered list contains 1 entry." msgid_plural "Filtered list contains {0} entries." -msgstr[0] "" +msgstr[0] "Süzülmüş listede {0} kayıt bulundu" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:197 #, java-format msgid "One result for search." msgid_plural "{0} results for search." -msgstr[0] "" +msgstr[0] "Arama için {0} sonuç bulundu." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206 #, java-format msgid "Address book contains 1 entry." msgid_plural "Address book contains {0} entries." -msgstr[0] "" +msgstr[0] "Adres defterinde {0} kayıt var." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222 #, java-format @@ -128,7 +128,7 @@ msgstr "Değiştirin" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:243 #, java-format msgid "Host name {0} is already in address book, unchanged." -msgstr "" +msgstr "{0} sunucu adı zaten adres defterinde var, değiştirilmedi." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:245 @@ -136,7 +136,7 @@ msgstr "" msgid "" "Host name {0} is already in address book with a different destination. Click" " \"Replace\" to overwrite." -msgstr "" +msgstr "{0} sunucu adı zaten adres defterinde var ancak farklı bir hedefi gösteriyor. Değiştirmek için \"Değiştir\" üzerine tıklayın." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:258 @@ -153,7 +153,7 @@ msgstr "{0} için hedef değiştirildi." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:262 msgid "Warning - host name does not end with \".i2p\"" -msgstr "" +msgstr "Uyarı - sunucu adı \".i2p\" ile bitemez" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:270 @@ -164,7 +164,7 @@ msgstr "Base 64 hedefi geçersiz." #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:276 #, java-format msgid "Invalid host name \"{0}\"." -msgstr "" +msgstr "\"{0}\" sunucu adı geçersiz." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:279 @@ -178,7 +178,7 @@ msgstr "Lütfen bir sunucu adı ve hedef yazın" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:308 #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:270 msgid "Delete Entry" -msgstr "" +msgstr "Kaydı Silin" #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:283 @@ -199,17 +199,17 @@ msgstr "{0} hedefi silindi." #, java-format msgid "1 destination deleted." msgid_plural "{0} destinations deleted." -msgstr[0] "" +msgstr[0] "{0} hedef silindi." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:305 msgid "No entries selected to delete." -msgstr "" +msgstr "Silinmek için seçilmiş bir kayıt yok." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:312 msgid "Address book saved." -msgstr "" +msgstr "Adres defteri kaydedildi." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321 msgid "ERROR: Could not write addressbook file." @@ -218,7 +218,7 @@ msgstr "HATA: Adres defteri dosyasına yazılamadı." #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -227,14 +227,14 @@ msgstr "Büyük olasılıkla web tarayıcınızdaki \"Geri\" ya da \"Yenile\" d #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." -msgstr "" +msgstr "Sorun sürerse, tarayıcınızda çerezlerin etkinleştirilmiş olduğuna emin olun." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -245,7 +245,7 @@ msgid "Configuration saved." msgstr "Ayarlar kaydedildi." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -258,32 +258,32 @@ msgstr "Ayarlar yeniden yüklendi" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:104 #, java-format msgid "{0} address book in {1} database" -msgstr "" +msgstr "{0} adres defteri {1} veritabanında " #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:253 msgid "Manually added via SusiDNS" -msgstr "" +msgstr "SusiDNS üzerine el ile eklendi" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:267 #, java-format msgid "Failed to add Destination for {0} to naming service {1}" -msgstr "" +msgstr "{0} hedefi {1} ad hizmetine eklenemedi" #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:291 #, java-format msgid "Failed to delete Destination for {0} from naming service {1}" -msgstr "" +msgstr "{0} hedefi {1} ad hizmetinden silinemedi" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Abonelikler kaydedildi, adres defteri abonelik kaynaklarına göre güncelleniyor." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Abonelikler kaydedildi." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Abonelikler yeniden yüklendi" @@ -431,7 +431,7 @@ msgstr "İptal" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "hosts.txt biçiminde verin" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." @@ -521,31 +521,31 @@ msgstr "eepProxy kapınız (değiştirilmesine gerek yok)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:190 msgid "Hostname for your eepProxy (no need to change)" -msgstr "" +msgstr "eepProxy sunucu adınız (değiştirilmesine gerek yok)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:192 msgid "Whether to update the published addressbook" -msgstr "" +msgstr "Yayınlanmış adres defteri güncellensin" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:194 msgid "" "File containing the etags header from the fetched subscription URLs (no need" " to change)" -msgstr "" +msgstr "Alınan abonelik İnternet adresinde etags üst bilgisini içeren dosya (değiştirilmesine gerek yok)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:196 msgid "" "File containing the modification timestamp for each fetched subscription URL" " (no need to change)" -msgstr "" +msgstr "Alınan her bir abonelik İnternet adresi için değişiklik zaman damgasını içeren dosya (değiştirilmesine gerek yok)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:198 msgid "File to log activity to (change to /dev/null if you like)" -msgstr "" +msgstr "İşlem günlük kayıtlarının yazılacağı dosya (/dev/null olarak değiştirebilirsiniz)" #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:200 msgid "Name of the theme to use (defaults to 'light')" -msgstr "" +msgstr "Kullanılacak temanın adı (varsayılan 'açık')" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:112 msgid "addressbook" @@ -561,7 +561,7 @@ msgstr "Base 32 Adresi" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:204 msgid "Base 64 Hash" -msgstr "" +msgstr "Base 64 Karma" #: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:210 msgid "Address Helper" @@ -605,80 +605,80 @@ msgstr "Notlar" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:115 msgid "Introduction" -msgstr "" +msgstr "Giriş" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:137 msgid "What is the addressbook?" -msgstr "" +msgstr "Adres defteri nedir?" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:139 msgid "The addressbook application is part of your I2P installation." -msgstr "" +msgstr "Adres defteri uygulaması I2P yazılımının bir parçasıdır." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:141 msgid "" "It regularly updates your hosts.txt file from distributed sources or " "\"subscriptions\"." -msgstr "" +msgstr "hosts.txt dosyanızı düzenli olarak dağıtılmışkaynaklar ya da \"aboneliklerden\" günceller." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:143 #, java-format msgid "" "In the default configuration, the address book is only subscribed to {0}." -msgstr "" +msgstr "Varsayılan ayarlarda, adres defteri yalnız {0} üzerine abonedir." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:145 msgid "" "Subscribing to additional sites is easy, just add them to your subscriptions file." -msgstr "" +msgstr "Ek sitelere kolayca abone olabilirsiniz. Yalnızca siteleri subscriptions dosyasına ekleyin." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:147 msgid "" "For more information on naming in I2P, see the overview." -msgstr "" +msgstr "I2P adlandırmaları hakkında ayrıntılı bilgi almak için özet bölümüne bakın." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:149 msgid "How does the addressbook application work?" -msgstr "" +msgstr "Adres defteri uygulaması nasıl çalışır?" #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:151 msgid "" "The addressbook application regularly polls your subscriptions and merges " "their content into your \"router\" address book." -msgstr "" +msgstr "Adres defteri uygulaması düzenli olarak aboneliklerinizi denetleyerek içeriklerini \"yöneltici\" adres defterinize aktarır." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:153 msgid "" "Then it merges your \"master\" address book into the router address book as " "well." -msgstr "" +msgstr "Ardından \"ana\" adres defterinizi yönelticinin adres defterine aktarır." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:155 msgid "" "If configured, the router address book is now written to the \"published\" " "address book, which will be publicly available if you are running an " "eepsite." -msgstr "" +msgstr "Eepsite çalıştırıyorsanız ve uygun seçeneği etkinleştirdiyseniz, yöneltici adres defteri herkes tarafından görülebilecek \"yayınlanmış\" adres defterine yazılır." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:157 msgid "" "The router also uses a private address book (not shown in the picture), " "which is not merged or published." -msgstr "" +msgstr "Yöneltici ayrıca aktarılmayan ya da yayınlanmayan bir kişisel adres defteri (görselde görüntülenmeyen) kullanır." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:159 msgid "" "Hosts in the private address book can be accessed by you but their addresses" " are never distributed to others." -msgstr "" +msgstr "Kişisel adres defterindeki sunuculara yalnız siz erişebilirsiniz. Bu adresler asla diğer kişiler ile paylaşılmaz." #: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:161 msgid "" "The private address book can also be used for aliases of hosts in your other" " address books." -msgstr "" +msgstr "Kişisel adres defteri ayrıca diğer adres defterlerinizdeki sunucu kısaltmaları için kullanılabilir." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:117 msgid "subscriptions" @@ -686,30 +686,30 @@ msgstr "abonelikler" #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:153 msgid "The subscription file contains a list of i2p URLs." -msgstr "" +msgstr "Abonelik dosyasında I2P İnternet adreslerinin listesi bulunur." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:155 msgid "" "The addressbook application regularly checks this list for new eepsites." -msgstr "" +msgstr "Adres defteri uygulaması düzenli olarak yeni eepsiteleri için bu listeyi denetler." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:157 msgid "Those URLs refer to published hosts.txt files." -msgstr "" +msgstr "Bu İnternet adresleri yayınlanmış hosts.txt dosyalarını gösterir." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:159 #, java-format msgid "" "The default subscription is the hosts.txt from {0}, which is updated " "infrequently." -msgstr "" +msgstr "hosts.txt dosyasındaki varsayılan abonelik olan {0} sık güncellenmez." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:161 msgid "" "So it is a good idea to add additional subscriptions to sites that have the " "latest addresses." -msgstr "" +msgstr "Bu nedenle güncel adresleri bulunduran sitelerin aboneliğini eklemek iyi olur." #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:163 msgid "See the FAQ for a list of subscription URLs." -msgstr "" +msgstr "Abonelik İnternet adreslerinin listesi için SSS bölümüne bakın." diff --git a/apps/susidns/locale/messages_uk.po b/apps/susidns/locale/messages_uk.po index 916d1af3f..8151a05b1 100644 --- a/apps/susidns/locale/messages_uk.po +++ b/apps/susidns/locale/messages_uk.po @@ -6,22 +6,23 @@ # Translators: # 007 , 2014 # 007 , 2014 -# Denis Blank , 2011-2012 -# Denis Blank , 2011 -# Denis Blank , 2011 +# Denis Lysenko , 2011-2012 +# Denis Lysenko , 2011 +# Denis Lysenko , 2011 # LinuxChata, 2014 # LinuxChata, 2014 # madjong , 2014 # madjong , 2014 -# Denis Blank , 2012 +# Maxym Mykhalchuk, 2015 +# Denis Lysenko , 2012 msgid "" msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-14 08:33+0000\n" -"PO-Revision-Date: 2015-05-14 08:34+0000\n" -"Last-Translator: kytv \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"POT-Creation-Date: 2015-07-17 01:13+0000\n" +"PO-Revision-Date: 2015-08-07 16:52+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -237,7 +238,7 @@ msgstr "ПОМИЛКА: Не вдалось зберегти файл адрес #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:108 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:316 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157 msgid "" "Invalid form submission, probably because you used the \"back\" or " "\"reload\" button on your browser. Please resubmit." @@ -246,14 +247,14 @@ msgstr "Форма не прийнята, скоріше всього це ві #: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328 #: ../src/java/src/i2p/susi/dns/ConfigBean.java:110 #: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:155 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159 msgid "" "If the problem persists, verify that you have cookies enabled in your " "browser." msgstr "Якщо проблема не усунена, то перевірте, чи у вашому браузері увімкнено куки (cookies)." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:99 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:128 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:160 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:151 msgid "Save" @@ -264,7 +265,7 @@ msgid "Configuration saved." msgstr "Налаштування збережені." #: ../src/java/src/i2p/susi/dns/ConfigBean.java:102 -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:147 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151 #: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:158 #: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:149 msgid "Reload" @@ -293,16 +294,16 @@ msgstr "Не вдалося додати адресу призначення д msgid "Failed to delete Destination for {0} from naming service {1}" msgstr "Не вдалося видалити адресу призначення для {0} із служби імен {1}" -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:140 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144 msgid "" "Subscriptions saved, updating addressbook from subscription sources now." msgstr "Підписки збережені, запущено завантаження підписок і оновлення адресної книги." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:145 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 msgid "Subscriptions saved." msgstr "Підписки збережені." -#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149 +#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153 msgid "Subscriptions reloaded." msgstr "Підписки перезавантаженні." @@ -450,7 +451,7 @@ msgstr "Відмінити" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:373 msgid "Export in hosts.txt format" -msgstr "" +msgstr "Експорт у форматі hosts.txt" #: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396 msgid "This address book is empty." diff --git a/apps/susimail/locale/messages_uk.po b/apps/susimail/locale/messages_uk.po index 4860d7be6..a8e313fdb 100644 --- a/apps/susimail/locale/messages_uk.po +++ b/apps/susimail/locale/messages_uk.po @@ -5,8 +5,8 @@ # # Translators: # 007 , 2014 -# Denis Blank , 2011 -# Denis Blank , 2011 +# Denis Lysenko , 2011 +# Denis Lysenko , 2011 # LinuxChata, 2014 # madjong , 2014-2015 msgid "" @@ -14,9 +14,9 @@ msgstr "" "Project-Id-Version: I2P\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-29 14:30+0000\n" -"PO-Revision-Date: 2015-04-08 19:55+0000\n" -"Last-Translator: madjong \n" -"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/I2P/language/uk_UA/)\n" +"PO-Revision-Date: 2015-08-07 16:53+0000\n" +"Last-Translator: Denis Lysenko \n" +"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/otf/I2P/language/uk_UA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" From fa792a9d5ea782f1c71d34f42a8688e652268a20 Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 11 Sep 2015 00:54:03 +0000 Subject: [PATCH 143/258] GeoIP db updates from 2015-09-02. --- history.txt | 5 + installer/resources/geoip.txt | 2835 ++++++++++++++++++++++------ installer/resources/geoipv6.dat.gz | Bin 136708 -> 143965 bytes 3 files changed, 2232 insertions(+), 608 deletions(-) diff --git a/history.txt b/history.txt index db2c40c3d..34ba9f682 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2015-09-11 kytv + * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country + database from 2015-09-02. + * Translation updates pulled from Transifex + 2015-09-04 zzz * UPnP: Fix "content not allowed in trailing section" (tickets #481, #1653) diff --git a/installer/resources/geoip.txt b/installer/resources/geoip.txt index e52eb5ac1..e2d1037c6 100644 --- a/installer/resources/geoip.txt +++ b/installer/resources/geoip.txt @@ -1,5 +1,5 @@ # Last updated based on Maxmind GeoLite Country -# dated 2015-07-24 +# dated 2015-09-02 # Script borrowed from Tor # # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip @@ -649,7 +649,9 @@ 86837248,86839295,ES 86839296,86843391,GB 86847488,86849535,GB -86849536,86851583,CZ +86849536,86850559,CZ +86850560,86851327,NL +86851328,86851583,CZ 86851584,86855679,NL 86855680,86859775,RU 86859776,86863871,DE @@ -1239,9 +1241,7 @@ 93893120,93893375,NL 93893376,93893631,US 93893632,93893887,AU -93893888,93894399,US -93894400,93894655,GB -93894656,93896703,US +93893888,93896703,US 93896704,93904895,GB 93904896,93906943,LV 93906944,93908991,BA @@ -1533,7 +1533,8 @@ 96756744,96756751,NL 96756752,96757639,FR 96757640,96757643,CH -96757644,96757663,FR +96757644,96757647,SE +96757648,96757663,FR 96757664,96757667,SE 96757668,96757883,FR 96757884,96757887,ES @@ -1611,7 +1612,7 @@ 96778260,96778859,FR 96778860,96778863,NL 96778864,96778867,CZ -96778868,96778871,NL +96778868,96778871,BE 96778872,96778991,FR 96778992,96779007,DE 96779008,96779011,PT @@ -1623,7 +1624,9 @@ 96779520,96779523,NL 96779524,96779839,FR 96779840,96779903,NL -96779904,96782911,FR +96779904,96782199,FR +96782200,96782207,CZ +96782208,96782911,FR 96782912,96782915,LT 96782916,96783299,FR 96783300,96783303,ES @@ -1726,7 +1729,9 @@ 98992432,98992639,US 98992640,98993151,DE 98993152,98993175,US -98993176,99024895,DE +98993176,98998527,DE +98998528,98998783,GB +98998784,99024895,DE 99024896,99025167,GB 99025168,99025279,DE 99025280,99025407,US @@ -1801,7 +1806,9 @@ 100329472,100331519,RU 100331520,100335615,TR 100335616,100401151,KZ -100532224,100559255,RO +100532224,100548872,RO +100548873,100548873,TR +100548874,100559255,RO 100559256,100559263,EG 100559264,100559551,RO 100559552,100559615,GB @@ -1837,7 +1844,17 @@ 100646912,100647679,RU 100647680,100647711,TR 100647712,100663295,RU -100663296,134738943,US +100663296,134221823,US +134221824,134221824,DE +134221825,134222335,US +134222336,134222336,DE +134222337,134223871,US +134223872,134223872,GB +134223873,134224383,US +134224384,134224384,GB +134224385,134247423,US +134247424,134247424,DE +134247425,134738943,US 134738944,134739199,CA 134739200,135192575,US 135192576,135200767,MX @@ -2074,7 +2091,8 @@ 289642752,289652735,US 289652736,289653759,NL 289653760,289654271,DE -289654272,289656831,US +289654272,289655807,US +289655808,289656831,DE 289656832,289657855,BE 289657856,289658879,AE 289658880,289659903,GB @@ -2761,7 +2779,9 @@ 400911616,400911871,CR 400911872,400912127,US 400912128,400912383,SG -400912384,401130495,US +400912384,401129727,US +401129728,401129983,FR +401129984,401130495,US 401130496,401130751,DE 401130752,401137151,US 401137152,401137663,GB @@ -2815,7 +2835,8 @@ 402128896,402169855,CA 402169856,402223103,US 402223104,402227199,CA -402227200,402239301,US +402227200,402231295,US +402235392,402239301,US 402239302,402239302,CA 402239303,402239473,US 402239474,402239474,CA @@ -2829,8 +2850,8 @@ 402399232,402403327,CA 402403328,402415615,US 402415616,402416639,CA -402416640,402416895,US -402416896,402417663,CA +402416640,402417151,US +402417152,402417663,CA 402417664,402550015,US 402550016,402550271,CA 402550272,402550783,GB @@ -3430,7 +3451,9 @@ 521058304,521060351,IT 521060352,521074687,RO 521074688,521074943,EG -521074944,521075455,RO +521074944,521075199,RO +521075200,521075327,FR +521075328,521075455,RO 521075456,521075711,EG 521075712,521076479,RO 521076480,521076735,IN @@ -4118,7 +4141,9 @@ 533856256,533858303,FR 533858304,533858751,TR 533858752,533858815,AT -533858816,533859647,TR +533858816,533858895,TR +533858896,533858903,AT +533858904,533859647,TR 533859648,533859663,AT 533859664,533860351,TR 533862400,533864447,GB @@ -4207,11 +4232,7 @@ 534519552,534519807,NL 534519808,534521855,US 534521856,534522367,DE -534522368,534522879,NL -534522880,534523034,DE -534523035,534523035,NL -534523036,534523135,DE -534523136,534523391,NL +534522368,534523391,NL 534523392,534523903,DE 534523904,534530047,US 534530048,534538239,ES @@ -4256,7 +4277,9 @@ 539623424,539624577,NL 539624578,539624578,EU 539624579,539627519,NL -539627520,539629975,GB +539627520,539629455,GB +539629456,539629463,BE +539629464,539629975,GB 539629976,539629983,DE 539629984,539630975,GB 539630976,539630983,PT @@ -4657,7 +4680,9 @@ 624574464,624590847,NL 624590848,624625848,FR 624625849,624625849,CA -624625850,624640527,FR +624625850,624640255,FR +624640256,624640259,GB +624640260,624640527,FR 624640528,624640543,GB 624640544,624640759,FR 624640760,624640767,NL @@ -4741,7 +4766,9 @@ 624665952,624665955,NL 624665956,624666167,FR 624666168,624666168,GB -624666169,624666219,FR +624666169,624666172,FR +624666173,624666173,GB +624666174,624666219,FR 624666220,624666223,DE 624666224,624666695,FR 624666696,624666703,DE @@ -4892,7 +4919,7 @@ 624738304,624740351,NL 624740352,624742399,DE 624742400,624746495,RU -624746496,624754687,BG +624746496,624754687,US 624754688,624787455,AZ 624787456,624791551,DE 624791552,624795647,ES @@ -5224,11 +5251,14 @@ 630997504,630997759,MD 630997760,630998271,RO 630998272,630998783,MD -630998784,631001087,RO +630998784,630999039,RO +630999040,630999295,CN +630999296,631001087,RO 631001088,631005183,MD 631005184,631006207,IT 631006208,631007231,MD -631007232,631009279,RO +631007232,631007487,KR +631007488,631009279,RO 631009280,631017471,IR 631017472,631018495,MD 631018496,631019519,IT @@ -5236,10 +5266,14 @@ 631023616,631024639,IT 631024640,631024895,RO 631024896,631025151,GB -631025152,631029759,RO +631025152,631027711,RO +631027712,631027967,KR +631027968,631029759,RO 631029760,631033855,SE 631033856,631034879,IT -631034880,631039999,RO +631034880,631035903,RO +631035904,631036159,JP +631036160,631039999,RO 631040000,631043071,MD 631043072,631043839,RO 631043840,631045119,MD @@ -5467,7 +5501,9 @@ 635860992,635863039,BE 635863040,635893503,RU 635893504,635893759,AZ -635893760,635895807,RU +635893760,635894527,RU +635894528,635894783,KZ +635894784,635895807,RU 635895808,635961343,KW 635961344,635994111,GE 635994112,636026879,RU @@ -6102,7 +6138,11 @@ 700284928,700301311,GH 700301312,700309503,CD 700309504,700313599,DJ -700313600,700317695,US +700313600,700315584,US +700315585,700315585,DJ +700315586,700317478,US +700317479,700317479,DJ +700317480,700317695,US 700317696,700325887,NG 700325888,700334079,ZW 700334080,700335103,BJ @@ -6164,7 +6204,9 @@ 700593152,700594175,NG 700594176,700595199,A2 700595200,700596223,CD -700596224,700645375,A2 +700596224,700598783,A2 +700598784,700599039,CG +700599040,700645375,A2 700645376,700710911,ZA 700710912,700776447,EG 700776448,700841983,RW @@ -6523,7 +6565,9 @@ 711166592,711169311,JP 711169312,711169327,IN 711169328,711173119,JP -711173120,711173375,SG +711173120,711173210,SG +711173211,711173211,ID +711173212,711173375,SG 711173376,711196671,JP 711196672,711458815,CN 711458816,711983103,IN @@ -6713,7 +6757,7 @@ 736403456,736404479,KR 736405504,736408575,IN 736408576,736409599,CN -736409600,736410623,NZ +736409600,736410623,US 736410624,736411647,CN 736411648,736412671,NP 736412672,736413695,TH @@ -6743,7 +6787,6 @@ 736441344,736442367,HK 736442368,736443391,CN 736443392,736445439,AU -736445440,736446463,JP 736446464,736447487,IN 736447488,736448511,TH 736448512,736449535,IN @@ -6859,7 +6902,38 @@ 736621568,736622591,JP 736622592,736624639,IN 736624640,736886783,JP -736886784,737149951,CN +736886784,737096703,CN +737096704,737099775,IN +737099776,737100799,HK +737100800,737101823,IN +737101824,737102847,BD +737102848,737104895,IN +737104896,737106943,HK +737106944,737108991,NZ +737108992,737110015,SG +737110016,737111039,JP +737111040,737113087,IN +737113088,737115135,CN +737115136,737118207,IN +737118208,737119231,AU +737119232,737119999,NL +737120000,737121279,IN +737121280,737122303,VN +737122304,737123327,IN +737123328,737126399,HK +737126400,737127423,IN +737127424,737129471,CN +737129472,737130495,NZ +737130496,737132543,VN +737132544,737139711,IN +737139712,737141759,VN +737141760,737142783,IN +737142784,737143039,HK +737143040,737143807,MY +737143808,737146879,IN +737146880,737147903,NZ +737147904,737148927,MY +737148928,737149951,CN 737149952,737151999,IN 737152000,737154047,HK 737154048,737155071,MY @@ -6938,7 +7012,7 @@ 737308672,737309695,KR 737309696,737312767,IN 737312768,737313791,HK -737313792,737315839,JP +737314816,737315839,JP 737315840,737316863,HK 737316864,737324031,CN 737324032,737325055,HK @@ -7063,7 +7137,31 @@ 737539072,737540095,BD 737540096,737541119,ID 737541120,737542143,SG -737542144,737574911,CN +737542144,737567743,CN +737567744,737570815,IN +737570816,737571839,SG +737571840,737572863,HK +737572864,737574911,IN +737574912,737575935,JP +737575936,737576959,HK +737576960,737581055,IN +737581056,737582079,KR +737582080,737584127,IN +737584128,737585151,MY +737585152,737587199,HK +737587200,737588223,MY +737588224,737589247,KR +737589248,737590271,TH +737590272,737591295,TW +737591296,737593343,JP +737593344,737594367,BD +737594368,737596415,HK +737596416,737597439,CN +737597440,737598463,TW +737598464,737600511,PK +737600512,737601535,CN +737601536,737602559,AU +737602560,737607679,IN 737607680,737608703,HK 737608704,737610751,CN 737610752,737611775,ID @@ -7420,7 +7518,15 @@ 738195456,738197503,KR 738197504,747175935,US 747175936,747241471,NL -747241472,757186559,US +747241472,757071871,US +757071872,757088255,NL +757088256,757090303,US +757090304,757104639,NL +757104640,757106687,US +757106688,757133311,NL +757133312,757135359,AU +757135360,757137407,JP +757137408,757186559,US 757186560,757190655,CA 757190656,757600255,US 757600256,757604351,CA @@ -7443,7 +7549,9 @@ 757714176,757714431,JP 757714432,757716735,US 757716736,757716991,NZ -757716992,757729279,US +757716992,757721599,US +757721600,757721855,PH +757721856,757729279,US 757729280,757731327,CA 757731328,757733375,US 757733376,757734399,CA @@ -7460,9 +7568,10 @@ 757761792,757762047,US 757762048,757762303,MV 757762304,757762559,JP -757762560,757762815,US +757762560,757762815,PH 757762816,757763071,CD -757763072,757763583,US +757763072,757763327,US +757763328,757763583,PA 757763584,757763839,MN 757763840,757764095,US 757764096,757764351,ZW @@ -7494,9 +7603,7 @@ 757773056,757773311,MR 757773312,757774335,US 757774336,757774591,LR -757774592,757775359,US -757775360,757775487,SZ -757775488,757776639,US +757774592,757776639,US 757776640,757776767,GQ 757776768,757777919,US 757777920,757778047,LS @@ -7522,11 +7629,25 @@ 757790976,757791231,WS 757791232,757858303,US 757858304,757956607,CA -757956608,757956863,AU -757956864,758683647,US +757956608,757956863,HK +757956864,757957631,US +757957632,757957887,JP +757957888,757958399,US +757958400,757958655,DE +757958656,757959679,US +757959680,757959935,IT +757959936,757961471,US +757961472,757961727,HK +757961728,757965311,US +757965312,757965567,IN +757965568,758682111,US +758682112,758682367,PH +758682368,758683647,US 758683648,758683903,HK 758683904,758684159,SG -758684160,758685183,US +758684160,758684671,US +758684672,758684927,BR +758684928,758685183,IN 758685184,758685439,AU 758685440,758685695,JP 758685696,758691839,US @@ -7548,7 +7669,8 @@ 758876160,758876415,AU 758876416,758876671,US 758876672,758876927,SD -758876928,758877439,US +758876928,758877183,MH +758877184,758877439,US 758877440,758877695,KZ 758877696,758877951,IR 758877952,758878207,PG @@ -7847,7 +7969,8 @@ 762472448,762473471,CN 762473472,762475519,JP 762475520,762475775,AU -762475776,762476543,ID +762475776,762476031,HK +762476032,762476543,ID 762476544,762478591,PK 762478592,762479615,KR 762479616,762480639,PK @@ -8096,7 +8219,7 @@ 762876928,762877951,SG 762877952,762879231,HK 762879232,762879487,JP -762879488,762879743,SG +762879488,762879743,HK 762879744,762879999,CN 762880000,762881023,IN 762881024,762882047,CN @@ -8148,7 +8271,8 @@ 762950656,762951679,AU 762951680,762952703,JP 762952704,762953727,IN -762953728,762958847,HK +762953728,762957823,HK +762957824,762958847,AU 762958848,762959871,CN 762959872,762960895,ID 762960896,762964991,IN @@ -8199,12 +8323,96 @@ 763103232,763104255,HK 763104256,763105279,BD 763105280,763106303,PH -763106304,763111423,CN +763106304,763107327,CN +763107328,763108351,HK +763108352,763111423,CN 763111424,763112447,AU 763112448,763113471,CN 763113472,763114495,IN +763114496,763115519,AU +763115520,763116543,PH +763116544,763117567,JP +763117568,763118591,HK +763118592,763119615,CN +763119616,763120639,HK +763120640,763122687,CN +763122688,763125759,VN +763125760,763126783,IN +763126784,763127807,CN +763127808,763129343,IN +763129344,763129855,AU +763129856,763130879,HK +763130880,763132927,IN +763132928,763133951,CN +763133952,763134975,IN +763134976,763135999,HK +763136000,763137023,JP +763137024,763142143,IN +763142144,763143167,HK +763143168,763144191,AU +763144192,763145215,BD +763145216,763147263,CN +763147264,763152383,IN +763152384,763153407,AU +763153408,763154431,JP +763154432,763155455,CN +763155456,763156479,AU +763156480,763158527,JP +763158528,763164671,IN +763164672,763166719,CN +763166720,763169791,HK +763169792,763171839,CN +763171840,763172863,SG +763172864,763175935,CN +763175936,763177983,IN +763177984,763179007,CN +763179008,763180031,HK +763180032,763182079,CN +763182080,763183103,IN +763183104,763184127,HK +763184128,763185151,IN +763185152,763186175,HK +763186176,763194367,CN +763194368,763196415,HK +763196416,763197439,IN +763197440,763199487,AU +763199488,763201535,IN +763201536,763202559,CN +763202560,763207679,IN +763207680,763209727,HK +763209728,763210751,NZ +763210752,763214847,IN +763214848,763215871,JP +763215872,763217919,SG +763217920,763220991,VN +763220992,763222015,IN +763222016,763223039,HK +763223040,763224063,BD +763224064,763225087,AF +763225088,763226111,TH +763226112,763227135,KR +763227136,763228159,VN +763228160,763229183,JP +763229184,763229439,NZ +763229440,763230207,IN +763230208,763231231,PH +763231232,763232255,IN +763232256,763234303,HK +763234304,763235327,IN +763235328,763236351,HK +763236352,763238399,IN +763238400,763239423,AU +763239424,763243519,IN +763243520,763244543,AU +763244544,763246591,CN +763246592,763247615,ID +763247616,763248639,SG +763248640,763250687,IN +763250688,763251711,AU +763251712,763252735,HK 767557632,768606207,ZA 768606208,768868351,GH +768868352,769130495,ZM 769130496,769392639,MA 770703360,771227647,EG 771751936,771817471,RU @@ -10103,15 +10311,16 @@ 839339608,839339609,A1 839339610,839340031,US 839340032,839341055,ES -839341056,839348223,US +839341056,839342079,US +839342080,839343103,DE +839343104,839348223,US 839348224,839348479,DE 839348480,839348735,AT 839348736,839348991,GB 839348992,839349247,AT 839349248,839350271,DE 839350272,839351295,NL -839351296,839351807,US -839351808,839352063,DE +839351296,839352063,DE 839352064,839352319,US 839352320,839357439,NL 839357440,839358463,FR @@ -10183,22 +10392,26 @@ 871038976,871104511,SA 871104512,872153087,GB 872153088,872284159,SA -872284160,872415231,FR +872284160,872288871,FR +872288872,872288875,DE +872288876,872290111,FR +872290112,872290143,ES +872290144,872415231,FR 872415232,873463807,US 873463808,873725951,IE 873725952,874250239,US -874250240,874315775,DE -874315776,876609535,US -876609536,876642303,AU -876642304,876871679,US +874250240,874381311,DE +874381312,876609535,US +876609536,876675071,AU +876675072,876871679,US 876871680,877002751,JP 877002752,877264895,US 877264896,877330431,SG 877330432,877395967,US 877395968,877428735,SG -877428736,878510079,US -878510080,878518271,DE -878518272,878650367,US +877428736,878649855,US +878649856,878650111,JP +878650112,878650367,SG 878650368,878651391,AU 878651392,878655487,US 878655488,878656511,JP @@ -10753,7 +10966,9 @@ 1023238144,1023246335,ID 1023246336,1023279103,CN 1023279104,1023311871,IN -1023311872,1023328255,US +1023311872,1023317503,US +1023317504,1023317759,IN +1023317760,1023328255,US 1023328256,1023344639,JP 1023344640,1023410175,CN 1023410176,1023672319,IN @@ -10811,13 +11026,11 @@ 1024365056,1024365311,AP 1024365312,1024365567,JP 1024365568,1024365823,SG -1024365824,1024368639,JP -1024368640,1024369407,MY -1024369408,1024371199,JP +1024365824,1024371199,JP 1024371200,1024371455,PH 1024371456,1024372543,JP -1024372544,1024372607,HK -1024372608,1024373263,JP +1024372544,1024372639,HK +1024372640,1024373263,JP 1024373264,1024373279,HK 1024373280,1024376831,JP 1024376832,1024378879,PH @@ -10834,7 +11047,7 @@ 1025294592,1025294847,SG 1025294848,1025295103,TH 1025295104,1025295615,CN -1025295616,1025295871,MY +1025295616,1025295871,PH 1025295872,1025296127,GB 1025296128,1025296639,FR 1025296640,1025296895,MY @@ -11560,7 +11773,9 @@ 1049030656,1049031679,DE 1049031680,1049031743,EU 1049031744,1049031871,DE -1049031872,1049034751,EU +1049031872,1049032093,EU +1049032094,1049032094,DE +1049032095,1049034751,EU 1049034752,1049067519,EG 1049067520,1049100287,DK 1049100288,1049231359,GB @@ -11568,7 +11783,9 @@ 1049296896,1049362431,EG 1049362432,1049366527,GB 1049366528,1049368575,DE -1049368576,1049369983,GB +1049368576,1049368656,GB +1049368657,1049368657,DE +1049368658,1049369983,GB 1049369984,1049370047,DE 1049370048,1049370623,GB 1049370624,1049378815,AT @@ -13080,7 +13297,9 @@ 1080024320,1080024575,CA 1080024576,1080033279,US 1080033280,1080164351,KY -1080164352,1080295423,CA +1080164352,1080225791,CA +1080225792,1080229887,US +1080229888,1080295423,CA 1080295424,1080498664,US 1080498665,1080498665,EU 1080498666,1080501503,US @@ -13258,7 +13477,9 @@ 1087444224,1087444479,GB 1087444480,1087465727,US 1087465728,1087465983,AU -1087465984,1087496703,US +1087465984,1087466883,US +1087466884,1087466887,GB +1087466888,1087496703,US 1087496704,1087496959,CA 1087496960,1087501567,US 1087501568,1087501695,HK @@ -13304,9 +13525,13 @@ 1088012768,1088012775,PR 1088012776,1088684031,US 1088684032,1088946175,CA -1088946176,1089057279,US +1088946176,1089055999,US +1089056000,1089056255,AP +1089056256,1089057279,US 1089057280,1089057535,EU -1089057536,1089167359,US +1089057536,1089151231,US +1089151232,1089151487,NL +1089151488,1089167359,US 1089167360,1089171455,CA 1089171456,1089171967,A2 1089171968,1089172735,US @@ -13496,7 +13721,9 @@ 1093966164,1093966164,NL 1093966165,1093966216,US 1093966217,1093966217,NL -1093966218,1094074879,US +1093966218,1093984294,US +1093984295,1093984295,IE +1093984296,1094074879,US 1094074880,1094075167,BR 1094075168,1094088959,US 1094088960,1094089023,PR @@ -13550,7 +13777,9 @@ 1098070272,1098070279,GR 1098070280,1098070295,US 1098070296,1098070303,BE -1098070304,1101121535,US +1098070304,1098891623,US +1098891624,1098891631,AU +1098891632,1101121535,US 1101121536,1101121791,EC 1101121792,1101182975,US 1101182976,1101183487,YE @@ -13730,7 +13959,9 @@ 1108525056,1108541439,CA 1108541440,1109688319,US 1109688320,1109696511,CA -1109696512,1109707007,US +1109696512,1109705727,US +1109705728,1109705983,CG +1109705984,1109707007,US 1109707008,1109707263,JM 1109707264,1109707519,US 1109707520,1109707775,MW @@ -13836,10 +14067,15 @@ 1112539136,1112870911,US 1112871936,1112873983,US 1112873984,1112875007,CA -1112875008,1112907775,US +1112875008,1112875519,US +1112875520,1112875775,CA +1112875776,1112889855,US +1112890112,1112890367,CA +1112890368,1112907775,US 1112907776,1112907783,CA 1112907784,1112931327,US 1112931328,1112931839,CA +1112931840,1112932095,US 1112932352,1113591807,US 1113591808,1113595903,CA 1113595904,1113596415,CL @@ -13856,9 +14092,10 @@ 1113603328,1113603583,GT 1113603584,1113603839,US 1113603840,1113604095,CA -1113604096,1113643202,US -1113643203,1113643237,CH -1113643238,1113657343,US +1113604096,1113636863,US +1113636864,1113645055,SG +1113645056,1113653247,ID +1113653248,1113657343,US 1113657344,1113661439,CA 1113661440,1113669631,US 1113669632,1113677823,CA @@ -13969,7 +14206,9 @@ 1117458912,1117458943,GB 1117458944,1117460223,US 1117460224,1117460287,GB -1117460288,1117470719,US +1117460288,1117460991,US +1117460992,1117461247,GB +1117461248,1117470719,US 1117470720,1117471231,CA 1117471232,1117480191,US 1117480192,1117480255,CA @@ -14696,6 +14935,7 @@ 1158427648,1158428159,CA 1158428160,1158428415,US 1158428672,1158440959,US +1158440960,1158441215,CA 1158441216,1158441471,US 1158441472,1158441983,CA 1158441984,1158443007,DM @@ -14871,11 +15111,17 @@ 1161427456,1161428223,AG 1161428224,1161428991,KN 1161428992,1161429247,US -1161429248,1161429503,CA +1161429248,1161429375,CA +1161429376,1161429407,US +1161429408,1161429503,CA 1161429504,1161429951,US 1161429952,1161430015,CA 1161430016,1161430783,US -1161430784,1161431039,CA +1161430784,1161430879,CA +1161430880,1161430911,US +1161430912,1161430943,CA +1161430944,1161430975,US +1161430976,1161431039,CA 1161431040,1161433087,A2 1161433088,1161437183,CA 1161437184,1161453567,US @@ -15031,7 +15277,9 @@ 1163538464,1163538479,CA 1163538480,1163538575,US 1163538576,1163538591,CA -1163538592,1163540351,US +1163538592,1163539199,US +1163539200,1163539455,CA +1163539456,1163540351,US 1163540352,1163540479,CA 1163540480,1163540735,US 1163540736,1163541503,CA @@ -15506,7 +15754,13 @@ 1211334656,1211367935,US 1211367936,1211368191,CA 1211368192,1211368447,EE -1211368448,1211432959,US +1211368448,1211390981,US +1211390982,1211390982,DE +1211390983,1211390989,US +1211390990,1211390990,DE +1211390991,1211391216,US +1211391217,1211391217,IT +1211391218,1211432959,US 1211432960,1211473919,CA 1211473920,1211596799,US 1211596800,1211605999,CA @@ -15788,7 +16042,9 @@ 1249720600,1249720607,IT 1249720608,1249720663,GB 1249720664,1249720671,SE -1249720672,1249720831,GB +1249720672,1249720711,GB +1249720712,1249720719,NL +1249720720,1249720831,GB 1249720832,1249721343,US 1249721344,1249721351,AT 1249721352,1249721359,BE @@ -15920,7 +16176,9 @@ 1264718720,1264718847,CA 1264718848,1264719103,US 1264719104,1264719871,CA -1264719872,1264762879,US +1264719872,1264746527,US +1264746528,1264746543,CA +1264746544,1264762879,US 1264762880,1264763391,CA 1264763392,1264763647,IE 1264763648,1264766975,CA @@ -16339,7 +16597,9 @@ 1297178112,1297178367,QA 1297178368,1297178623,RO 1297178624,1297178879,NL -1297178880,1297182719,RO +1297178880,1297181951,RO +1297181952,1297182463,DE +1297182464,1297182719,RO 1297182720,1297184767,ES 1297184768,1297185279,BZ 1297185280,1297190143,RO @@ -16870,7 +17130,12 @@ 1310707968,1310708223,PL 1310708224,1310708479,RU 1310708480,1310708735,GB -1310708736,1310709247,IE +1310708736,1310708927,IE +1310708928,1310708943,GB +1310708944,1310709199,IE +1310709200,1310709215,DE +1310709216,1310709231,NL +1310709232,1310709247,IE 1310709248,1310709759,PL 1310709760,1310711807,RU 1310711808,1310713855,LT @@ -17428,7 +17693,9 @@ 1334725632,1334726143,SE 1334726144,1334726399,LU 1334726400,1334726655,SE -1334726656,1334734847,RU +1334726656,1334730239,RU +1334730240,1334730495,KZ +1334730496,1334734847,RU 1334734848,1334738943,LT 1334738944,1334743039,CH 1334743040,1334747135,CZ @@ -17441,7 +17708,9 @@ 1334779904,1334783999,UA 1334784000,1334788095,AT 1334788096,1334792191,RU -1334792192,1334794239,GB +1334792192,1334793320,GB +1334793321,1334793321,IR +1334793322,1334794239,GB 1334794240,1334796287,ES 1334796288,1334800383,ME 1334800384,1334804479,IT @@ -17760,8 +18029,8 @@ 1347010560,1347014655,RU 1347014656,1347018751,GG 1347018752,1347022847,IT -1347022848,1347026943,AT -1347026944,1347035135,GB +1347022848,1347024895,AT +1347024896,1347035135,GB 1347035136,1347039231,CZ 1347039232,1347043327,RO 1347043328,1347047423,FR @@ -18383,7 +18652,9 @@ 1353262296,1353262303,US 1353262304,1353271567,GB 1353271568,1353271575,AT -1353271576,1353271727,GB +1353271576,1353271711,GB +1353271712,1353271719,AT +1353271720,1353271727,GB 1353271728,1353271743,AT 1353271744,1353271775,GB 1353271776,1353271807,AT @@ -18478,7 +18749,9 @@ 1357318160,1357318191,GB 1357318192,1357318399,EU 1357318400,1357318655,FR -1357318656,1357321023,EU +1357318656,1357318911,EU +1357318912,1357319167,DE +1357319168,1357321023,EU 1357321024,1357321087,KE 1357321088,1357321983,EU 1357321984,1357322239,GB @@ -18488,8 +18761,8 @@ 1357323008,1357323015,CG 1357323016,1357323519,EU 1357323520,1357323775,GB -1357323776,1357323783,FI -1357323784,1357324287,EU +1357323776,1357323791,FI +1357323792,1357324287,EU 1357324288,1357325311,GB 1357325312,1357326335,EU 1357326336,1357326337,ES @@ -18534,8 +18807,10 @@ 1357348416,1357348479,EU 1357348480,1357348607,ES 1357348608,1357350399,EU -1357350400,1357350591,GB -1357350592,1357351167,EU +1357350400,1357350607,GB +1357350608,1357350655,EU +1357350656,1357350783,GB +1357350784,1357351167,EU 1357351168,1357351423,PL 1357351424,1357360063,EU 1357360064,1357360127,GB @@ -18566,11 +18841,11 @@ 1357373556,1357373567,EU 1357373568,1357373695,GB 1357373696,1357373951,EU -1357373952,1357375103,GB -1357375104,1357377535,EU +1357373952,1357375135,GB +1357375136,1357377535,EU 1357377536,1357377671,FR -1357377672,1357377791,EU -1357377792,1357378559,FR +1357377672,1357377695,EU +1357377696,1357378559,FR 1357378560,1357381631,EU 1357381632,1357414399,NO 1357414400,1357447167,LV @@ -18964,7 +19239,9 @@ 1359036416,1359052799,GB 1359052800,1359101951,RU 1359101952,1359118335,GB -1359118336,1359119199,DE +1359118336,1359118655,DE +1359118656,1359118719,GR +1359118720,1359119199,DE 1359119200,1359119231,NL 1359119232,1359119359,DE 1359119360,1359120383,NL @@ -19239,9 +19516,13 @@ 1360986270,1360986270,US 1360986271,1360986299,GB 1360986300,1360986300,US -1360986301,1360986367,GB +1360986301,1360986356,GB +1360986357,1360986358,US +1360986359,1360986367,GB 1360986368,1360986399,US -1360986400,1360992255,GB +1360986400,1360986631,GB +1360986632,1360986635,US +1360986636,1360992255,GB 1360992256,1360992511,DE 1360992512,1360994303,GB 1360994304,1360998399,CZ @@ -19858,7 +20139,9 @@ 1383497728,1383505919,RU 1383505920,1383514111,SA 1383514112,1383522303,FI -1383522304,1383530495,BG +1383522304,1383523839,BG +1383523840,1383524095,GB +1383524096,1383530495,BG 1383530496,1383538687,DE 1383538688,1383546879,IT 1383546880,1383555071,BG @@ -19938,7 +20221,11 @@ 1385275392,1385283583,IT 1385283584,1385286143,DE 1385286144,1385287679,GB -1385287680,1385291775,EU +1385287680,1385290631,EU +1385290632,1385290632,IS +1385290633,1385291343,EU +1385291344,1385291344,IS +1385291345,1385291775,EU 1385291776,1385299967,TR 1385299968,1385308159,BG 1385308160,1385312255,RU @@ -19996,7 +20283,9 @@ 1386217472,1386283007,PL 1386283008,1386348543,NL 1386348544,1386414079,RU -1386414080,1386448895,GB +1386414080,1386438399,GB +1386438400,1386438655,FR +1386438656,1386448895,GB 1386448896,1386450943,IL 1386450944,1386479615,GB 1386479616,1386545151,NO @@ -21527,7 +21816,9 @@ 1431994368,1432002559,AT 1432002560,1432010751,HU 1432010752,1432018943,UA -1432018944,1432027135,GB +1432018944,1432024063,GB +1432024064,1432025087,DE +1432025088,1432027135,GB 1432027136,1432035327,IE 1432035328,1432043519,GB 1432043520,1432051711,ES @@ -21622,7 +21913,7 @@ 1433731072,1433739263,PL 1433739264,1433747455,GE 1433747456,1433755647,RU -1433755648,1433763839,EE +1433755648,1433763839,KZ 1433763840,1433772031,FR 1433772032,1433788415,SE 1433796608,1433804799,GB @@ -21822,9 +22113,7 @@ 1438878208,1438885887,RU 1438885888,1438889983,LT 1438889984,1438892031,RU -1438892032,1438893823,IS -1438893824,1438894079,CH -1438894080,1438896127,IS +1438892032,1438896127,CH 1438896128,1438900223,AQ 1438900224,1438908415,CH 1438908416,1438924799,GR @@ -21900,7 +22189,9 @@ 1439467520,1439468031,DK 1439468032,1439468543,RO 1439468544,1439469567,ES -1439469568,1439477759,RO +1439469568,1439475711,RO +1439475712,1439475967,IN +1439475968,1439477759,RO 1439477760,1439479807,MD 1439479808,1439482367,RO 1439482368,1439482879,DK @@ -22171,7 +22462,7 @@ 1449778688,1449779455,RO 1449779456,1449779711,GB 1449779712,1449779967,RO -1449779968,1449780223,EU +1449779968,1449780223,RU 1449780224,1449780479,RO 1449780480,1449780991,GB 1449780992,1449781247,RO @@ -22197,7 +22488,7 @@ 1449811968,1449812223,DK 1449812224,1449812991,RO 1449812992,1449813503,GB -1449813504,1449813759,EU +1449813504,1449813759,RU 1449813760,1449814271,RO 1449814272,1449815039,GB 1449815040,1449815295,RO @@ -23167,7 +23458,9 @@ 1495313152,1495313407,MD 1495313408,1495316991,RO 1495316992,1495317503,IT -1495317504,1495319295,RO +1495317504,1495319039,RO +1495319040,1495319167,FR +1495319168,1495319295,RO 1495319296,1495319551,SE 1495319552,1495320063,IR 1495320064,1495326719,RO @@ -23194,7 +23487,8 @@ 1495351296,1495351551,GB 1495351552,1495351807,MD 1495351808,1495352319,IQ -1495352320,1495352831,RO +1495352320,1495352447,FR +1495352448,1495352831,RO 1495352832,1495353087,FI 1495353088,1495362559,RO 1495362560,1495363583,ES @@ -23230,9 +23524,7 @@ 1495406080,1495408639,RO 1495408640,1495416831,IR 1495416832,1495418879,MD -1495418880,1495419391,RO -1495419392,1495419903,EU -1495419904,1495422975,RO +1495418880,1495422975,RO 1495422976,1495423487,IR 1495423488,1495424511,RO 1495424512,1495425023,IR @@ -23246,7 +23538,9 @@ 1495428864,1495429119,DE 1495429120,1495433215,RO 1495433216,1495441407,IR -1495441408,1495442943,RO +1495441408,1495442431,RO +1495442432,1495442559,FR +1495442560,1495442943,RO 1495442944,1495443199,AE 1495443200,1495443455,RO 1495443456,1495443967,IR @@ -23290,7 +23584,9 @@ 1495498368,1495498495,BD 1495498496,1495499775,RO 1495499776,1495500287,IR -1495500288,1495505151,RO +1495500288,1495502847,RO +1495502848,1495503871,PL +1495503872,1495505151,RO 1495505152,1495505407,GB 1495505408,1495505919,RO 1495505920,1495506431,IR @@ -23304,7 +23600,8 @@ 1495511552,1495511807,LT 1495511808,1495515647,RO 1495515648,1495516159,IR -1495516160,1495516671,RO +1495516160,1495516287,FR +1495516288,1495516671,RO 1495516672,1495516927,GR 1495516928,1495517183,RO 1495517184,1495518207,MD @@ -23327,7 +23624,9 @@ 1495554560,1495555071,SE 1495555072,1495556095,RO 1495556096,1495560191,IR -1495560192,1495566847,RO +1495560192,1495566335,RO +1495566336,1495566591,GB +1495566592,1495566847,RO 1495566848,1495567359,GB 1495567360,1495571455,RO 1495571456,1495572479,MD @@ -23357,8 +23656,8 @@ 1495623168,1495623679,IR 1495623680,1495624191,MD 1495624192,1495630079,RO -1495630080,1495631359,GB -1495631360,1495632127,RO +1495630080,1495631615,GB +1495631616,1495632127,RO 1495632128,1495632639,MD 1495632640,1495642111,RO 1495642112,1495644159,SE @@ -23403,7 +23702,9 @@ 1495760128,1495760895,RO 1495760896,1495762943,DE 1495762944,1495763967,GB -1495763968,1495765503,RO +1495763968,1495764735,RO +1495764736,1495764991,AU +1495764992,1495765503,RO 1495765504,1495765759,GB 1495765760,1495766015,NL 1495766016,1495767039,RO @@ -23424,7 +23725,9 @@ 1495791360,1495791615,GB 1495791616,1495793663,RO 1495793664,1495794687,DE -1495794688,1495795455,RO +1495794688,1495795199,RO +1495795200,1495795327,FR +1495795328,1495795455,RO 1495795456,1495795711,RU 1495795712,1495803391,RO 1495803392,1495803903,IR @@ -23504,7 +23807,11 @@ 1495970816,1495971839,MD 1495971840,1495983103,RO 1495983104,1495983615,IR -1495983616,1495990271,RO +1495983616,1495985663,RO +1495985664,1495985791,FR +1495985792,1495985919,RO +1495985920,1495986175,JP +1495986176,1495990271,RO 1495990272,1495994367,IR 1495994368,1495998463,RO 1495998464,1495998719,SG @@ -23518,7 +23825,9 @@ 1496012800,1496016895,IR 1496016896,1496018943,RO 1496018944,1496019967,FR -1496019968,1496036863,RO +1496019968,1496020735,RO +1496020736,1496020991,AU +1496020992,1496036863,RO 1496036864,1496037375,IR 1496037376,1496038399,RO 1496038400,1496038911,IR @@ -23534,7 +23843,9 @@ 1496057856,1496058111,DE 1496058112,1496066815,RO 1496066816,1496067071,QA -1496067072,1496084479,RO +1496067072,1496073983,RO +1496073984,1496074239,ES +1496074240,1496084479,RO 1496084480,1496084991,IR 1496084992,1496085247,MD 1496085248,1496086015,RO @@ -23580,7 +23891,9 @@ 1496197120,1496197631,MD 1496197632,1496198143,RO 1496198144,1496198655,IR -1496198656,1496202239,RO +1496198656,1496198911,RO +1496198912,1496199167,GB +1496199168,1496202239,RO 1496202240,1496202751,IR 1496202752,1496203263,RO 1496203264,1496205311,IT @@ -23590,7 +23903,9 @@ 1496213504,1496215551,IT 1496215552,1496216319,RO 1496216320,1496216575,MD -1496216576,1496228863,RO +1496216576,1496221695,RO +1496221696,1496223743,ES +1496223744,1496228863,RO 1496228864,1496229887,MD 1496229888,1496231935,RO 1496231936,1496233983,PS @@ -23621,9 +23936,7 @@ 1499856896,1499987967,CZ 1499987968,1499996159,AT 1499996160,1500004351,GB -1500004352,1500008447,RU -1500008448,1500012543,IR -1500012544,1500020735,RU +1500004352,1500020735,RU 1500020736,1500028927,IS 1500028928,1500037119,NL 1500037120,1500045311,DK @@ -24085,7 +24398,9 @@ 1506410496,1506422063,DE 1506422064,1506422079,GB 1506422080,1506443263,DE -1506443264,1506444757,GB +1506443264,1506444397,GB +1506444398,1506444398,DE +1506444399,1506444757,GB 1506444758,1506444758,DE 1506444759,1506445103,GB 1506445104,1506445119,DE @@ -24135,7 +24450,9 @@ 1506463680,1506463695,DE 1506463696,1506464895,GB 1506464896,1506464911,NL -1506464912,1506465023,GB +1506464912,1506464999,GB +1506465000,1506465007,NL +1506465008,1506465023,GB 1506465024,1506465187,EU 1506465188,1506465188,NL 1506465189,1506465279,EU @@ -24147,11 +24464,15 @@ 1506469664,1506469695,IT 1506469696,1506469759,GB 1506469760,1506469775,IT -1506469776,1506471983,GB +1506469776,1506471871,GB +1506471872,1506471903,IT +1506471904,1506471983,GB 1506471984,1506471999,NL 1506472000,1506472031,GB 1506472032,1506472047,NL -1506472048,1506476031,GB +1506472048,1506475873,GB +1506475874,1506475874,DE +1506475875,1506476031,GB 1506476032,1506508799,KW 1506508800,1506541567,CZ 1506541568,1506574335,RU @@ -25405,7 +25726,6 @@ 1539560960,1539561471,UA 1539561472,1539561983,RO 1539561984,1539563007,DE -1539563008,1539563519,RU 1539563520,1539564031,SE 1539564032,1539564543,KZ 1539564544,1539565055,GB @@ -27107,7 +27427,6 @@ 1540654080,1540654335,EU 1540654336,1540654591,RU 1540654592,1540654847,SI -1540654848,1540655103,RU 1540655104,1540655359,AT 1540655360,1540655615,RU 1540655616,1540655871,GB @@ -27120,7 +27439,7 @@ 1540658176,1540658431,RO 1540658432,1540659199,RU 1540659200,1540659455,FR -1540659456,1540659967,UA +1540659712,1540659967,UA 1540659968,1540660223,PL 1540660224,1540660479,RU 1540660480,1540660735,FR @@ -27919,10 +28238,9 @@ 1541010944,1541011199,CY 1541011200,1541011455,CH 1541011456,1541011711,FI -1541011712,1541011967,RU 1541012224,1541012479,DE 1541012480,1541012735,FI -1541012736,1541013247,UA +1541012992,1541013247,UA 1541013248,1541013503,SI 1541013504,1541014527,RO 1541014528,1541015551,AM @@ -28301,7 +28619,6 @@ 1541232128,1541232639,RU 1541232640,1541233151,PL 1541233152,1541233663,RU -1541233664,1541234175,SK 1541234176,1541234687,RO 1541234688,1541235199,NL 1541235200,1541235455,RU @@ -28454,7 +28771,6 @@ 1541347584,1541347839,RU 1541347840,1541348095,SI 1541348096,1541348351,UA -1541348352,1541348607,RU 1541348608,1541348863,HR 1541348864,1541349119,UA 1541349120,1541349375,PL @@ -29444,7 +29760,6 @@ 1541904384,1541904639,PL 1541904640,1541904895,SE 1541904896,1541905407,GB -1541905408,1541905663,RU 1541905664,1541905919,PL 1541905920,1541906431,RS 1541906432,1541906687,UA @@ -29634,7 +29949,7 @@ 1542017792,1542018047,GB 1542018048,1542019071,DE 1542019072,1542019327,RU -1542019328,1542020095,UA +1542019584,1542020095,UA 1542020096,1542021119,RU 1542021120,1542023167,UA 1542023168,1542023423,PL @@ -29762,7 +30077,7 @@ 1542106112,1542107135,RU 1542107136,1542107391,PL 1542107392,1542107903,RU -1542107904,1542108159,SK +1542107904,1542108159,AT 1542108160,1542109183,RU 1542109184,1542109695,GB 1542109696,1542110207,PL @@ -29801,7 +30116,6 @@ 1542124800,1542125567,PL 1542125568,1542126591,CZ 1542126592,1542127103,PL -1542127360,1542127615,RU 1542127616,1542128127,PL 1542128128,1542128383,RU 1542128384,1542129151,RO @@ -29988,7 +30302,8 @@ 1542237184,1542238207,PL 1542238208,1542239743,RU 1542239744,1542239999,HU -1542240000,1542240767,RU +1542240000,1542240255,RU +1542240256,1542240767,UA 1542240768,1542241023,DK 1542241024,1542241279,GB 1542241280,1542241535,LV @@ -30163,7 +30478,7 @@ 1542343680,1542344447,PL 1542344448,1542345727,RU 1542345984,1542346239,PL -1542346240,1542348287,RU +1542346240,1542347775,RU 1542348288,1542348799,MD 1542348800,1542349823,RU 1542349824,1542350847,UA @@ -30737,7 +31052,8 @@ 1546006528,1546008575,UA 1546008576,1546014719,BY 1546014720,1546015743,RU -1546015744,1546027007,CZ +1546015744,1546018815,CZ +1546018816,1546027007,UA 1546027008,1546059775,RU 1546059776,1546063871,SE 1546063872,1546067967,DE @@ -31096,7 +31412,9 @@ 1558056104,1558079407,FR 1558079408,1558079415,PL 1558079416,1558079423,GB -1558079424,1558081175,FR +1558079424,1558079871,FR +1558079872,1558079887,GB +1558079888,1558081175,FR 1558081176,1558081183,BE 1558081184,1558083775,FR 1558083776,1558083791,DE @@ -31128,7 +31446,9 @@ 1558122496,1558123007,SG 1558123008,1558123519,RU 1558123520,1558125567,LU -1558125568,1558147071,AT +1558125568,1558141439,AT +1558141440,1558141695,CY +1558141696,1558147071,AT 1558147072,1558147327,LU 1558147328,1558147583,AT 1558147584,1558147839,RU @@ -31503,16 +31823,22 @@ 1567826176,1567826431,DE 1567826432,1567827455,RO 1567827456,1567827711,BG -1567827712,1567833087,RO +1567827712,1567832831,RO +1567832832,1567833087,GB 1567833088,1567833599,NL 1567833600,1567834111,IT 1567834112,1567838207,RO 1567838208,1567842303,A1 -1567842304,1567852543,RO +1567842304,1567842815,FR +1567842816,1567852543,RO 1567852544,1567856639,MD 1567856640,1567858687,RO 1567858688,1567860735,SE -1567860736,1567871999,RO +1567860736,1567866879,RO +1567866880,1567867135,IN +1567867136,1567869183,RO +1567869184,1567869439,NL +1567869440,1567871999,RO 1567872000,1567873023,ES 1567873024,1567879167,MD 1567879168,1567883263,RO @@ -31539,11 +31865,14 @@ 1568024320,1568038911,RO 1568038912,1568059391,IR 1568059392,1568060415,RO -1568060416,1568062463,MD -1568062464,1568088063,RO +1568060416,1568063487,MD +1568063488,1568083967,RO +1568083968,1568084223,CN +1568084224,1568088063,RO 1568088064,1568104447,IR 1568104448,1568106495,MD -1568106496,1568108543,RO +1568106496,1568107519,RO +1568107520,1568108543,MD 1568108544,1568109055,GB 1568109056,1568110079,RO 1568110080,1568111103,GB @@ -31640,7 +31969,7 @@ 1571422208,1571422463,CZ 1571422464,1571422719,UA 1571422720,1571423231,RU -1571423232,1571423487,CZ +1571423232,1571423487,UA 1571423488,1571423999,RU 1571424000,1571424255,KZ 1571424256,1571424511,KG @@ -31654,7 +31983,9 @@ 1571425233,1571425279,CZ 1571425280,1571425535,RU 1571425536,1571425791,NL -1571425792,1571426047,CZ +1571425792,1571425871,CZ +1571425872,1571425872,RU +1571425873,1571426047,CZ 1571426048,1571426303,UA 1571426304,1571428607,CZ 1571428608,1571428863,UA @@ -31712,16 +32043,17 @@ 1571469312,1571469823,BY 1571469824,1571470335,CZ 1571470336,1571470847,UA -1571470848,1571471103,RU -1571471104,1571471359,CZ -1571471360,1571475455,RU +1571470848,1571475455,RU 1571475456,1571476479,CZ 1571476480,1571479551,RU 1571479552,1571483647,CZ 1571483648,1571484159,RU 1571484160,1571487743,CZ -1571487744,1571489791,SK -1571489792,1571490303,CZ +1571487744,1571489023,SK +1571489024,1571489279,UA +1571489280,1571489535,BY +1571489536,1571490047,RU +1571490048,1571490303,CZ 1571490304,1571491071,RU 1571491072,1571491327,CZ 1571491328,1571495935,UA @@ -31734,7 +32066,9 @@ 1571514368,1571520511,BY 1571520512,1571522047,UA 1571522048,1571522815,RU -1571522816,1571524607,CZ +1571522816,1571524095,CZ +1571524096,1571524351,RU +1571524352,1571524607,CZ 1571524608,1571526655,RU 1571526656,1571528191,CZ 1571528192,1571528703,UA @@ -31757,8 +32091,8 @@ 1571535872,1571538943,RU 1571538944,1571539967,CZ 1571539968,1571540223,UA -1571540224,1571540694,CZ -1571540695,1571540695,RU +1571540224,1571540693,CZ +1571540694,1571540695,RU 1571540696,1571540696,CZ 1571540697,1571540697,RU 1571540698,1571540991,CZ @@ -32194,11 +32528,9 @@ 1578614404,1578614423,FR 1578614424,1578614427,IS 1578614428,1578614431,LV -1578614432,1578614435,BG -1578614436,1578614459,FR +1578614432,1578614459,FR 1578614460,1578614463,NO -1578614464,1578614467,FR -1578614468,1578614471,AT +1578614464,1578614471,FR 1578614472,1578614475,SI 1578614476,1578614479,UA 1578614480,1578614495,FR @@ -32645,14 +32977,17 @@ 1588658176,1588659199,RO 1588659200,1588659711,NL 1588659712,1588664319,RO -1588664320,1588664831,VG +1588664320,1588664575,TH +1588664576,1588664831,VG 1588664832,1588673535,RO 1588673536,1588674559,MD 1588674560,1588676607,RO 1588676608,1588678655,IR 1588678656,1588684799,RO -1588684800,1588685311,VG -1588685312,1588689919,RO +1588684800,1588685055,TH +1588685056,1588685311,VG +1588685312,1588689663,RO +1588689664,1588689919,RU 1588689920,1588690687,GB 1588690688,1588723711,RO 1588723712,1588854783,UA @@ -32969,7 +33304,9 @@ 1596858880,1596859391,RU 1596859392,1596862463,CZ 1596862464,1596876799,RU -1596876800,1596881919,CZ +1596876800,1596878079,CZ +1596878080,1596878335,RU +1596878336,1596881919,CZ 1596881920,1596887295,RU 1596887296,1596887551,KZ 1596887552,1596888063,UA @@ -32986,7 +33323,8 @@ 1596901376,1596907519,BY 1596907520,1596909567,RU 1596909568,1596911615,KZ -1596911616,1596915711,RU +1596911616,1596911871,BY +1596911872,1596915711,RU 1596915712,1596923903,UA 1596923904,1596925951,CZ 1596925952,1596932095,RU @@ -33348,7 +33686,10 @@ 1603215360,1603219455,DE 1603219456,1603223551,CH 1603223552,1603223807,FR -1603223808,1603227647,GB +1603223808,1603226255,GB +1603226256,1603226263,DE +1603226264,1603226271,NL +1603226272,1603227647,GB 1603227648,1603231743,AT 1603231744,1603235839,IT 1603235840,1603239935,RU @@ -33378,7 +33719,9 @@ 1604059136,1604075519,MK 1604075520,1604091903,RU 1604091904,1604108287,BA -1604108288,1604141055,DE +1604108288,1604120575,DE +1604120576,1604122623,PL +1604122624,1604141055,DE 1604141056,1604157439,IT 1604157440,1604190207,FR 1604190208,1604206591,UA @@ -33500,7 +33843,9 @@ 1605125277,1605125375,DE 1605125376,1605125903,GB 1605125904,1605125919,DE -1605125920,1605130239,GB +1605125920,1605126701,GB +1605126702,1605126702,US +1605126703,1605130239,GB 1605130240,1605130271,NL 1605130272,1605131263,GB 1605131264,1605131519,DE @@ -33614,7 +33959,9 @@ 1607636480,1607639039,EU 1607639040,1607640805,IT 1607640806,1607640806,CH -1607640807,1607647231,IT +1607640807,1607642388,IT +1607642389,1607642389,NL +1607642390,1607647231,IT 1607647232,1607651327,DE 1607651328,1607655423,FR 1607655424,1607663615,IT @@ -33711,7 +34058,8 @@ 1611116544,1611117567,NL 1611117568,1611128831,US 1611128832,1611130879,NL -1611130880,1611227135,US +1611130880,1611218943,US +1611218944,1611227135,KH 1611227136,1611235327,CA 1611235328,1611251711,SG 1611251712,1611662335,US @@ -34133,7 +34481,9 @@ 1728346624,1728347135,AU 1728347136,1728347147,SG 1728347148,1728347148,AP -1728347149,1728347421,SG +1728347149,1728347416,SG +1728347417,1728347417,AP +1728347418,1728347421,SG 1728347422,1728347422,AP 1728347423,1728348159,SG 1728348160,1728349183,VN @@ -34478,7 +34828,8 @@ 1728684032,1728685055,AU 1728685056,1728686079,JP 1728686080,1728687103,AU -1728687104,1728689407,JP +1728687104,1728688127,JP +1728689152,1728689407,JP 1728689408,1728689663,BD 1728689664,1728689919,PK 1728690176,1728691199,BD @@ -34611,7 +34962,7 @@ 1728812544,1728813055,SG 1728813056,1728814079,IN 1728814080,1728815103,JP -1728816128,1728817151,AU +1728815104,1728817151,AU 1728818176,1728819199,VN 1728819200,1728819711,ID 1728819712,1728819967,NZ @@ -34656,7 +35007,7 @@ 1728848896,1728849919,AU 1728849920,1728850943,PK 1728850944,1728851967,BD -1728851968,1728854015,JP +1728852992,1728854015,JP 1728854016,1728854527,AU 1728854528,1728854783,PK 1728854784,1728855039,AU @@ -34717,12 +35068,10 @@ 1728902400,1728902655,IN 1728902912,1728903167,BD 1728903168,1728905215,KR -1728905472,1728905727,PK 1728905728,1728906239,IN 1728907264,1728908287,NZ 1728909312,1728912383,JP 1728912384,1728913407,TH -1728913408,1728914431,PH 1728914432,1728915199,ID 1728915200,1728915455,NZ 1728915456,1728917503,JP @@ -34784,9 +35133,7 @@ 1728973824,1728974847,JP 1728974848,1728976383,ID 1728976384,1728976895,AU -1728976896,1728977151,AF 1728977920,1728978943,MY -1728978944,1728979967,JP 1728979968,1728980991,MN 1728980992,1728982015,AU 1728982016,1728982527,ID @@ -35340,7 +35687,6 @@ 1729546240,1729546495,JP 1729546496,1729547263,HK 1729548288,1729549311,AU -1729549312,1729550335,JP 1729550336,1729551359,MY 1729551360,1729552383,KR 1729552384,1729553407,AU @@ -35648,7 +35994,6 @@ 1729864704,1729866751,IN 1729866752,1729867775,AU 1729867776,1729869823,HK -1729869824,1729870847,JP 1729870848,1729871871,AU 1729871872,1729872895,JP 1729872896,1729873919,AU @@ -35831,7 +36176,7 @@ 1730043904,1730044927,CN 1730044928,1730046975,HK 1730046976,1730047999,KR -1730048000,1730049023,ID +1730048000,1730049023,TL 1730050048,1730050303,AU 1730050304,1730050559,SG 1730050560,1730051071,ID @@ -35922,7 +36267,62 @@ 1730147328,1730148351,JP 1730148352,1730149375,ID 1730149376,1730150399,JP -1730150400,1730412543,CN +1730150400,1730360319,CN +1730360320,1730361343,IN +1730361344,1730362367,SG +1730362368,1730363391,JP +1730363392,1730364415,VN +1730364416,1730365439,IN +1730365440,1730367487,HK +1730367488,1730368511,AU +1730368512,1730369535,HK +1730369536,1730370047,NZ +1730370048,1730370303,IN +1730370304,1730370559,JP +1730370560,1730371583,AU +1730371584,1730372607,TH +1730372608,1730373631,IN +1730373632,1730374655,CN +1730374656,1730375679,BD +1730375680,1730376191,AU +1730376192,1730376703,VU +1730376704,1730377727,CN +1730377728,1730378239,IN +1730378240,1730378495,HK +1730378496,1730378751,IN +1730378752,1730379775,HK +1730379776,1730380799,AU +1730380800,1730381823,IN +1730381824,1730382847,MY +1730382848,1730383359,ID +1730383360,1730383615,IN +1730383616,1730383871,MY +1730383872,1730385919,HK +1730385920,1730386943,AU +1730386944,1730387967,BD +1730387968,1730389503,IN +1730389504,1730390015,AF +1730390016,1730391039,BD +1730391040,1730392063,HK +1730392064,1730393087,AU +1730393088,1730394111,SG +1730394112,1730395135,HK +1730395136,1730396159,JP +1730396160,1730398207,IN +1730398208,1730399231,CN +1730399232,1730400255,TW +1730400256,1730402303,PK +1730402304,1730402559,NZ +1730402560,1730402815,IN +1730402816,1730403071,ID +1730403072,1730403327,AU +1730403328,1730404351,CN +1730404352,1730406399,AU +1730406400,1730407423,IN +1730407424,1730408447,ID +1730408448,1730410495,IN +1730410496,1730411519,SG +1730411520,1730412543,HK 1730412544,1730414591,AU 1730414592,1730415615,ID 1730415616,1730416127,AU @@ -36500,7 +36900,7 @@ 1731182592,1731183615,VN 1731183616,1731184639,IN 1731184640,1731185663,CN -1731185664,1731186687,NZ +1731185664,1731186687,US 1731186688,1731187711,SG 1731187712,1731188735,CN 1731188736,1731189759,IN @@ -37280,7 +37680,9 @@ 1732124160,1732124671,PH 1732124672,1732126719,AU 1732126720,1732127743,IN -1732127744,1732129791,HK +1732127744,1732128767,HK +1732128768,1732129023,SG +1732129024,1732129791,HK 1732129792,1732130815,CN 1732130816,1732134911,IN 1732134912,1732140031,CN @@ -37358,7 +37760,121 @@ 1740676096,1740677119,BD 1740677120,1740678143,HK 1740678144,1740679167,CN -1740679168,1740681215,IN +1740679168,1740680447,IN +1740680448,1740680703,AU +1740680704,1740680959,MM +1740680960,1740681215,AU +1740681216,1740682239,HK +1740682240,1740683263,KH +1740683264,1740684287,PH +1740684288,1740685311,CN +1740685312,1740686591,AU +1740686592,1740686847,NZ +1740686848,1740687359,IN +1740687360,1740688383,HK +1740688384,1740689407,IN +1740689408,1740692479,CN +1740692480,1740693503,IN +1740693504,1740694527,HK +1740694528,1740696575,JP +1740696576,1740697599,VN +1740697600,1740698623,NZ +1740698624,1740700671,IN +1740700672,1740701695,CN +1740701696,1740702719,IN +1740702720,1740703743,MX +1740703744,1740704255,NZ +1740704256,1740704767,AU +1740704768,1740705791,JP +1740705792,1740706047,NZ +1740706048,1740706303,AU +1740706304,1740706559,PK +1740706560,1740706815,ID +1740706816,1740709887,IN +1740709888,1740710911,HK +1740710912,1740711423,IN +1740711424,1740711935,NZ +1740711936,1740713983,CN +1740713984,1740719103,IN +1740719104,1740720127,HK +1740720128,1740721151,JP +1740721152,1740721407,AU +1740721408,1740721663,IN +1740721664,1740721919,AU +1740721920,1740722175,IN +1740722176,1740723199,AU +1740723200,1740731391,IN +1740731392,1740732415,ID +1740732416,1740734463,CN +1740734464,1740736511,HK +1740736512,1740737535,NZ +1740737536,1740740607,CN +1740740608,1740742655,IN +1740742656,1740743679,CN +1740743680,1740743935,NZ +1740743936,1740744191,PH +1740744192,1740744703,AU +1740744704,1740745727,BD +1740745728,1740746751,HK +1740746752,1740747775,JP +1740747776,1740748799,KH +1740748800,1740749823,JP +1740749824,1740751871,CN +1740751872,1740753919,IN +1740753920,1740754943,KH +1740754944,1740755967,AU +1740755968,1740764159,CN +1740764160,1740766207,HK +1740766208,1740767231,IN +1740767232,1740769279,AU +1740769280,1740771327,IN +1740771328,1740772351,CN +1740772352,1740776447,IN +1740776448,1740777471,HK +1740777472,1740777983,JP +1740777984,1740778495,HK +1740778496,1740779519,IN +1740779520,1740780543,AU +1740780544,1740784639,IN +1740784640,1740784895,AU +1740784896,1740785663,IN +1740785664,1740786687,JP +1740786688,1740787711,SG +1740787712,1740788735,MY +1740788736,1740789759,KH +1740789760,1740790783,IN +1740791808,1740792831,IN +1740792832,1740794879,HK +1740794880,1740795903,KR +1740795904,1740796159,NZ +1740796160,1740798207,IN +1740798208,1740798463,AU +1740798464,1740798975,IN +1740798976,1740799999,AU +1740800000,1740800511,IN +1740800512,1740800767,ID +1740800768,1740805119,IN +1740805120,1740806143,HK +1740806144,1740809215,IN +1740809216,1740810239,JP +1740810240,1740811263,IN +1740811264,1740812287,ID +1740812288,1740813311,MN +1740813312,1740814335,IN +1740815360,1740816383,VN +1740816384,1740821503,IN +1740821504,1740822015,HK +1740822016,1740822527,AU +1740822528,1740825599,IN +1740825600,1740825855,SG +1740825856,1740826111,AU +1740826112,1740826623,CN +1740826624,1740827647,IN +1740827648,1740828671,HK +1740828672,1740829695,IN +1740829696,1740830719,HK +1740830720,1740831743,IN +1740831744,1740832767,KR 1742734336,1742735359,IN 1742735360,1742736383,JP 1742736384,1742737407,PK @@ -37794,7 +38310,6 @@ 1743201280,1743202303,PH 1743202304,1743204351,IN 1743204352,1743205375,TW -1743205376,1743206399,JP 1743206400,1743207423,HK 1743207424,1743208447,KH 1743208448,1743210495,CN @@ -37831,7 +38346,6 @@ 1743237120,1743238143,BD 1743238144,1743240191,CN 1743240192,1743241215,SG -1743241216,1743242239,JP 1743242240,1743244287,ID 1743244288,1743245311,AU 1743245312,1743248383,IN @@ -37848,8 +38362,9 @@ 1743256576,1743258623,HK 1743258624,1743259647,CN 1743259648,1743260671,IN -1743260672,1743261695,JP -1743261696,1743262719,HK +1743260672,1743261703,JP +1743261704,1743261711,PH +1743261712,1743262719,HK 1743262720,1743264767,IN 1743264768,1743265279,MY 1743265280,1743265535,ID @@ -37880,12 +38395,10 @@ 1743296512,1743297535,NP 1743297536,1743298303,NZ 1743298304,1743299583,AU -1743299584,1743300607,KH 1743300608,1743301631,AU 1743301632,1743303679,IN 1743303680,1743304703,NZ 1743304704,1743305727,IN -1743305728,1743306751,JP 1743306752,1743307775,KH 1743307776,1743308799,AU 1743308800,1743309823,JP @@ -37940,7 +38453,6 @@ 1743355904,1743356927,CN 1743356928,1743357951,NZ 1743357952,1743358975,CN -1743358976,1743359487,AF 1743359488,1743361023,ID 1743361024,1743362047,AU 1743362048,1743364095,ID @@ -37972,13 +38484,11 @@ 1743387648,1743388671,JP 1743388672,1743389695,CN 1743389696,1743390719,KR -1743390720,1743391743,JP 1743391744,1743391999,PK 1743392000,1743392767,AU 1743392768,1743393791,HK 1743393792,1743394815,CN 1743394816,1743395839,BD -1743395840,1743396863,JP 1743396864,1743397887,HK 1743397888,1743398911,VN 1743398912,1743399935,TW @@ -37987,7 +38497,6 @@ 1743403008,1743404031,CN 1743404032,1743405055,AU 1743405056,1743407103,IN -1743407104,1743408127,JP 1743408128,1743410175,TW 1743410176,1743411199,SG 1743411200,1743412223,VN @@ -38026,7 +38535,7 @@ 1743446016,1743448063,TW 1743448064,1743449087,AU 1743449088,1743451135,IN -1743451136,1743452159,HK +1743451136,1743452159,CN 1743452160,1743453183,AU 1743453184,1743454207,ID 1743454208,1743455231,IN @@ -38082,7 +38591,31 @@ 1743506944,1743507455,IN 1743507456,1743509503,VN 1743509504,1743510527,HK -1743510528,1743552511,CN +1743510528,1743545343,CN +1743545344,1743546367,HK +1743546368,1743549951,IN +1743549952,1743550207,AU +1743550208,1743550463,SG +1743550464,1743551487,CN +1743551488,1743552511,IN +1743552512,1743553535,JP +1743553536,1743554559,PK +1743554560,1743555583,HK +1743555584,1743557631,JP +1743557632,1743558655,ID +1743558656,1743560703,IN +1743560704,1743561215,ID +1743561216,1743561727,AU +1743561728,1743564799,IN +1743564800,1743565823,PH +1743565824,1743566847,JP +1743566848,1743567871,CN +1743567872,1743569151,ID +1743569152,1743569919,IN +1743569920,1743570943,SG +1743570944,1743574015,IN +1743574016,1743575039,AU +1743575040,1743576063,HK 1743585280,1743589375,CN 1743589376,1743590399,AU 1743590400,1743591423,KR @@ -38455,7 +38988,7 @@ 1744041984,1744043007,TW 1744043008,1744044031,CN 1744044032,1744045055,HK -1744045056,1744047103,SG +1744046080,1744047103,SG 1744047104,1744048127,BD 1744048128,1744049151,CN 1744049152,1744050175,BD @@ -38721,7 +39254,7 @@ 1744315392,1744316415,HK 1744316416,1744317439,KH 1744317440,1744318463,AU -1744318464,1744320511,JP +1744318464,1744319487,JP 1744320512,1744321535,ID 1744321536,1744322559,IN 1744322560,1744323583,CN @@ -38753,9 +39286,8 @@ 1744354304,1744354559,AU 1744354560,1744355327,NZ 1744355328,1744356351,CN -1744356352,1744357375,JP 1744357376,1744357631,NZ -1744357632,1744358399,AU +1744357632,1744357887,AU 1744358400,1744359423,BD 1744359424,1744360447,IN 1744360448,1744361471,CN @@ -38766,7 +39298,7 @@ 1744367616,1744368639,HK 1744368640,1744369663,IN 1744369664,1744369919,ID -1744369920,1744370431,AU +1744369920,1744370175,AU 1744370432,1744370687,JP 1744370688,1744371711,HK 1744371712,1744372735,BD @@ -38827,7 +39359,6 @@ 1744434176,1744435199,CN 1744435200,1744436223,IN 1744436224,1744437247,CN -1744438272,1744439295,JP 1744439296,1744439807,AU 1744439808,1744440319,IN 1744440320,1744441343,HK @@ -38879,7 +39410,6 @@ 1744490496,1744491519,IN 1744491520,1744492543,AU 1744492544,1744493567,CN -1744493568,1744494079,AU 1744494080,1744494591,PK 1744494592,1744495615,CN 1744495616,1744497663,NZ @@ -38975,7 +39505,8 @@ 1744597124,1744597124,US 1744597125,1744597151,SG 1744597152,1744597183,IN -1744597184,1744598015,SG +1744597184,1744597215,JP +1744597216,1744598015,SG 1744599040,1744601087,JP 1744602112,1744603135,HK 1744603136,1744604159,JP @@ -39114,7 +39645,6 @@ 1744747520,1744748543,CN 1744749056,1744749567,NZ 1744749568,1744749823,CN -1744749824,1744750591,AU 1744750592,1744752639,IN 1744752640,1744753663,HK 1744753664,1744754687,SG @@ -39334,7 +39864,10 @@ 1750581248,1750597631,NL 1750597632,1750705151,US 1750705152,1750724607,NL -1750724608,1753251839,US +1750724608,1751505919,US +1751505920,1751506175,IN +1751506176,1751506431,HK +1751506432,1753251839,US 1753251840,1753252095,MN 1753252096,1753252351,SY 1753252352,1753252607,BY @@ -39370,9 +39903,13 @@ 1753489664,1753490175,US 1753490176,1753490431,AU 1753490432,1753490687,IL -1753490688,1753517567,US +1753490688,1753494527,US +1753494528,1753494783,IL +1753494784,1753517567,US 1753517568,1753517823,NO -1753517824,1753735167,US +1753517824,1753522431,US +1753522432,1753522687,FR +1753522688,1753735167,US 1753735168,1753743359,IE 1753743360,1754136575,US 1754136576,1754169343,CA @@ -39395,7 +39932,10 @@ 1754209536,1754209791,BR 1754209792,1754210047,AR 1754210048,1754210303,BJ -1754210304,1754230783,US +1754210304,1754223615,US +1754223616,1754223623,MX +1754223624,1754223631,AU +1754223632,1754230783,US 1754230784,1754234879,VG 1754234880,1754251519,US 1754251520,1754251775,LY @@ -39545,7 +40085,7 @@ 1755824128,1755824383,TV 1755824384,1755824639,SY 1755824640,1755824895,ZW -1755824896,1755825151,TG +1755824896,1755825151,US 1755825152,1755825407,GM 1755825408,1755825663,AO 1755825664,1755825919,LB @@ -39970,7 +40510,9 @@ 1761019648,1761019903,VE 1761019904,1761023231,US 1761023232,1761023487,JP -1761023488,1761044479,US +1761023488,1761043711,US +1761043712,1761043967,PH +1761043968,1761044479,US 1761044480,1761044735,AU 1761044736,1761046527,US 1761046528,1761046783,JP @@ -39982,15 +40524,27 @@ 1761181696,1761181951,MX 1761181952,1761183743,US 1761183744,1761183999,AU -1761184000,1761185791,US +1761184000,1761185023,US +1761185024,1761185279,RU +1761185280,1761185535,US +1761185536,1761185791,AE 1761185792,1761186047,MX -1761186048,1761187327,US +1761186048,1761186815,US +1761186816,1761187071,MX +1761187072,1761187327,US 1761187328,1761187583,PK -1761187584,1761189887,US +1761187584,1761188095,US +1761188096,1761188351,RU +1761188352,1761189887,US 1761189888,1761190143,JP -1761190144,1761192703,US +1761190144,1761191679,US +1761191680,1761191935,MX +1761191936,1761192703,US 1761192704,1761192959,AU -1761192960,1761195007,US +1761192960,1761194239,US +1761194240,1761194495,PH +1761194496,1761194751,HK +1761194752,1761195007,US 1761195008,1761195263,HK 1761195264,1761198079,US 1761198080,1761214463,CA @@ -40028,7 +40582,9 @@ 1761262336,1761262591,PK 1761262592,1761262847,US 1761262848,1761263103,RU -1761263104,1761273599,US +1761263104,1761273087,US +1761273088,1761273343,PH +1761273344,1761273599,US 1761273600,1761273855,AU 1761273856,1761275391,US 1761275392,1761275647,JP @@ -40305,7 +40861,7 @@ 1805253120,1805253375,DE 1805253376,1805253631,GB 1805253632,1805253887,DE -1805253888,1805254143,GB +1805253888,1805254143,US 1805254144,1805254399,DE 1805254400,1805254655,GB 1805254656,1805582335,US @@ -40899,7 +41455,153 @@ 1836023808,1836040191,RU 1836040192,1836048383,GB 1836048384,1836056575,RS -1836056576,1836580863,IT +1836056576,1836450337,IT +1836450338,1836450338,CN +1836450339,1836450371,IT +1836450372,1836450372,CN +1836450373,1836450450,IT +1836450451,1836450451,CN +1836450452,1836450470,IT +1836450471,1836450471,CN +1836450472,1836450511,IT +1836450512,1836450512,CN +1836450513,1836450869,IT +1836450870,1836450870,CN +1836450871,1836450881,IT +1836450882,1836450882,CN +1836450883,1836450883,IT +1836450884,1836450884,CN +1836450885,1836450926,IT +1836450927,1836450927,CN +1836450928,1836450931,IT +1836450932,1836450932,CN +1836450933,1836450940,IT +1836450941,1836450941,CN +1836450942,1836450955,IT +1836450956,1836450956,CN +1836450957,1836451346,IT +1836451347,1836451348,CN +1836451349,1836451350,IT +1836451351,1836451351,CN +1836451352,1836451406,IT +1836451407,1836451407,CN +1836451408,1836451417,IT +1836451418,1836451418,CN +1836451419,1836451461,IT +1836451462,1836451462,CN +1836451463,1836451463,IT +1836451464,1836451464,CN +1836451465,1836451521,IT +1836451522,1836451522,CN +1836451523,1836452122,IT +1836452123,1836452123,CN +1836452124,1836452147,IT +1836452148,1836452148,CN +1836452149,1836452186,IT +1836452187,1836452187,CN +1836452188,1836452315,IT +1836452316,1836452316,CN +1836452317,1836452343,IT +1836452344,1836452345,CN +1836452346,1836452445,IT +1836452446,1836452446,CN +1836452447,1836452447,IT +1836452448,1836452448,CN +1836452449,1836452450,IT +1836452451,1836452451,CN +1836452452,1836452546,IT +1836452547,1836452547,CN +1836452548,1836452751,IT +1836452752,1836452752,CN +1836452753,1836452755,IT +1836452756,1836452757,CN +1836452758,1836453483,IT +1836453484,1836453484,CN +1836453485,1836453539,IT +1836453540,1836453540,CN +1836453541,1836453573,IT +1836453574,1836453574,CN +1836453575,1836454695,IT +1836454696,1836454696,CN +1836454697,1836454740,IT +1836454741,1836454741,CN +1836454742,1836454755,IT +1836454756,1836454756,CN +1836454757,1836455219,IT +1836455220,1836455220,CN +1836455221,1836455228,IT +1836455229,1836455229,CN +1836455230,1836455233,IT +1836455234,1836455234,CN +1836455235,1836455263,IT +1836455264,1836455264,CN +1836455265,1836455272,IT +1836455273,1836455274,CN +1836455275,1836455281,IT +1836455282,1836455282,CN +1836455283,1836455305,IT +1836455306,1836455306,CN +1836455307,1836455309,IT +1836455310,1836455310,CN +1836455311,1836455378,IT +1836455379,1836455379,CN +1836455380,1836455454,IT +1836455455,1836455455,CN +1836455456,1836455458,IT +1836455459,1836455460,CN +1836455461,1836455516,IT +1836455517,1836455517,CN +1836455518,1836455546,IT +1836455547,1836455547,CN +1836455548,1836455556,IT +1836455557,1836455557,CN +1836455558,1836455562,IT +1836455563,1836455563,CN +1836455564,1836455565,IT +1836455566,1836455566,CN +1836455567,1836455568,IT +1836455569,1836455570,CN +1836455571,1836455589,IT +1836455590,1836455590,CN +1836455591,1836455631,IT +1836455632,1836455632,CN +1836455633,1836455987,IT +1836455988,1836455988,CN +1836455989,1836455993,IT +1836455994,1836455995,CN +1836455996,1836455997,IT +1836455998,1836455998,CN +1836455999,1836456001,IT +1836456002,1836456002,CN +1836456003,1836456021,IT +1836456022,1836456022,CN +1836456023,1836456097,IT +1836456098,1836456098,CN +1836456099,1836456117,IT +1836456118,1836456118,CN +1836456119,1836456131,IT +1836456132,1836456135,CN +1836456136,1836456136,IT +1836456137,1836456137,CN +1836456138,1836458047,IT +1836458048,1836458048,CN +1836458049,1836459294,IT +1836459295,1836459295,CN +1836459296,1836459383,IT +1836459384,1836459384,CN +1836459385,1836459399,IT +1836459400,1836459400,CN +1836459401,1836466454,IT +1836466455,1836466455,CN +1836466456,1836466465,IT +1836466466,1836466466,CN +1836466467,1836466529,IT +1836466530,1836466530,CN +1836466531,1836466532,IT +1836466533,1836466533,CN +1836466534,1836466551,IT +1836466552,1836466552,CN +1836466553,1836580863,IT 1836580864,1836597247,RU 1836597248,1836598271,LU 1836598272,1836605439,FR @@ -40929,7 +41631,9 @@ 1836794595,1836794595,FR 1836794596,1836797951,GB 1836797952,1836798207,DE -1836798208,1836810239,GB +1836798208,1836807087,GB +1836807088,1836807088,CN +1836807089,1836810239,GB 1836810240,1836826623,RU 1836826624,1836843007,CZ 1836843008,1836875775,RU @@ -40947,7 +41651,77 @@ 1837056000,1837072383,IQ 1837072384,1837088767,RU 1837088768,1837105151,SI -1837105152,1838153727,BE +1837105152,1837500953,BE +1837500954,1837500954,CN +1837500955,1837501019,BE +1837501020,1837501020,CN +1837501021,1837501040,BE +1837501041,1837501041,CN +1837501042,1837501119,BE +1837501120,1837501120,CN +1837501121,1837501584,BE +1837501585,1837501585,CN +1837501586,1837501588,BE +1837501589,1837501589,CN +1837501590,1837501623,BE +1837501624,1837501624,CN +1837501625,1837501643,BE +1837501644,1837501644,CN +1837501645,1837501998,BE +1837501999,1837501999,CN +1837502000,1837502022,BE +1837502023,1837502023,CN +1837502024,1837502041,BE +1837502042,1837502042,CN +1837502043,1837502052,BE +1837502053,1837502053,CN +1837502054,1837502126,BE +1837502127,1837502127,CN +1837502128,1837502164,BE +1837502165,1837502165,CN +1837502166,1837502539,BE +1837502540,1837502540,CN +1837502541,1837502574,BE +1837502575,1837502575,CN +1837502576,1837502606,BE +1837502607,1837502607,CN +1837502608,1837502610,BE +1837502611,1837502611,CN +1837502612,1837502639,BE +1837502640,1837502640,CN +1837502641,1837502702,BE +1837502703,1837502703,CN +1837502704,1837502818,BE +1837502819,1837502819,CN +1837502820,1837502913,BE +1837502914,1837502914,CN +1837502915,1837502931,BE +1837502932,1837502932,CN +1837502933,1837503116,BE +1837503117,1837503117,CN +1837503118,1837503125,BE +1837503126,1837503127,CN +1837503128,1837503129,BE +1837503130,1837503131,CN +1837503132,1837503136,BE +1837503137,1837503137,CN +1837503138,1837503153,BE +1837503154,1837503154,CN +1837503155,1837503156,BE +1837503157,1837503157,CN +1837503158,1837503163,BE +1837503164,1837503165,CN +1837503166,1837503166,BE +1837503167,1837503167,CN +1837503168,1837503175,BE +1837503176,1837503176,CN +1837503177,1837503184,BE +1837503185,1837503185,CN +1837503186,1837503186,BE +1837503187,1837503187,CN +1837503188,1837503188,BE +1837503189,1837503189,CN +1837503190,1838153727,BE 1838153728,1839202303,GB 1839202304,1839235071,BG 1839235072,1839267839,IL @@ -40972,7 +41746,11 @@ 1839603712,1839618047,RO 1839618048,1839628287,SA 1839628288,1839661055,RO -1839661056,1839693823,UA +1839661056,1839686655,UA +1839686656,1839687167,ES +1839687168,1839693055,UA +1839693056,1839693311,ES +1839693312,1839693823,UA 1839693824,1839726591,RU 1839726592,1839759359,IT 1839759360,1839792127,RU @@ -41396,9 +42174,13 @@ 1844903936,1844969471,NO 1844969472,1845006335,RU 1845006336,1845010431,KZ -1845010432,1845025535,RU +1845010432,1845022719,RU +1845022720,1845023743,KZ +1845023744,1845025535,RU 1845025536,1845025791,KZ -1845025792,1845029887,RU +1845025792,1845027583,RU +1845027584,1845027839,ES +1845027840,1845029887,RU 1845029888,1845030143,KZ 1845030144,1845030911,RU 1845030912,1845031935,GE @@ -42289,7 +43071,9 @@ 1946173696,1946173951,TW 1946173952,1946174463,SG 1946174464,1946174719,TW -1946174720,1946176511,SG +1946174720,1946175487,SG +1946175488,1946175615,HK +1946175616,1946176511,SG 1946176512,1946176639,AU 1946176640,1946176767,PH 1946176768,1946178047,SG @@ -42301,7 +43085,6 @@ 1946189824,1946222591,JP 1946222592,1946943487,CN 1946943488,1946951679,JP -1946951680,1946953727,BD 1946953728,1946955775,ID 1946955776,1946957823,SG 1946957824,1946959871,NZ @@ -42494,9 +43277,7 @@ 1962622976,1962639359,CN 1962639360,1962658815,NZ 1962658816,1962659839,HK -1962659840,1962660863,SG -1962660864,1962661375,HK -1962661376,1962663935,SG +1962659840,1962663935,SG 1962663936,1962672127,HK 1962672128,1962803199,CN 1962803200,1962827775,JP @@ -42932,9 +43713,11 @@ 2001854944,2001854951,CN 2001854952,2001855231,SG 2001855232,2001855263,US -2001855264,2001855775,SG -2001855776,2001855791,US -2001855792,2001857439,SG +2001855264,2001855743,SG +2001855744,2001855999,HK +2001856000,2001857255,SG +2001857256,2001857263,A1 +2001857264,2001857439,SG 2001857440,2001857471,US 2001857472,2001857791,SG 2001857792,2001858047,HK @@ -42942,12 +43725,22 @@ 2001858336,2001858367,US 2001858368,2001858639,SG 2001858640,2001858655,US -2001858656,2001860031,SG +2001858656,2001859071,SG +2001859072,2001859327,HK +2001859328,2001860031,SG 2001860032,2001860047,HK 2001860048,2001860351,SG 2001860352,2001860607,HK -2001860608,2001862079,SG -2001862080,2001862143,US +2001860608,2001860655,SG +2001860656,2001860671,US +2001860672,2001860991,SG +2001860992,2001861007,US +2001861008,2001861263,SG +2001861264,2001861279,US +2001861280,2001862079,SG +2001862080,2001862124,US +2001862125,2001862125,HK +2001862126,2001862143,US 2001862144,2001862655,SG 2001862656,2001864703,AU 2001864704,2001870847,JP @@ -44022,7 +44815,7 @@ 2153398272,2153406463,US 2153406464,2153407487,JP 2153407488,2153407743,HK -2153407744,2153407999,US +2153407744,2153407999,AE 2153408000,2153408511,BR 2153408512,2153408767,AU 2153408768,2153409023,PA @@ -44139,7 +44932,9 @@ 2163638528,2163671039,DE 2163671040,2163867647,US 2163867648,2163933183,AU -2163933184,2164981759,US +2163933184,2164260863,US +2164260864,2164326399,CM +2164326400,2164981759,US 2164981760,2165112831,GB 2165112832,2165178367,DE 2165178368,2165309439,US @@ -44220,7 +45015,9 @@ 2177105920,2177302527,US 2177302528,2177368063,FR 2177368064,2177695743,US +2177695744,2177703935,UG 2177703936,2177712127,ZA +2177728512,2177744895,ZA 2177744896,2177761279,BW 2177761280,2177826815,DE 2177826816,2177892351,US @@ -44337,7 +45134,15 @@ 2188509184,2188574719,US 2188574720,2188640255,NL 2188640256,2188705791,AU -2188705792,2188724463,EU +2188705792,2188706153,EU +2188706154,2188706154,SI +2188706155,2188718161,EU +2188718162,2188718162,SI +2188718163,2188718337,EU +2188718338,2188718338,AT +2188718339,2188718473,EU +2188718474,2188718474,AT +2188718475,2188724463,EU 2188724464,2188724464,NL 2188724465,2188724991,EU 2188724992,2188725247,RS @@ -44404,7 +45209,9 @@ 2193205248,2193207295,FR 2193207296,2193209343,CZ 2193209344,2193211391,FR -2193211392,2193227775,BG +2193211392,2193223423,BG +2193223424,2193223679,GB +2193223680,2193227775,BG 2193227776,2193293311,IT 2193293312,2193358847,US 2193358848,2193424383,FI @@ -45788,7 +46595,7 @@ 2323042304,2323045375,AR 2323045376,2323054591,BR 2323054592,2323120127,CA -2323120128,2323185663,FR +2323120128,2323185663,US 2323185664,2323186687,BR 2323186688,2323187711,CO 2323187712,2323188735,BR @@ -45828,18 +46635,22 @@ 2323279872,2323283967,BR 2323283968,2323284991,AR 2323284992,2323288063,BR +2323288064,2323289087,MX 2323289088,2323291135,BR 2323291136,2323292159,AR 2323292160,2323293183,PY 2323293184,2323298303,BR +2323298304,2323299327,PY 2323299328,2323300351,AR 2323300352,2323301375,HN +2323301376,2323302399,BR 2323302400,2323303423,CO 2323303424,2323308543,BR 2323308544,2323309567,CL 2323309568,2323310591,AR 2323310592,2323313663,BR 2323313664,2323314687,CR +2323314688,2323315711,BR 2323315712,2323316735,MX 2323316736,2323382271,US 2323382272,2323447807,NO @@ -45859,37 +46670,65 @@ 2327379968,2327380991,MX 2327380992,2327383039,BR 2327383040,2327384063,CL -2327384064,2327396351,BR -2327397376,2327398399,VE +2327384064,2327387135,BR +2327387136,2327388159,NI +2327388160,2327396351,BR +2327396352,2327398399,VE 2327398400,2327399423,BR +2327399424,2327400447,BZ 2327400448,2327401471,AR 2327401472,2327406591,BR 2327406592,2327407615,NI 2327407616,2327408639,BR 2327408640,2327409663,AR -2327411712,2327412735,BR -2327413760,2327414783,BR +2327409664,2327410687,PE +2327410688,2327414783,BR +2327414784,2327415807,EC 2327415808,2327416831,AR 2327416832,2327432191,BR 2327432192,2327433215,AR 2327433216,2327434239,BQ 2327434240,2327437311,BR 2327437312,2327438335,MX -2327438336,2327440383,BR +2327438336,2327443455,BR 2327443456,2327444479,CR -2327445504,2327446527,BR +2327444480,2327446527,BR 2327446528,2327447551,VE +2327447552,2327448575,CL +2327448576,2327449599,PA +2327449600,2327450623,BR 2327450624,2327451647,CO 2327451648,2327452671,BR -2327453696,2327459839,BR +2327452672,2327453695,MX +2327453696,2327460863,BR 2327460864,2327461887,PY -2327463936,2327464959,BR -2327465984,2327468031,BR +2327461888,2327462911,MX +2327462912,2327468031,BR 2327468032,2327469055,PA -2327469056,2327474175,BR -2327478272,2327480319,BR +2327469056,2327471103,BR +2327471104,2327472127,MX +2327472128,2327476223,BR +2327476224,2327477247,CL +2327477248,2327480319,BR 2327480320,2327481343,HN 2327481344,2327482367,AR +2327482368,2327483391,BR +2327483392,2327485439,AR +2327485440,2327486463,BR +2327486464,2327487487,AR +2327487488,2327490559,BR +2327490560,2327491583,VE +2327491584,2327493631,BR +2327493632,2327494655,CO +2327494656,2327496703,BR +2327496704,2327497727,MX +2327497728,2327498751,BR +2327498752,2327499775,HN +2327499776,2327501823,AR +2327501824,2327507967,BR +2327507968,2327508991,AR +2327508992,2327510015,SV +2327510016,2327511039,AR 2327511040,2327838719,CH 2327838720,2327969791,US 2327969792,2328035327,AU @@ -45902,6 +46741,27 @@ 2328363008,2328494079,DE 2328494080,2328559615,US 2328559616,2328625151,BE +2328625152,2328627199,AR +2328627200,2328628223,BR +2328628224,2328629247,BZ +2328629248,2328635391,BR +2328635392,2328636415,AR +2328636416,2328652799,BR +2328652800,2328653823,PA +2328653824,2328664063,BR +2328664064,2328667135,AR +2328667136,2328668159,BR +2328668160,2328669183,MX +2328669184,2328671231,BR +2328671232,2328672255,HN +2328672256,2328677375,BR +2328677376,2328678399,MX +2328678400,2328680447,BR +2328680448,2328681471,AR +2328681472,2328683519,BR +2328684544,2328685567,BR +2328685568,2328686591,VE +2328686592,2328687615,BR 2328690688,2328756223,BE 2328756224,2328797439,CH 2328797440,2328797695,AU @@ -45914,6 +46774,32 @@ 2329411584,2329477119,FI 2329477120,2329542655,AU 2329542656,2329608191,CA +2329609216,2329610239,AR +2329610240,2329611263,PY +2329612288,2329613311,AR +2329613312,2329614335,BR +2329615360,2329617407,BR +2329617408,2329618431,MX +2329618432,2329619455,AR +2329619456,2329622527,BR +2329623552,2329624575,AR +2329624576,2329626623,BR +2329626624,2329627647,HN +2329627648,2329628671,BR +2329628672,2329629695,AR +2329629696,2329638911,BR +2329638912,2329639935,HN +2329639936,2329644031,BR +2329644032,2329645055,CW +2329645056,2329649151,BR +2329649152,2329650175,AR +2329650176,2329651199,BR +2329653248,2329662463,BR +2329662464,2329664511,AR +2329664512,2329666559,BR +2329666560,2329667583,CL +2329668608,2329671679,BR +2329671680,2329672703,AR 2329673728,2329739263,US 2329739264,2329804799,CH 2329804800,2329870335,DE @@ -45946,6 +46832,15 @@ 2331639808,2331770879,GB 2331836416,2331901951,GB 2331901952,2331967487,US +2331967488,2331980799,BR +2331980800,2331981823,PA +2331981824,2331982847,BR +2331982848,2331983871,MX +2331983872,2331992063,BR +2331993088,2331994111,CL +2331994112,2332006399,BR +2332006400,2332007423,SV +2332016640,2332020735,BR 2332033024,2332098559,ID 2332098560,2332622847,DE 2332622848,2332688383,CN @@ -46052,7 +46947,9 @@ 2342518784,2342584319,FR 2342584320,2342649856,US 2342649857,2342658047,SG -2342658048,2342700247,US +2342658048,2342682623,US +2342682624,2342690815,DE +2342690816,2342700247,US 2342700248,2342700248,GB 2342700249,2342715391,US 2342715392,2342780927,AU @@ -46194,8 +47091,8 @@ 2365587456,2365589503,JO 2365589504,2365590527,US 2365590528,2365591039,NO -2365591040,2365591455,EU -2365591456,2365591551,NO +2365591040,2365591295,EU +2365591296,2365591551,NO 2365591552,2365593599,DE 2365593600,2365595647,NL 2365595648,2365603839,GB @@ -46526,25 +47423,31 @@ 2391015424,2391277567,CA 2391277568,2391343103,US 2391343104,2391998463,CA -2391998464,2392002047,US +2391998464,2392002303,US 2392002304,2392010751,CA 2392010752,2392011263,US 2392011264,2392011519,CA -2392011776,2392012799,CA -2392012800,2392013823,US +2392011776,2392012543,CA +2392012544,2392014079,US 2392014080,2392014335,CA -2392015360,2392015615,CA +2392015360,2392015871,CA 2392015872,2392017407,US 2392017408,2392017663,CA +2392017920,2392018431,US 2392018432,2392018687,CA -2392018944,2392019967,CA +2392018688,2392018943,US +2392018944,2392019199,CA +2392019200,2392019455,US +2392019456,2392019967,CA 2392019968,2392021759,US 2392021760,2392022015,NL 2392022016,2392022271,FR 2392022272,2392022527,DE 2392022528,2392022783,GB 2392022784,2392023039,US -2392023040,2392025087,CA +2392023040,2392024319,CA +2392024320,2392024575,US +2392024576,2392025087,VI 2392025088,2392063999,US 2392064000,2392096767,CA 2392096768,2392129535,US @@ -46965,8 +47868,7 @@ 2449420288,2449422335,DE 2449422336,2449424383,DK 2449424384,2449440767,OM -2449440768,2449441279,NL -2449441280,2449442815,RO +2449440768,2449442815,NL 2449442816,2449444863,RU 2449444864,2449448959,SK 2449448960,2449457151,KZ @@ -47585,7 +48487,9 @@ 2500149504,2500149759,GB 2500149760,2500150655,US 2500150656,2500150719,GB -2500150720,2500161023,US +2500150720,2500155647,US +2500155648,2500155903,GB +2500155904,2500161023,US 2500161024,2500162047,GB 2500162048,2500162559,US 2500162560,2500162815,GB @@ -47727,7 +48631,9 @@ 2501574656,2501640191,KZ 2501640192,2502033407,US 2502033408,2502037503,LU -2502037504,2503016447,US +2502037504,2502041599,US +2502041600,2502043647,ES +2502043648,2503016447,US 2503016448,2503147519,IL 2503147520,2503671807,US 2503671808,2503737343,NL @@ -47901,11 +48807,19 @@ 2513070560,2513070591,ES 2513070592,2513070623,FR 2513070624,2513070655,ES -2513070656,2513079250,FR +2513070656,2513076471,FR +2513076472,2513076479,ES +2513076480,2513078367,FR +2513078368,2513078371,GB +2513078372,2513079250,FR 2513079251,2513079254,ES 2513079255,2513081327,FR 2513081328,2513081343,ES -2513081344,2513108991,FR +2513081344,2513082561,FR +2513082562,2513082562,GB +2513082563,2513102899,FR +2513102900,2513102903,CZ +2513102904,2513108991,FR 2513108992,2513502207,DE 2513502208,2513567743,NO 2513567744,2513600511,GR @@ -48040,7 +48954,7 @@ 2525060096,2525061119,AU 2525061120,2525062143,TW 2525062144,2525071359,IN -2525071360,2525072383,HK +2525071360,2525072383,CN 2525072384,2525073407,MN 2525073408,2525075455,IN 2525075456,2525076479,CN @@ -48164,7 +49078,9 @@ 2538606032,2538606039,ES 2538606040,2538606043,FR 2538606044,2538606047,DE -2538606048,2538619359,FR +2538606048,2538606403,FR +2538606404,2538606407,GB +2538606408,2538619359,FR 2538619360,2538619375,ES 2538619376,2538619431,FR 2538619432,2538619435,DE @@ -48279,7 +49195,6 @@ 2547523584,2547535871,GB 2547535872,2547548159,BG 2547548160,2547580927,NO -2547580928,2547646463,DE 2548039680,2548563967,GB 2548563968,2548826111,IR 2548826112,2548829695,AT @@ -48495,7 +49410,12 @@ 2572943360,2572951551,DE 2572951552,2572953599,US 2572953600,2572953855,BY -2572953856,2572955647,DE +2572953856,2572954111,HK +2572954112,2572954367,DE +2572954368,2572954623,HK +2572954624,2572954879,AU +2572954880,2572955135,HK +2572955136,2572955647,DE 2572955648,2572959743,BR 2572959744,2572968447,DE 2572968448,2572968959,CZ @@ -48727,7 +49647,9 @@ 2586714880,2586715135,NL 2586715136,2586716159,US 2586716160,2586716671,ES -2586716672,2586733567,US +2586716672,2586717183,US +2586717184,2586717439,ES +2586717440,2586733567,US 2586733568,2586733823,LT 2586733824,2586734591,US 2586734592,2586735615,LT @@ -48810,8 +49732,8 @@ 2587525120,2587542527,US 2587542528,2587544575,ES 2587544576,2587545599,US -2587545600,2587547647,ES -2587547648,2587582463,US +2587545600,2587549695,ES +2587549696,2587582463,US 2587582464,2587586559,NL 2587586560,2587592703,US 2587592704,2587594751,GB @@ -48872,7 +49794,8 @@ 2588303360,2588311551,CM 2588311552,2588315647,ZA 2588315648,2588317695,BW -2588317696,2588318207,MU +2588317696,2588317951,ZA +2588317952,2588318207,MU 2588318208,2588318719,ZA 2588318720,2588319743,UG 2588319744,2588327935,SC @@ -49136,7 +50059,7 @@ 2616885530,2616918015,DE 2616983552,2617049087,US 2617049088,2617114623,IT -2617114880,2617115135,US +2617114624,2617115135,US 2617115136,2617115647,CA 2617115648,2617123839,US 2617123840,2617124095,DE @@ -49192,7 +50115,7 @@ 2617166336,2617166591,KH 2617166592,2617166847,TJ 2617166848,2617167103,KG -2617167104,2617167359,IS +2617167104,2617167359,IN 2617167360,2617167615,DK 2617167616,2617167871,IL 2617167872,2617168127,PL @@ -49237,7 +50160,7 @@ 2617177856,2617178111,BE 2617178112,2617178367,IM 2617178368,2617178623,BN -2617178624,2617178879,AD +2617178624,2617178879,US 2617178880,2617179135,LT 2617179136,2617179391,MD 2617179392,2617179647,SI @@ -49321,7 +50244,7 @@ 2627076096,2627141631,NL 2627141632,2627469311,US 2627469312,2627731455,TZ -2627731456,2629828607,EG +2627731456,2631925759,EG 2634022912,2634088447,CN 2634088448,2635202559,JP 2635202560,2635268095,CN @@ -49369,7 +50292,10 @@ 2640445440,2640510975,US 2640510976,2640576511,FR 2640576512,2640642047,EC -2640642048,2641952767,JP +2640642048,2641928191,JP +2641928192,2641936383,SG +2641936384,2641944575,US +2641944576,2641952767,JP 2641952768,2642018303,US 2642018304,2642083839,CN 2642083840,2642149375,US @@ -49743,7 +50669,9 @@ 2674130944,2674147327,GB 2674147328,2674163711,NL 2674163712,2674175999,GB -2674176000,2674192383,US +2674176000,2674177286,US +2674177287,2674177287,GB +2674177288,2674192383,US 2674192384,2674196479,CH 2674196480,2674249727,GB 2674249728,2674251775,US @@ -49883,7 +50811,9 @@ 2680487936,2680553471,GB 2680553472,2680684543,US 2680684544,2680750079,SE -2680750080,2681012223,US +2680750080,2680881151,US +2680881152,2680897535,CA +2680897536,2681012223,US 2681012224,2681077759,PL 2681077760,2681143295,CA 2681143296,2681208831,AU @@ -50074,7 +51004,8 @@ 2697789440,2697854975,US 2697854976,2697889791,AU 2697889792,2697891839,US -2697891840,2697892863,AU +2697891840,2697892095,GB +2697892096,2697892863,AU 2697892864,2697894399,US 2697894400,2697920511,AU 2697920512,2698117119,US @@ -50096,7 +51027,10 @@ 2699296768,2699362303,FR 2699362304,2699624447,US 2699624448,2699689983,JP -2699755520,2700935167,JP +2699755520,2700214271,JP +2700214272,2700247039,NA +2700247040,2700263423,UG +2700279808,2700935167,JP 2700935168,2701066239,US 2701066240,2701131775,BG 2701131776,2701132543,HN @@ -50506,7 +51440,9 @@ 2732549120,2732550143,CA 2732550144,2732580863,US 2732580864,2732582911,CA -2732582912,2733903871,US +2732582912,2733882879,US +2733882880,2733883135,CA +2733883136,2733903871,US 2733903872,2733904895,PR 2733904896,2733907967,CA 2733907968,2733911039,US @@ -51049,7 +51985,8 @@ 2773286912,2773745663,US 2773745664,2773794815,NZ 2773794816,2773798911,IN -2773798912,2773807103,NZ +2773798912,2773805055,NZ +2773805056,2773807103,JP 2773807104,2773811199,IN 2773811200,2773876735,US 2773876736,2773942271,AU @@ -51192,6 +52129,7 @@ 2784362496,2784428031,KR 2784428032,2784952063,US 2784952064,2784952319,NL +2784952320,2785017855,ZA 2785017856,2785804287,US 2785804288,2786066431,CH 2786066432,2788163583,US @@ -51536,7 +52474,7 @@ 2835087360,2835152895,AU 2835152896,2835161087,LR 2835161088,2835169279,ZW -2835169280,2835173375,ZA +2835169280,2835177471,ZA 2835177472,2835181567,DZ 2835181568,2835183615,NG 2835183616,2835185663,ZA @@ -51629,6 +52567,13 @@ 2851019776,2851020799,ZA 2851020800,2851021823,AO 2851021824,2851022847,EG +2851022848,2851023871,CM +2851023872,2851024895,ZA +2851024896,2851025919,NG +2851025920,2851026943,GH +2851026944,2851027967,DZ +2851027968,2851028991,ZA +2851028992,2851030015,CI 2851078144,2851995647,US 2852061184,2852062207,ZA 2852062208,2852063231,CM @@ -52000,7 +52945,11 @@ 2886667264,2886729727,US 2887778304,2891034623,US 2891034624,2891036671,CA -2891036672,2891120639,US +2891036672,2891056383,US +2891056384,2891056639,ES +2891056640,2891058943,US +2891058944,2891059199,FR +2891059200,2891120639,US 2891251712,2891272191,US 2891272192,2891274239,CA 2891274240,2891282431,US @@ -52022,14 +52971,30 @@ 2891843328,2891843839,SE 2891843840,2891844095,GB 2891844096,2891845119,FR -2891845120,2891845631,DE -2891845632,2891848959,US +2891845120,2891846399,DE +2891846400,2891846911,CH +2891846912,2891847679,NL +2891847680,2891847935,SG +2891847936,2891848447,MY +2891848448,2891848959,JP 2891848960,2891849471,BN -2891849472,2891857919,US +2891849472,2891849983,PH +2891849984,2891850495,TH +2891850496,2891850751,SG +2891850752,2891854335,US +2891854336,2891855615,NL +2891855616,2891856127,SE +2891856128,2891856383,LU +2891856384,2891857919,US 2891857920,2891858175,ES 2891858176,2891858431,TR 2891858432,2891858687,RO -2891858688,2891871231,US +2891858688,2891862527,US +2891862528,2891863039,KR +2891863040,2891863551,AU +2891863552,2891864063,JP +2891864064,2891864575,SG +2891864576,2891871231,US 2891871232,2891871487,CA 2891871488,2891974655,US 2891974656,2891976703,CA @@ -52047,11 +53012,17 @@ 2892068864,2892069887,CA 2892069888,2892070911,US 2892070912,2892103679,CA -2892103680,2892140543,US +2892103680,2892120831,US +2892120832,2892121087,CA +2892121088,2892140543,US 2892140544,2892144895,CA 2892144896,2892145407,US 2892145408,2892145663,CA -2892145664,2892171263,US +2892145664,2892146943,US +2892146944,2892147199,NL +2892147200,2892149503,US +2892149504,2892149759,NL +2892149760,2892171263,US 2892171264,2892172287,CA 2892172288,2892174335,US 2892174336,2892177407,CA @@ -52066,7 +53037,14 @@ 2892464128,2892496895,CA 2892496896,2892906495,US 2892906496,2892910591,CA -2892910592,2893676543,US +2892910592,2892988415,US +2892988416,2892988671,SC +2892988672,2892988927,PA +2892988928,2892989183,SA +2892989184,2892989439,PE +2892989440,2892989695,CO +2892989696,2892989951,VE +2892989952,2893676543,US 2893676544,2893807615,CA 2893807616,2894921727,US 2894921728,2895118335,GB @@ -52126,7 +53104,9 @@ 2905345280,2905345535,AU 2905345536,2905346815,US 2905346816,2905347071,JP -2905347072,2905348863,US +2905347072,2905348095,US +2905348096,2905348351,PH +2905348352,2905348863,US 2905348864,2905349119,NZ 2905349120,2905387519,US 2905387520,2905388031,CA @@ -52178,7 +53158,9 @@ 2915528768,2915528791,NL 2915528792,2915528863,US 2915528864,2915528879,NL -2915528880,2915795013,US +2915528880,2915528927,US +2915528928,2915528943,NL +2915528944,2915795013,US 2915795014,2915795014,MX 2915795015,2915894575,US 2915894576,2915894591,CA @@ -52474,7 +53456,9 @@ 2928201984,2928202239,JP 2928202240,2928204799,US 2928204800,2928205055,NZ -2928205056,2928226303,US +2928205056,2928206335,US +2928206336,2928206591,PH +2928206592,2928226303,US 2928226304,2928230399,CA 2928230400,2928261375,US 2928261376,2928261887,CA @@ -52812,7 +53796,9 @@ 2954843760,2954843771,ES 2954843772,2954844147,FR 2954844148,2954844151,DE -2954844152,2954844999,FR +2954844152,2954844192,FR +2954844193,2954844193,NL +2954844194,2954844999,FR 2954845000,2954845003,ES 2954845004,2954845183,FR 2954845184,2954845199,DE @@ -52865,7 +53851,9 @@ 2954870904,2954870907,ES 2954870908,2954874431,FR 2954874432,2954874447,GB -2954874448,2954875879,FR +2954874448,2954874655,FR +2954874656,2954874663,DE +2954874664,2954875879,FR 2954875880,2954875883,ES 2954875884,2954876871,FR 2954876872,2954876875,ES @@ -52945,7 +53933,7 @@ 2956500992,2956503039,NL 2956503040,2956504063,CY 2956504064,2956504319,CH -2956504320,2956504575,RU +2956504320,2956504575,NL 2956504576,2956504831,A1 2956504832,2956505087,RU 2956505088,2956506111,NL @@ -53518,7 +54506,7 @@ 2967345152,2967347199,ES 2967347200,2967351295,HR 2967351296,2967355391,FR -2967355392,2967363583,RO +2967355392,2967363583,ES 2967363584,2967371775,SE 2967371776,2967388159,KZ 2967388160,2967392255,RU @@ -53855,7 +54843,9 @@ 2988465216,2988465219,ES 2988465220,2988465559,FR 2988465560,2988465563,ES -2988465564,2988476415,FR +2988465564,2988466098,FR +2988466099,2988466099,BE +2988466100,2988476415,FR 2988476416,2988478463,IT 2988478464,2988478579,FR 2988478580,2988478583,DE @@ -54139,7 +55129,11 @@ 2989883392,2989948927,UA 2989948928,2990014463,FI 2990014464,2990079999,PL -2990080000,2990145535,RU +2990080000,2990096895,RU +2990096896,2990097023,KZ +2990097024,2990097151,RU +2990097152,2990097279,KZ +2990097280,2990145535,RU 2990145536,2990211071,SI 2990211072,2990276607,GR 2990276608,2990342143,ES @@ -55398,9 +56392,13 @@ 3025612896,3025613063,SG 3025613064,3025616895,IN 3025616896,3025617439,SG -3025617440,3025618943,IN +3025617440,3025617447,IN +3025617448,3025617455,SG +3025617456,3025618943,IN 3025618944,3025619519,SG -3025619520,3025620991,IN +3025619520,3025619583,IN +3025619584,3025619711,SG +3025619712,3025620991,IN 3025620992,3025621247,PH 3025621248,3025621503,IN 3025621504,3025621759,PH @@ -55408,7 +56406,8 @@ 3025623056,3025623087,SG 3025623088,3025623295,IN 3025623296,3025623551,JP -3025623552,3025625343,IN +3025623552,3025623807,SG +3025623808,3025625343,IN 3025625344,3025625375,SG 3025625376,3025625391,IN 3025625392,3025625395,CA @@ -55434,11 +56433,10 @@ 3025631240,3025631247,AU 3025631248,3025631747,IN 3025631748,3025631767,HK -3025631768,3025632255,IN -3025632256,3025632271,SG -3025632272,3025632287,IN -3025632288,3025632383,SG -3025632384,3025632511,IN +3025631768,3025631999,IN +3025632000,3025632255,HK +3025632256,3025632399,SG +3025632400,3025632511,IN 3025632512,3025632767,SG 3025632768,3025633535,IN 3025633536,3025633791,HK @@ -55467,7 +56465,9 @@ 3025639536,3025639551,HK 3025639552,3025639679,SG 3025639680,3025639807,HK -3025639808,3025640191,IN +3025639808,3025639839,IN +3025639840,3025639871,HK +3025639872,3025640191,IN 3025640192,3025640447,JP 3025640448,3025640799,MY 3025640800,3025641727,IN @@ -55752,21 +56752,29 @@ 3039395840,3039411199,BZ 3039411200,3039412223,US 3039412224,3039412735,CL -3039412736,3039414015,BR +3039412736,3039412991,BR +3039412992,3039413247,US +3039413248,3039414015,BR 3039414016,3039414271,CL -3039414272,3039414527,BR -3039414528,3039414783,CL -3039414784,3039415039,BR +3039414272,3039415039,BR 3039415040,3039415295,CL 3039415296,3039416319,BR -3039416320,3039416713,CL +3039416320,3039416591,CL +3039416592,3039416607,SG +3039416608,3039416713,CL 3039416714,3039416715,US -3039416716,3039416735,CL +3039416716,3039416719,SG +3039416720,3039416735,CL 3039416736,3039416739,US -3039416740,3039416831,CL +3039416740,3039416741,SG +3039416742,3039416831,CL 3039416832,3039417599,BR 3039417600,3039417855,CL -3039417856,3039420415,BR +3039417856,3039419583,BR +3039419584,3039419647,SG +3039419648,3039419839,BR +3039419840,3039419903,SG +3039419904,3039420415,BR 3039420416,3039428607,AR 3039428608,3039559679,CL 3039559680,3039821823,AR @@ -56024,7 +57032,79 @@ 3050778368,3050778623,US 3050778624,3050778639,TR 3050778640,3050778879,BR -3050778880,3050831871,US +3050778880,3050800383,US +3050800384,3050800399,AL +3050800400,3050800415,AD +3050800416,3050800431,AI +3050800432,3050800447,AG +3050800448,3050800463,AR +3050800464,3050800479,AM +3050800480,3050800495,AZ +3050800496,3050800511,BS +3050800512,3050800639,US +3050800640,3050800655,BB +3050800656,3050800671,BY +3050800672,3050800687,BZ +3050800688,3050800703,BM +3050800704,3050800719,BO +3050800720,3050800735,BA +3050800736,3050800751,VG +3050800752,3050800767,KY +3050800768,3050800895,US +3050800896,3050800911,CN +3050800912,3050800927,CO +3050800928,3050800943,GG +3050800944,3050800959,CU +3050800960,3050800975,CY +3050800976,3050800991,DK +3050800992,3050801007,DO +3050801008,3050801023,EC +3050801024,3050801151,US +3050801152,3050801167,EG +3050801168,3050801183,GQ +3050801184,3050801199,GF +3050801200,3050801215,PF +3050801216,3050801231,GE +3050801232,3050801247,SV +3050801248,3050801263,GD +3050801264,3050801279,GT +3050801280,3050801407,US +3050801408,3050801423,HN +3050801424,3050801439,IR +3050801440,3050801455,JM +3050801456,3050801471,JO +3050801472,3050801487,KG +3050801488,3050801503,LB +3050801504,3050801519,LI +3050801520,3050801535,MG +3050801536,3050801663,US +3050801664,3050801679,MT +3050801680,3050801695,MQ +3050801696,3050801711,MU +3050801712,3050801727,MX +3050801728,3050801743,MC +3050801744,3050801759,ME +3050801760,3050801775,NC +3050801776,3050801791,NI +3050801792,3050802175,US +3050802176,3050802191,OM +3050802192,3050802207,PK +3050802208,3050802223,PE +3050802224,3050802239,PH +3050802240,3050802255,PR +3050802256,3050802271,QA +3050802272,3050802287,LC +3050802288,3050802303,RS +3050802304,3050802431,US +3050802432,3050802447,SC +3050802448,3050802463,SI +3050802464,3050802479,KR +3050802480,3050802495,LK +3050802496,3050802511,TW +3050802512,3050802527,TT +3050802528,3050802543,UY +3050802544,3050802559,VE +3050802560,3050831871,US 3050831872,3051356159,BR 3051356160,3051372543,CR 3051372544,3051372799,PA @@ -56221,6 +57301,7 @@ 3068723200,3068919807,TW 3068919808,3068948479,JP 3068948480,3068949503,VN +3068949504,3068950527,AU 3068950528,3068952575,NZ 3068952576,3068985343,CN 3068985344,3068986367,HK @@ -56320,13 +57401,23 @@ 3082174464,3082178559,BZ 3082178560,3082178823,HK 3082178824,3082178824,SG -3082178825,3082179583,HK +3082178825,3082179047,HK +3082179048,3082179055,SG +3082179056,3082179583,HK 3082179584,3082181631,IN 3082181632,3082182655,ID 3082182656,3082190847,LA 3082190848,3082289151,JP 3082289152,3087007743,CN -3087007744,3088605183,US +3087007744,3088449535,US +3088449536,3088462847,TH +3088462848,3088463103,US +3088463104,3088474111,TH +3088474112,3088478207,US +3088478208,3088489471,TH +3088489472,3088489727,US +3088489728,3088506879,TH +3088506880,3088605183,US 3088605184,3088609279,NL 3088609280,3088629759,US 3088629760,3088633855,NL @@ -56392,7 +57483,9 @@ 3090387968,3090388479,NL 3090388480,3090389503,US 3090389504,3090389631,CA -3090389632,3090415103,US +3090389632,3090401791,US +3090401792,3090402047,IN +3090402048,3090415103,US 3090415104,3090415615,NL 3090415616,3091202047,US 3091202048,3091726335,CA @@ -56400,7 +57493,9 @@ 3091955712,3091959807,CA 3091959808,3091976191,US 3091976192,3091980287,CA -3091980288,3092559359,US +3091980288,3092381695,US +3092381696,3092439039,TH +3092439040,3092559359,US 3092559360,3092559615,NL 3092559616,3092567039,US 3092567040,3092568063,NL @@ -56454,7 +57549,19 @@ 3093282816,3093299199,CA 3093299200,3093908991,US 3093908992,3093909247,PR -3093909248,3094020095,US +3093909248,3093909528,US +3093909529,3093909529,AT +3093909530,3093909597,US +3093909598,3093909598,DE +3093909599,3093909656,US +3093909657,3093909657,FR +3093909658,3093909812,US +3093909813,3093909813,AT +3093909814,3093943785,US +3093943786,3093943786,CZ +3093943787,3093945989,US +3093945990,3093945990,AT +3093945991,3094020095,US 3094020096,3094023303,CA 3094023304,3094023311,BD 3094023312,3094032759,CA @@ -56491,18 +57598,7 @@ 3098107136,3098107391,FR 3098107392,3098107647,EU 3098107648,3098107903,SE -3098107904,3098108159,US -3098108160,3098108415,IL -3098108416,3098108671,US -3098108672,3098108927,SG -3098108928,3098109183,JP -3098109184,3098109439,AU -3098109440,3098109695,HK -3098109696,3098110719,QA -3098110720,3098111743,IT -3098111744,3098113023,US -3098113024,3098113535,AU -3098113536,3098148863,US +3098107904,3098148863,US 3098148864,3098165247,JM 3098165248,3098181631,US 3098181632,3098185727,CA @@ -56561,6 +57657,9 @@ 3103861760,3103862015,ME 3103862016,3103862271,MD 3103862272,3103862527,IT +3103862528,3103862783,FR +3103862784,3103863039,DE +3103863040,3103863295,RU 3103916032,3103917055,CH 3103917056,3103918079,IT 3103918080,3103919103,DE @@ -56573,7 +57672,9 @@ 3103924224,3103924479,DE 3103924480,3103925247,RU 3103925248,3103926271,PL -3103926272,3103927295,CZ +3103926272,3103926783,CZ +3103926784,3103927039,SK +3103927040,3103927295,CZ 3103927296,3103929343,NL 3103929344,3103930367,BE 3103930368,3103931391,DE @@ -57593,7 +58694,24 @@ 3105008640,3105009663,CH 3105009664,3105010687,PL 3105010688,3105011711,AT -3105011712,3105012735,CY +3105011712,3105012229,CY +3105012230,3105012230,US +3105012231,3105012231,CY +3105012232,3105012235,US +3105012236,3105012257,CY +3105012258,3105012258,US +3105012259,3105012259,CY +3105012260,3105012267,US +3105012268,3105012485,CY +3105012486,3105012486,GB +3105012487,3105012487,CY +3105012488,3105012491,GB +3105012492,3105012543,CY +3105012544,3105012557,DE +3105012558,3105012559,US +3105012560,3105012560,CY +3105012561,3105012563,DE +3105012564,3105012735,CY 3105012736,3105013759,GL 3105013760,3105014783,SE 3105014784,3105015807,ES @@ -58704,7 +59822,9 @@ 3106146304,3106147327,GB 3106147328,3106148351,FR 3106148352,3106149375,AT -3106149376,3106150399,EU +3106149376,3106149631,EU +3106149632,3106149887,DE +3106149888,3106150399,EU 3106150400,3106151423,GB 3106151424,3106152447,NO 3106152448,3106153471,GB @@ -58851,7 +59971,8 @@ 3106299904,3106300927,GB 3106300928,3106301951,NL 3106301952,3106302975,GB -3106302976,3106303999,CZ +3106302976,3106303231,A2 +3106303232,3106303999,CZ 3106304000,3106305023,GB 3106305024,3106306047,DE 3106306048,3106307071,NO @@ -59158,7 +60279,9 @@ 3106599936,3106601983,CH 3106601984,3106603007,DE 3106603008,3106604031,BE -3106604032,3106605055,DE +3106604032,3106604543,DE +3106604544,3106604799,RU +3106604800,3106605055,DE 3106605056,3106606079,RU 3106606080,3106607103,AT 3106607104,3106608127,IT @@ -59272,7 +60395,9 @@ 3106716672,3106717695,CZ 3106717696,3106718719,TR 3106718720,3106719743,CH -3106719744,3106720767,DE +3106719744,3106720245,DE +3106720246,3106720246,US +3106720247,3106720767,DE 3106720768,3106722815,AT 3106722816,3106723839,IT 3106723840,3106724863,PL @@ -59618,7 +60743,7 @@ 3107085312,3107086335,NL 3107086336,3107087359,EE 3107087360,3107088383,IE -3107088384,3107089407,NL +3107088384,3107089407,BR 3107089408,3107090431,IT 3107090432,3107091455,FR 3107091456,3107092479,ES @@ -59732,7 +60857,6 @@ 3107204096,3107205119,FR 3107205120,3107206143,BG 3107206144,3107207167,NL -3107207168,3107208191,DE 3107208192,3107209215,NL 3107209216,3107210239,IT 3107210240,3107213311,RU @@ -59746,7 +60870,9 @@ 3107220480,3107221503,GB 3107221504,3107222527,IT 3107222528,3107223551,IQ -3107223552,3107224575,AT +3107223552,3107224063,AT +3107224064,3107224319,DE +3107224320,3107224575,AT 3107224576,3107225599,FR 3107225600,3107226623,AZ 3107226624,3107227647,RU @@ -59832,7 +60958,9 @@ 3107316736,3107317759,KG 3107317760,3107318783,RU 3107318784,3107318799,IE -3107318800,3107319807,NL +3107318800,3107319039,NL +3107319040,3107319295,GB +3107319296,3107319807,NL 3107319808,3107320831,OM 3107320832,3107321855,SA 3107321856,3107322879,NL @@ -60344,10 +61472,7 @@ 3107826688,3107827711,RU 3107827712,3107828735,FR 3107828736,3107829759,IT -3107829760,3107830783,FR -3107830784,3107831639,GB -3107831640,3107831643,FR -3107831644,3107831807,GB +3107829760,3107831807,FR 3107831808,3107832831,RU 3107832832,3107833855,NL 3107833856,3107834879,PS @@ -61555,7 +62680,9 @@ 3109128224,3109128231,DK 3109128232,3109128239,SE 3109128240,3109128247,IS -3109128248,3109128503,NL +3109128248,3109128319,NL +3109128320,3109128383,GB +3109128384,3109128503,NL 3109128504,3109128511,IE 3109128512,3109128719,NL 3109128720,3109128727,GB @@ -61564,7 +62691,9 @@ 3109128744,3109128751,SE 3109128752,3109128759,IE 3109128760,3109128760,IT -3109128761,3109128975,NL +3109128761,3109128831,NL +3109128832,3109128895,BE +3109128896,3109128975,NL 3109128976,3109128983,DK 3109128984,3109128991,SE 3109128992,3109128999,IT @@ -62578,7 +63707,9 @@ 3110182912,3110183935,GB 3110183936,3110184959,RU 3110184960,3110185983,ES -3110185984,3110189055,DE +3110185984,3110187007,DE +3110187008,3110187263,BE +3110187264,3110189055,DE 3110189056,3110190079,FR 3110190080,3110193151,NO 3110193152,3110194175,RU @@ -62955,7 +64086,8 @@ 3110594560,3110595583,DE 3110595584,3110596607,NL 3110596608,3110597631,SE -3110597632,3110600703,RU +3110597632,3110599679,IR +3110599680,3110600703,RU 3110600704,3110601727,GR 3110601728,3110602751,RU 3110602752,3110603775,NL @@ -63008,10 +64140,9 @@ 3110656000,3110657023,GB 3110657024,3110658047,GI 3110658048,3110659071,AT -3110659072,3110660095,IR -3110660096,3110661119,RU +3110659072,3110661119,IR 3110661120,3110662143,ES -3110662144,3110663167,RU +3110662144,3110663167,IR 3110663168,3110664191,LB 3110664192,3110665215,RU 3110665216,3110666239,LB @@ -63110,9 +64241,9 @@ 3110763520,3110764543,AD 3110764544,3110765567,RU 3110765568,3110766591,PL -3110766592,3110767615,RU +3110766592,3110767615,IR 3110767616,3110768639,RS -3110768640,3110769663,RU +3110768640,3110769663,IR 3110769664,3110770687,DE 3110770688,3110771711,NL 3110771712,3110772735,KZ @@ -63146,8 +64277,7 @@ 3110801408,3110802431,ES 3110802432,3110803455,DE 3110803456,3110804479,NL -3110804480,3110805503,RU -3110805504,3110806527,IR +3110804480,3110806527,IR 3110806528,3110809599,NL 3110809600,3110810623,LB 3110810624,3110811647,DE @@ -63188,18 +64318,19 @@ 3110853632,3110854655,DE 3110854656,3110855679,NL 3110855680,3110856703,GB -3110856704,3110857727,KW +3110856704,3110857727,FR 3110857728,3110858751,IT 3110858752,3110859775,RU 3110859776,3110861823,IR -3110861824,3110864895,RU +3110861824,3110862847,UA +3110862848,3110864895,RU 3110864896,3110865919,DE 3110865920,3110866943,GB 3110866944,3110868991,RU 3110868992,3110870015,PS 3110870016,3110871039,CZ 3110871040,3110872063,FR -3110872064,3110873087,ES +3110872064,3110873087,MD 3110873088,3110874111,IE 3110874112,3110875135,GB 3110875136,3110876159,PL @@ -63221,23 +64352,25 @@ 3110894592,3110895615,TR 3110895616,3110896639,IE 3110896640,3110897663,GB -3110897664,3110898687,ES +3110897664,3110898687,MD 3110898688,3110899711,BG -3110899712,3110900735,ES +3110899712,3110900735,MD 3110900736,3110901759,TR -3110901760,3110902783,ES +3110901760,3110902783,MD 3110902784,3110903807,TR -3110903808,3110905855,RU +3110903808,3110904831,RU +3110904832,3110905855,IR 3110905856,3110906879,GB 3110906880,3110907903,DE 3110907904,3110908927,GB -3110908928,3110909951,ES +3110908928,3110909951,MD 3110909952,3110910975,DE 3110910976,3110911999,BG 3110912000,3110914047,RU 3110914048,3110915071,AT 3110915072,3110916095,ES -3110916096,3110918143,RU +3110916096,3110917119,RU +3110917120,3110918143,UA 3110918144,3110919167,DE 3110919168,3110920191,RU 3110920192,3110921215,NL @@ -63295,7 +64428,7 @@ 3110977536,3110978559,JO 3110978560,3110979583,DE 3110979584,3110980607,FR -3110980608,3110982655,RU +3110980608,3110982655,UA 3110982656,3110983679,RO 3110983680,3110984703,PL 3110984704,3110985727,IT @@ -63312,6 +64445,324 @@ 3110996992,3110998015,DE 3110998016,3110999039,ES 3110999040,3111000063,IT +3111000064,3111001087,RO +3111001088,3111002111,IR +3111002112,3111003135,DE +3111003136,3111004159,GG +3111004160,3111005183,DE +3111005184,3111006207,RU +3111006208,3111007231,PL +3111007232,3111008255,GB +3111008256,3111009279,RU +3111009280,3111010303,BG +3111010304,3111012351,ES +3111012352,3111013375,CH +3111013376,3111014399,ES +3111014400,3111015423,DK +3111015424,3111016447,FR +3111016448,3111017471,CH +3111017472,3111018495,NL +3111018496,3111019519,FR +3111019520,3111020543,CH +3111020544,3111021567,SY +3111021568,3111022591,IL +3111022592,3111023615,NL +3111023616,3111024639,IT +3111024640,3111025663,AT +3111025664,3111026687,DE +3111026688,3111027711,RU +3111027712,3111028735,UA +3111028736,3111029759,AT +3111029760,3111031807,SK +3111031808,3111032831,NO +3111032832,3111033855,DE +3111033856,3111035903,ES +3111035904,3111036927,GE +3111036928,3111037951,RU +3111037952,3111038975,NL +3111038976,3111041023,GB +3111041024,3111042047,CH +3111042048,3111043071,GB +3111043072,3111044095,FR +3111044096,3111045119,CH +3111045120,3111046143,NL +3111046144,3111047167,CZ +3111047168,3111048191,RU +3111048192,3111049215,ES +3111049216,3111050239,IR +3111050240,3111051263,CH +3111051264,3111052287,ES +3111052288,3111053311,IR +3111053312,3111054335,SA +3111054336,3111055359,IR +3111055360,3111056383,TR +3111056384,3111057407,IR +3111057408,3111058431,GB +3111058432,3111059455,IR +3111059456,3111060479,ES +3111060480,3111061503,LB +3111061504,3111063551,IR +3111063552,3111064575,FR +3111064576,3111065599,GB +3111065600,3111066623,RU +3111066624,3111067647,NL +3111067648,3111068671,DE +3111068672,3111069695,IS +3111069696,3111070719,IR +3111070720,3111071743,FR +3111071744,3111072767,UA +3111072768,3111074815,FR +3111074816,3111075839,DE +3111075840,3111076863,IR +3111076864,3111077887,AZ +3111077888,3111078911,NL +3111078912,3111079935,IT +3111079936,3111080959,NL +3111080960,3111081983,RU +3111081984,3111083007,HU +3111083008,3111084031,UA +3111084032,3111085055,CZ +3111085056,3111086079,RU +3111086080,3111087103,KZ +3111087104,3111088127,CZ +3111088128,3111089151,IE +3111089152,3111090175,UA +3111090176,3111091199,NL +3111091200,3111092223,AT +3111092224,3111093247,IR +3111093248,3111094271,PL +3111094272,3111095295,IR +3111095296,3111096319,IE +3111096320,3111097343,AT +3111097344,3111098367,ES +3111098368,3111099391,SE +3111099392,3111100415,CH +3111100416,3111101439,LB +3111101440,3111102463,UA +3111102464,3111103487,DE +3111103488,3111104511,DK +3111104512,3111105535,CH +3111105536,3111106559,LT +3111106560,3111107583,ES +3111107584,3111108607,HR +3111108608,3111109631,DE +3111109632,3111110655,BE +3111110656,3111111679,NL +3111111680,3111112703,BE +3111112704,3111113727,HU +3111113728,3111114751,BG +3111114752,3111115775,RU +3111115776,3111116799,DE +3111116800,3111117823,GB +3111117824,3111118847,ES +3111118848,3111119871,TR +3111119872,3111120895,FR +3111120896,3111121919,SE +3111121920,3111122943,TR +3111122944,3111123967,IT +3111123968,3111126015,ES +3111126016,3111127039,IT +3111127040,3111128063,CH +3111128064,3111129087,UA +3111129088,3111130111,FR +3111130112,3111131135,RS +3111131136,3111132159,NO +3111132160,3111133183,CZ +3111133184,3111135231,IR +3111135232,3111136255,PL +3111136256,3111137279,DE +3111137280,3111138303,LI +3111138304,3111139327,CH +3111139328,3111140351,RU +3111140352,3111141375,IT +3111141376,3111142399,NL +3111142400,3111143423,DE +3111143424,3111144447,CH +3111144448,3111145471,ES +3111145472,3111146495,RU +3111146496,3111149567,IT +3111149568,3111150591,GB +3111150592,3111151615,RU +3111151616,3111152639,OM +3111152640,3111153663,NL +3111153664,3111154687,SE +3111154688,3111155711,PL +3111155712,3111156735,UA +3111156736,3111157759,DE +3111157760,3111158783,IR +3111158784,3111159807,CH +3111159808,3111160831,SE +3111160832,3111161855,RU +3111161856,3111162879,IS +3111162880,3111163903,IR +3111163904,3111164927,DE +3111164928,3111165951,HU +3111165952,3111166975,GB +3111166976,3111167999,CZ +3111168000,3111169023,IR +3111169024,3111170047,UA +3111170048,3111171071,DE +3111171072,3111172095,PL +3111172096,3111173119,RO +3111173120,3111174143,IQ +3111174144,3111175167,AZ +3111175168,3111176191,IT +3111176192,3111177215,YE +3111177216,3111178239,IS +3111178240,3111179263,DK +3111179264,3111180287,IT +3111180288,3111181311,DE +3111181312,3111182335,GB +3111182336,3111183359,RU +3111183360,3111184383,FR +3111184384,3111185407,IQ +3111185408,3111186431,RU +3111186432,3111189503,GB +3111189504,3111190527,DE +3111190528,3111191551,GB +3111191552,3111192575,DE +3111192576,3111193599,TR +3111193600,3111194623,RU +3111194624,3111195647,GB +3111195648,3111196671,CH +3111196672,3111197695,GB +3111197696,3111198719,RU +3111198720,3111199743,PL +3111199744,3111200767,KZ +3111200768,3111201791,ES +3111201792,3111202815,SK +3111202816,3111203839,FR +3111203840,3111204863,NL +3111204864,3111205887,IR +3111205888,3111206911,GB +3111206912,3111207935,FR +3111207936,3111208959,GB +3111208960,3111211007,RU +3111211008,3111212031,GB +3111212032,3111214079,NL +3111214080,3111215103,GB +3111215104,3111216127,SE +3111216128,3111217151,AT +3111217152,3111218175,IR +3111218176,3111219199,RU +3111219200,3111220223,IR +3111220224,3111221247,RU +3111221248,3111223295,DE +3111223296,3111224319,GB +3111224320,3111225343,KZ +3111225344,3111226367,RU +3111226368,3111227391,PT +3111227392,3111228415,DE +3111228416,3111230463,IR +3111230464,3111231487,PT +3111231488,3111232511,FR +3111232512,3111233535,DE +3111233536,3111234559,LV +3111234560,3111235583,NL +3111235584,3111236607,SE +3111236608,3111237631,GB +3111237632,3111238655,ES +3111238656,3111239679,GB +3111239680,3111240703,ES +3111240704,3111241727,NL +3111241728,3111242751,RU +3111242752,3111243775,GB +3111243776,3111244799,RU +3111244800,3111245823,NL +3111245824,3111246847,GB +3111246848,3111247871,TR +3111247872,3111248895,NL +3111248896,3111249919,DK +3111249920,3111250943,IE +3111250944,3111251967,ES +3111251968,3111252991,GB +3111252992,3111254015,RU +3111254016,3111255039,IE +3111255040,3111256063,EE +3111256064,3111257087,IT +3111257088,3111259135,FR +3111259136,3111261183,DE +3111261184,3111262207,TR +3111262208,3111266303,NL +3111266304,3111267327,DE +3111267328,3111268351,DK +3111268352,3111269375,BE +3111269376,3111270399,RO +3111270400,3111271423,NO +3111271424,3111272447,NL +3111272448,3111273471,ES +3111273472,3111274495,SA +3111274496,3111275519,IR +3111275520,3111276543,NL +3111276544,3111277567,IT +3111277568,3111278591,RO +3111278592,3111279615,LB +3111279616,3111280639,PL +3111280640,3111281663,GB +3111281664,3111282687,FR +3111282688,3111283711,SE +3111283712,3111284735,IT +3111284736,3111285759,AL +3111285760,3111286783,IT +3111286784,3111287807,IL +3111287808,3111288831,DE +3111288832,3111289855,FR +3111289856,3111290879,DE +3111290880,3111291903,UA +3111291904,3111292927,NL +3111292928,3111293951,SI +3111293952,3111294975,GB +3111294976,3111295999,US +3111296000,3111297023,NL +3111297024,3111298047,IE +3111298048,3111299071,NL +3111299072,3111300095,DE +3111300096,3111301119,ES +3111301120,3111302143,EE +3111302144,3111303167,BG +3111303168,3111304191,NL +3111304192,3111305215,IR +3111305216,3111306239,TR +3111306240,3111307263,NL +3111307264,3111308287,DE +3111308288,3111309311,GB +3111309312,3111310335,CH +3111310336,3111313407,DE +3111313408,3111314431,AT +3111314432,3111315455,GB +3111315456,3111316479,IT +3111316480,3111317503,NL +3111317504,3111318527,SY +3111318528,3111319551,RU +3111319552,3111320575,SE +3111320576,3111321599,LB +3111321600,3111322623,CZ +3111322624,3111323647,GE +3111323648,3111324671,CZ +3111324672,3111325695,MT +3111325696,3111326719,FI +3111326720,3111327743,HU +3111327744,3111328767,DE +3111328768,3111329791,RO +3111329792,3111330815,NL +3111330816,3111331839,UA +3111331840,3111332863,TR +3111332864,3111333887,PL +3111333888,3111334911,DE +3111334912,3111335935,ES +3111335936,3111336959,HR +3111336960,3111337983,GB +3111337984,3111339007,RO +3111339008,3111340031,GB +3111340032,3111341055,CZ +3111341056,3111342079,IR +3111342080,3111343103,DE +3111343104,3111344127,GB +3111344128,3111345151,NL +3111345152,3111346175,RO +3111346176,3111347199,RU +3111347200,3111348223,LB +3111348224,3111349247,DE 3113710318,3113710318,CA 3120562176,3120594943,CO 3120594944,3120599039,AR @@ -64128,7 +65579,9 @@ 3164973424,3164973663,FR 3164973664,3164973695,GB 3164973696,3164974335,FR -3164974336,3164974463,GB +3164974336,3164974437,GB +3164974438,3164974438,IT +3164974439,3164974463,GB 3164974464,3164974527,FR 3164974528,3164974559,ES 3164974560,3164974651,FR @@ -64224,9 +65677,7 @@ 3167784960,3167797247,IR 3167797248,3167798271,MD 3167798272,3167799295,RO -3167799296,3167800319,MD -3167800320,3167801343,RO -3167801344,3167803391,MD +3167799296,3167803391,MD 3167803392,3167804159,RO 3167804160,3167804415,ES 3167804416,3167805439,GB @@ -64293,7 +65744,9 @@ 3168018688,3168020479,RO 3168020480,3168022527,MD 3168022528,3168034815,IR -3168034816,3168038911,RO +3168034816,3168037887,RO +3168037888,3168038399,SE +3168038400,3168038911,RO 3168038912,3168039935,MD 3168039936,3168040959,BE 3168040960,3168050431,RO @@ -64341,15 +65794,19 @@ 3168137472,3168137727,MD 3168137728,3168137983,EU 3168137984,3168138239,NL -3168138240,3168139263,RO +3168138240,3168139263,MD 3168139264,3168141311,GB 3168141312,3168143615,RO 3168143616,3168143871,UA -3168143872,3168145151,RO +3168143872,3168144383,RO +3168144384,3168144639,SG +3168144640,3168145151,RO 3168145152,3168145407,UA 3168145408,3168147455,RO 3168147456,3168147967,FR -3168147968,3168155135,RO +3168147968,3168154111,RO +3168154112,3168154367,SG +3168154368,3168155135,RO 3168155136,3168155391,IT 3168155392,3168156671,RO 3168156672,3168157695,MD @@ -64393,13 +65850,16 @@ 3168239616,3168243711,IR 3168243712,3168247807,RO 3168247808,3168264191,IR -3168264192,3168265983,RO +3168264192,3168265727,RO +3168265728,3168265855,FR +3168265856,3168265983,RO 3168265984,3168266239,GR -3168266240,3168268287,RO -3168268288,3168269311,MD +3168266240,3168267263,RO +3168267264,3168269311,MD 3168269312,3168270591,RO 3168270592,3168270847,MD -3168270848,3168272383,RO +3168270848,3168271359,RO +3168271360,3168272383,MD 3168272384,3168534527,IT 3168534528,3168796671,GB 3168796672,3168829439,FR @@ -64436,7 +65896,9 @@ 3169648640,3169714175,MD 3169714176,3169779711,FI 3169779712,3169845247,UA -3169845248,3169863167,RO +3169845248,3169854463,RO +3169854464,3169854719,ES +3169854720,3169863167,RO 3169863168,3169863423,MD 3169863424,3169869823,RO 3169869824,3169878015,MD @@ -64451,7 +65913,9 @@ 3169899264,3169899391,CN 3169899392,3169899519,TW 3169899520,3169899775,IR -3169899776,3169905663,RO +3169899776,3169902079,RO +3169902080,3169902591,SE +3169902592,3169905663,RO 3169905664,3169906687,ES 3169906688,3169913855,RO 3169913856,3169914111,GB @@ -65134,7 +66598,8 @@ 3194806272,3194814463,AR 3194814464,3194818559,PA 3194818560,3194830847,AR -3194830848,3194839039,PA +3194830848,3194831871,BR +3194831872,3194839039,PA 3194839040,3194863615,CO 3194863616,3194871807,HN 3194871808,3194879999,BO @@ -65221,7 +66686,9 @@ 3195205632,3195206655,PE 3195206656,3195207679,CL 3195207680,3195211775,GT -3195211776,3195215871,BZ +3195211776,3195214988,BZ +3195214989,3195214989,RU +3195214990,3195215871,BZ 3195215872,3195224063,AR 3195224064,3195232255,PA 3195232256,3195234559,CR @@ -67146,7 +68613,7 @@ 3226141952,3226143487,CA 3226143488,3226143743,US 3226143744,3226146559,CA -3226146560,3226146815,FR +3226146560,3226146815,US 3226146816,3226156543,CA 3226156544,3226156799,US 3226156800,3226157567,CA @@ -67177,8 +68644,8 @@ 3226237696,3226240255,DE 3226240256,3226240511,US 3226240512,3226241535,DE -3226241536,3226241791,AT -3226241792,3226248447,DE +3226241536,3226241791,NL +3226241792,3226248191,DE 3226248448,3226248703,IE 3226248704,3226250495,DE 3226250496,3226251263,US @@ -68122,11 +69589,12 @@ 3228406016,3228406271,US 3228406272,3228406527,IN 3228406528,3228407039,FR -3228407040,3228424703,DE +3228407296,3228424447,DE 3228424704,3228424959,US -3228425216,3228430847,DE +3228425216,3228430335,DE +3228430592,3228430847,DE 3228430848,3228431103,MU -3228431360,3228434431,DE +3228431872,3228434431,DE 3228434432,3228456191,US 3228456192,3228456447,CA 3228456448,3228457471,US @@ -68927,6 +70395,7 @@ 3231093248,3231093503,NL 3231093504,3231101183,US 3231101184,3231103231,GB +3231103232,3231103487,CA 3231103488,3231103999,US 3231104000,3231104255,NO 3231104256,3231104767,DE @@ -68953,8 +70422,7 @@ 3231113984,3231115775,GB 3231115776,3231116799,AU 3231116800,3231117055,HU -3231117056,3231118335,US -3231118592,3231118847,US +3231117056,3231118847,US 3231118848,3231119103,AU 3231119104,3231119359,US 3231119360,3231119615,GB @@ -69028,6 +70496,7 @@ 3231225600,3231225855,DE 3231225856,3231226879,US 3231226880,3231227135,GB +3231227136,3231227391,US 3231227392,3231227647,CA 3231227648,3231228927,US 3231228928,3231229183,PR @@ -69045,7 +70514,9 @@ 3231237632,3231241215,US 3231241216,3231241471,AU 3231241472,3231241727,CA -3231241728,3231248639,US +3231241728,3231244287,US +3231244288,3231244543,CA +3231244544,3231248639,US 3231248640,3231248895,NL 3231248896,3231249407,US 3231249408,3231249663,GB @@ -69407,7 +70878,7 @@ 3231906048,3231907839,RU 3231907840,3231912959,US 3231912960,3231913215,AP -3231913472,3231916031,US +3231913216,3231916031,US 3231916032,3231948799,FI 3231948800,3231973375,US 3231973376,3232038911,AT @@ -69496,26 +70967,27 @@ 3232407040,3232407551,SG 3232407552,3232432383,US 3232432384,3232433663,EU -3232433920,3232440319,US +3232433664,3232440319,US 3232440320,3232448511,CA 3232448512,3232461311,US 3232461312,3232461823,CA 3232461824,3232462847,US 3232462848,3232464895,BB 3232464896,3232483327,GB -3232483328,3232555007,US -3232555264,3232555775,US +3232483328,3232555775,US 3232555776,3232557055,JP 3232557056,3232557311,AU 3232557312,3232557567,US -3232557568,3232560127,JP +3232557568,3232559103,JP +3232559104,3232559359,US +3232559360,3232560127,JP 3232560896,3232561663,US 3232561664,3232561919,CA 3232561920,3232562431,US 3232562432,3232562687,NL 3232562688,3232562943,CA -3232562944,3232563199,US -3232563200,3232564479,GB +3232562944,3232563455,US +3232563456,3232564479,GB 3232564480,3232567295,US 3232567296,3232569599,NZ 3232569600,3232570367,US @@ -69587,7 +71059,9 @@ 3233484800,3233487359,ES 3233487360,3233487871,US 3233487872,3233488895,CA -3233488896,3233548799,US +3233488896,3233546751,US +3233546752,3233547007,CA +3233547008,3233548799,US 3233548800,3233549055,NL 3233549056,3233549311,BR 3233549312,3233557247,US @@ -69604,7 +71078,8 @@ 3233564928,3233566719,JP 3233567744,3233567999,US 3233568000,3233568767,JP -3233568768,3233569791,AU +3233568768,3233569023,CA +3233569024,3233569535,AU 3233569792,3233570047,JP 3233570048,3233570815,US 3233570816,3233571071,GB @@ -69618,9 +71093,9 @@ 3233575680,3233575935,AU 3233575936,3233576191,RU 3233576192,3233576447,GB -3233576448,3233576959,US -3233576960,3233577983,NL -3233577984,3233578239,US +3233576448,3233577215,US +3233577216,3233577727,NL +3233577728,3233578239,US 3233578240,3233578495,NL 3233578496,3233578751,US 3233578752,3233579007,NL @@ -69656,7 +71131,7 @@ 3233607168,3233607935,US 3233607936,3233608191,AU 3233608192,3233609727,HU -3233609728,3233611775,US +3233609728,3233612031,US 3233612032,3233612287,NL 3233612288,3233613823,US 3233613824,3233614847,GB @@ -69711,7 +71186,8 @@ 3233654272,3233655551,GB 3233655552,3233663487,US 3233663488,3233663999,NL -3233664000,3233665023,US +3233664000,3233664255,CA +3233664256,3233665023,US 3233665024,3233666047,AU 3233666048,3233668863,US 3233668864,3233669119,AU @@ -69719,7 +71195,9 @@ 3233670400,3233670655,AU 3233671168,3233676031,US 3233676032,3233676287,NL -3233676288,3233684991,US +3233676288,3233677311,US +3233677312,3233677567,CA +3233677568,3233684991,US 3233684992,3233685247,MX 3233685248,3233685503,BR 3233685504,3233688575,US @@ -69737,7 +71215,7 @@ 3233694976,3233695231,FR 3233695232,3233696511,US 3233696512,3233696767,CA -3233696768,3233701375,US +3233696768,3233701631,US 3233701632,3233701887,NL 3233701888,3233704959,US 3233704960,3233705215,NZ @@ -69833,19 +71311,19 @@ 3233936640,3233936895,EU 3233936896,3233939455,US 3233939456,3234004991,FI +3234004992,3234005247,US 3234005248,3234005503,GB 3234005504,3234005759,AU +3234005760,3234006015,CA 3234006016,3234007039,US 3234007040,3234007295,NL 3234007296,3234007551,US 3234007552,3234007807,AU 3234007808,3234008063,US 3234008064,3234008831,NZ -3234008832,3234013183,US -3234013440,3234013695,US +3234008832,3234013695,US 3234013696,3234013951,AU -3234013952,3234014207,US -3234014464,3234014975,US +3234013952,3234014975,US 3234014976,3234015487,AU 3234015488,3234015743,US 3234015744,3234015999,IE @@ -69860,7 +71338,7 @@ 3234031360,3234031871,US 3234031872,3234032127,GB 3234032128,3234032383,NL -3234032384,3234032895,US +3234032384,3234033151,US 3234033152,3234033407,NL 3234033408,3234033663,US 3234033664,3234033919,AU @@ -69882,15 +71360,21 @@ 3234054912,3234055167,NL 3234055168,3234055423,US 3234055424,3234055679,AU -3234055680,3234061055,US +3234055680,3234056959,US +3234056960,3234057215,CA +3234057216,3234061055,US 3234061056,3234061311,AU 3234061312,3234064639,US 3234064640,3234064895,AU 3234064896,3234065407,US 3234065408,3234065663,NL 3234065664,3234065919,BR -3234065920,3234070527,US -3234070528,3234110463,FR +3234065920,3234069247,US +3234069248,3234069503,CA +3234069504,3234070271,US +3234070272,3234070527,CA +3234070528,3234070783,US +3234070784,3234110463,FR 3234110464,3234128455,US 3234128456,3234128463,GB 3234128464,3234130695,US @@ -69900,7 +71384,9 @@ 3234131192,3234136063,US 3234136064,3234150911,CA 3234150912,3234151423,US -3234151424,3234159615,CA +3234151424,3234158847,CA +3234158848,3234159103,US +3234159104,3234159615,CA 3234159616,3234160127,US 3234160128,3234164991,CA 3234164992,3234165247,US @@ -69912,10 +71398,14 @@ 3234176000,3234177279,US 3234177280,3234187007,CA 3234187008,3234187519,US -3234187520,3234192383,CA +3234187520,3234189055,CA +3234189056,3234189311,US +3234189312,3234192383,CA 3234192384,3234193663,US -3234193664,3234201599,CA -3234201600,3234203647,US +3234193664,3234198783,CA +3234198784,3234199039,US +3234199040,3234201343,CA +3234201344,3234203647,US 3234203648,3234205183,BR 3234205184,3234205439,AR 3234205440,3234205695,BR @@ -69933,7 +71423,9 @@ 3234238976,3234239231,MY 3234239232,3234240255,US 3234240256,3234240511,EU -3234240512,3234270207,US +3234240512,3234267135,US +3234267136,3234267391,CA +3234267392,3234270207,US 3234270208,3234271231,CA 3234271232,3234275327,PT 3234275328,3234279423,AU @@ -69949,7 +71441,11 @@ 3234340096,3234340351,IN 3234340352,3234349055,US 3234349056,3234353151,NZ -3234353152,3234549759,US +3234353152,3234529279,US +3234529280,3234529535,PR +3234529536,3234538751,US +3234538752,3234539007,TC +3234539520,3234549759,US 3234549760,3234550015,RU 3234553856,3234554367,US 3234554624,3234554879,AU @@ -69978,29 +71474,30 @@ 3234583808,3234584063,AU 3234584064,3234584575,US 3234584576,3234584831,AU -3234584832,3234585343,US -3234585600,3234587391,US +3234584832,3234587391,US 3234587392,3234587647,NL 3234587648,3234588671,US 3234588672,3234588927,AU 3234588928,3234589439,US 3234589440,3234589695,AU -3234589696,3234592511,US +3234589696,3234590463,US +3234590464,3234590719,CA +3234590720,3234592511,US 3234592512,3234592767,AU -3234592768,3234725887,US +3234592768,3234726143,US 3234726144,3234726399,CA 3234726400,3234726911,US 3234726912,3234727935,CA 3234727936,3234733055,US 3234733056,3234733311,CA -3234733312,3234739455,US +3234733312,3234739711,US 3234739712,3234740223,CA 3234740224,3234745599,US 3234745600,3234746879,GB 3234746880,3234747903,US 3234747904,3234748159,NL -3234748160,3234749439,US -3234749440,3234750463,CA +3234748160,3234749695,US +3234749696,3234750207,CA 3234750464,3234751999,US 3234752000,3234752255,AU 3234752256,3234753535,US @@ -70012,12 +71509,12 @@ 3234764800,3234766335,NZ 3234766336,3234772223,US 3234772224,3234772479,CA -3234772480,3234772735,US -3234772992,3234781439,US +3234772480,3234781439,US 3234781440,3234781951,CA 3234781952,3234782719,US 3234782720,3234783999,IL 3234784000,3234794495,US +3234794496,3234794751,CA 3234794752,3234795007,US 3234795008,3234795263,NL 3234795264,3234799359,US @@ -70030,7 +71527,7 @@ 3234801664,3234802431,EC 3234802432,3234803711,US 3234803712,3234803967,PR -3234804224,3234806783,US +3234803968,3234806783,US 3234806784,3234807295,CA 3234807552,3234807807,US 3234807808,3234808063,AU @@ -70043,8 +71540,7 @@ 3234816000,3234816767,AU 3234816768,3234820351,US 3234820352,3234820607,AU -3234820608,3234820863,US -3234821120,3234821887,US +3234820608,3234821887,US 3234821888,3234822655,AU 3234822656,3234826751,US 3234826752,3234827007,CA @@ -70076,17 +71572,19 @@ 3234853888,3234854143,EC 3234854144,3234854911,US 3234854912,3234855167,AU -3234855168,3234855935,US -3234856192,3234856447,US +3234855168,3234856447,US 3234856448,3234856703,AU -3234856960,3234861055,CA -3234861056,3234988031,US -3234988032,3234991103,CA -3234991104,3235004415,US +3234856704,3234857215,US +3234857216,3234861055,CA +3234861056,3234988287,US +3234988288,3234990847,CA +3234990848,3235004415,US 3235004416,3235021823,CA 3235021824,3235026943,US 3235026944,3235027967,CA -3235027968,3235045375,US +3235027968,3235044375,US +3235044376,3235044383,GB +3235044384,3235045375,US 3235045376,3235045887,CA 3235045888,3235065343,US 3235065344,3235065855,CA @@ -70103,10 +71601,16 @@ 3235389440,3235389951,VE 3235389952,3235512319,US 3235512320,3235577855,JP -3235577856,3235643391,CA -3235643392,3235774463,US -3235774464,3235776767,CA -3235777024,3235800319,US +3235577856,3235643135,CA +3235643136,3235745791,US +3235745792,3235745792,DE +3235745793,3235747839,US +3235747840,3235748095,GB +3235748096,3235748351,US +3235748352,3235748607,GB +3235748608,3235774719,US +3235774720,3235776767,CA +3235776768,3235800575,US 3235800576,3235801087,CA 3235801088,3235807231,US 3235807232,3235839999,CA @@ -70184,7 +71688,8 @@ 3236044800,3236052991,CA 3236052992,3236069375,US 3236069376,3236102143,CA -3236102144,3236106239,PH +3236102144,3236102399,US +3236102400,3236106239,PH 3236106240,3236140031,US 3236140032,3236142079,CA 3236142080,3236142335,US @@ -70195,8 +71700,8 @@ 3236143007,3236143103,CA 3236143104,3236163519,US 3236163520,3236163583,IE -3236163584,3236167679,US -3236167680,3236175871,CA +3236163584,3236167935,US +3236167936,3236175871,CA 3236175872,3236200447,US 3236200448,3236233215,MY 3236233216,3236237567,US @@ -70211,13 +71716,17 @@ 3236312320,3236312575,GH 3236312576,3236312831,GR 3236312832,3236313087,QA -3236313088,3236368127,US +3236313088,3236365567,US +3236365568,3236365823,CA +3236365824,3236368127,US 3236368128,3236368383,AU 3236368384,3236372991,US 3236372992,3236373247,AU -3236373504,3236379391,US +3236373248,3236373503,US +3236373504,3236373759,BS +3236373760,3236379391,US 3236379392,3236379647,AU -3236379648,3236380927,US +3236379648,3236381183,US 3236381184,3236381439,CA 3236381440,3236381695,NL 3236381696,3236383999,US @@ -70236,7 +71745,7 @@ 3236395008,3236395519,BR 3236395520,3236396799,US 3236396800,3236397055,AU -3236397056,3236398591,US +3236397056,3236398847,US 3236398848,3236399359,AU 3236399616,3236400127,US 3236400128,3236400383,CL @@ -70250,14 +71759,15 @@ 3236409088,3236409599,BR 3236409600,3236411135,US 3236411136,3236411391,AU -3236411392,3236413695,US +3236411392,3236412415,US +3236412416,3236412671,CA +3236412672,3236413695,US 3236413696,3236413951,AU 3236413952,3236416255,US 3236416256,3236416511,AU 3236416512,3236418303,US 3236418304,3236418815,AU -3236418816,3236419071,US -3236419328,3236419583,US +3236418816,3236419583,US 3236419584,3236419839,AU 3236419840,3236420095,US 3236420096,3236420351,AU @@ -70266,16 +71776,18 @@ 3236425216,3236427519,US 3236427520,3236427775,CA 3236427776,3236428031,AU -3236428288,3236429311,US +3236428032,3236429311,US 3236429312,3236429567,MU -3236429824,3236438015,US +3236429568,3236438015,US 3236446208,3236447487,US 3236447488,3236447743,AP 3236447744,3236450047,US 3236450048,3236450303,EU 3236450304,3236462591,US 3236462592,3236470783,AU -3236470784,3236566783,US +3236470784,3236560895,US +3236560896,3236561151,CA +3236561152,3236566783,US 3236566784,3236567039,CA 3236567040,3236575743,US 3236575744,3236575999,AU @@ -70286,8 +71798,9 @@ 3236604928,3236610047,US 3236610560,3236611071,US 3236611072,3236612095,CA -3236612096,3236617471,US -3236617728,3236617983,US +3236612096,3236613119,US +3236613120,3236613375,CA +3236613376,3236617983,US 3236617984,3236619775,CA 3236619776,3236620031,US 3236620032,3236620287,AU @@ -70295,7 +71808,7 @@ 3236623616,3236623871,AU 3236623872,3236625919,US 3236625920,3236626175,CA -3236626432,3236638719,US +3236626176,3236638719,US 3236638720,3236642815,BB 3236642816,3236659199,US 3236659200,3236691967,CA @@ -70329,9 +71842,9 @@ 3236787968,3236788223,JP 3236788224,3236788479,US 3236788480,3236789503,GB -3236789504,3236823039,US -3236823040,3236826111,CH -3236826112,3236827135,CA +3236789504,3236823295,US +3236823296,3236825855,CH +3236825856,3236827135,CA 3236827136,3236828415,US 3236828416,3236828671,A1 3236828672,3236958207,US @@ -70395,14 +71908,13 @@ 3237325056,3237325311,NL 3237325312,3237325823,US 3237325824,3237326079,CA -3237326080,3237328127,US -3237328384,3237328639,US +3237326080,3237328639,US 3237328640,3237328895,CA 3237328896,3237329151,US 3237329152,3237329407,NZ 3237329664,3237330943,US 3237330944,3237331199,AU -3237331456,3237331711,US +3237331200,3237331711,US 3237331968,3237332223,AU 3237332224,3237335039,US 3237335040,3237335295,AU @@ -70419,7 +71931,9 @@ 3237346304,3237366015,US 3237366016,3237366271,AU 3237366272,3237412863,US -3237412864,3237415935,GB +3237412864,3237413119,CA +3237413120,3237415679,GB +3237415680,3237415935,US 3237415936,3237416959,CA 3237416960,3237478399,US 3237478400,3237511167,LK @@ -70441,7 +71955,7 @@ 3237613568,3237614591,CA 3237614592,3237615615,US 3237615616,3237616895,CA -3237617152,3237622015,US +3237616896,3237622015,US 3237622016,3237622271,AP 3237622272,3237634601,US 3237634602,3237634603,EU @@ -70449,7 +71963,9 @@ 3237647104,3237647359,AU 3237647360,3237655039,US 3237655040,3237655551,IN -3237655552,3237681663,US +3237655552,3237675007,US +3237675008,3237675263,CA +3237675264,3237681663,US 3237681664,3237682943,CA 3237682944,3237684991,US 3237684992,3237685247,CL @@ -70470,6 +71986,7 @@ 3237725184,3237725439,CA 3237725440,3237725695,US 3237725696,3237726207,CA +3237726208,3237726463,US 3237726464,3237726719,AU 3237726720,3237726975,GH 3237726976,3237727231,US @@ -70501,7 +72018,7 @@ 3237870592,3237870847,DE 3237870848,3237870975,KR 3237870976,3237871103,JP -3237871104,3237871231,PH +3237871104,3237871231,TH 3237871232,3237871359,TW 3237871360,3237871487,SG 3237871488,3237871615,MY @@ -72712,7 +74229,6 @@ 3244919296,3244919551,SE 3244919552,3244919807,DE 3244919808,3244920063,RO -3244920064,3244920319,RU 3244920320,3244920575,SK 3244920576,3244920831,PL 3244920832,3244921087,NL @@ -73689,7 +75205,11 @@ 3248624384,3248624639,US 3248624640,3248624895,DK 3248624896,3248625151,AP -3248625152,3248719871,DK +3248625152,3248626175,DK +3248626176,3248626176,EU +3248626177,3248626190,DK +3248626191,3248626191,US +3248626192,3248719871,DK 3248719872,3248720127,EU 3248720128,3248748543,DK 3248748544,3248748573,EU @@ -74331,9 +75851,7 @@ 3250748416,3250749439,UA 3250749440,3250749695,GH 3250749696,3250749951,EU -3250750464,3250750537,FR -3250750538,3250750541,EU -3250750542,3250751487,FR +3250750464,3250751487,FR 3250751488,3250751743,DE 3250752000,3250752511,CH 3250752512,3250753023,BG @@ -74440,7 +75958,6 @@ 3251151360,3251151615,DE 3251151872,3251152127,NL 3251152128,3251152639,RO -3251152640,3251152895,UA 3251152896,3251153151,RU 3251153408,3251153663,TR 3251153664,3251153919,FR @@ -74663,7 +76180,9 @@ 3251272448,3251272703,AT 3251272704,3251272959,DE 3251272960,3251273471,FR -3251273472,3251290111,DE +3251273472,3251286015,DE +3251286016,3251288063,US +3251288064,3251290111,SG 3251290112,3251302399,GB 3251302400,3251306239,LI 3251306240,3251306495,EU @@ -75312,11 +76831,17 @@ 3253767676,3253767679,DE 3253767680,3253767711,GB 3253767712,3253767743,DE -3253767744,3253770983,GB +3253767744,3253768565,GB +3253768566,3253768566,DE +3253768567,3253770983,GB 3253770984,3253770984,DE 3253770985,3253771199,GB 3253771200,3253771263,IE -3253771264,3253773055,GB +3253771264,3253772063,GB +3253772064,3253772095,DE +3253772096,3253772191,GB +3253772192,3253772207,DE +3253772208,3253773055,GB 3253773056,3253773311,DE 3253773312,3253796863,GB 3253796864,3253862399,SE @@ -76032,7 +77557,6 @@ 3255615488,3255623679,DE 3255623680,3255631871,BG 3255631872,3255659519,NL -3255659776,3255660031,NL 3255660288,3255660543,GR 3255660544,3255666175,NL 3255666432,3255666687,DE @@ -77987,7 +79511,6 @@ 3264660992,3264661503,CH 3264661504,3264662015,GB 3264662016,3264662527,RU -3264662528,3264663039,UA 3264663040,3264663551,PL 3264663552,3264664063,NL 3264664064,3264664575,DE @@ -79183,7 +80706,6 @@ 3270980864,3270981631,RU 3270981632,3270981887,IT 3270981888,3270982143,AT -3270982144,3270982399,RU 3270982400,3270982655,TR 3270982656,3270982911,UA 3270982912,3270983167,DK @@ -79490,8 +81012,8 @@ 3272217152,3272217215,EU 3272217216,3272217279,BE 3272217280,3272217303,DE -3272217304,3272217319,BE -3272217320,3272217343,EU +3272217304,3272217327,BE +3272217328,3272217343,EU 3272217344,3272217599,GB 3272217600,3272217631,CH 3272217632,3272217855,EU @@ -80916,7 +82438,6 @@ 3275510400,3275510463,NL 3275510464,3275510527,GB 3275510528,3275510559,PL -3275510560,3275510591,DE 3275510592,3275510623,CY 3275510624,3275510655,EE 3275510656,3275510687,FR @@ -81472,7 +82993,9 @@ 3276876384,3276876415,NL 3276876416,3276880427,GB 3276880428,3276880431,DK -3276880432,3276882047,GB +3276880432,3276881811,GB +3276881812,3276881815,FR +3276881816,3276882047,GB 3276882048,3276882687,IT 3276882688,3276883077,GB 3276883078,3276883078,IT @@ -81480,7 +83003,9 @@ 3276883712,3276883839,IT 3276883840,3276886363,GB 3276886364,3276886367,DE -3276886368,3276890175,GB +3276886368,3276886649,GB +3276886650,3276886650,DE +3276886651,3276890175,GB 3276890176,3276890191,US 3276890192,3276892159,GB 3276892160,3276893183,IT @@ -81518,7 +83043,9 @@ 3276912880,3276912895,IT 3276912896,3276917231,GB 3276917232,3276917247,FR -3276917248,3276919375,GB +3276917248,3276919061,GB +3276919062,3276919062,DE +3276919063,3276919375,GB 3276919376,3276919391,DE 3276919392,3276919471,GB 3276919472,3276919479,DE @@ -81690,11 +83217,10 @@ 3277374464,3277375999,RU 3277376000,3277376511,NL 3277376512,3277377023,RO -3277377024,3277378559,RU +3277377024,3277378047,RU 3277378560,3277379071,HR 3277379072,3277379583,UZ 3277379584,3277380095,RS -3277380096,3277380607,RO 3277380608,3277381119,RU 3277381120,3277381631,KW 3277381632,3277382143,RU @@ -83046,7 +84572,9 @@ 3284016384,3284016639,CH 3284016640,3284017151,DK 3284017152,3284025343,GR -3284025344,3284028287,GB +3284025344,3284028139,GB +3284028140,3284028143,US +3284028144,3284028287,GB 3284028288,3284028319,US 3284028320,3284029183,GB 3284029184,3284029199,US @@ -83055,7 +84583,9 @@ 3284030480,3284030495,FR 3284030496,3284030615,GB 3284030616,3284030623,SE -3284030624,3284033535,GB +3284030624,3284030991,GB +3284030992,3284031007,FR +3284031008,3284033535,GB 3284033536,3284041727,RU 3284041728,3284041983,DK 3284041984,3284042239,SI @@ -83302,7 +84832,6 @@ 3285098496,3285114879,GB 3285114880,3285115903,RU 3285115904,3285116415,SI -3285116416,3285116927,CZ 3285116928,3285117439,UA 3285117952,3285118463,FR 3285118464,3285118975,UA @@ -83612,7 +85141,9 @@ 3285964800,3285964935,DE 3285964936,3285965055,EU 3285965056,3285965567,DE -3285965568,3285975039,EU +3285965568,3285968895,EU +3285968896,3285970943,GB +3285970944,3285975039,EU 3285975040,3286013695,FR 3286013696,3286013951,RE 3286013952,3286106111,FR @@ -83721,7 +85252,6 @@ 3286423808,3286424063,CZ 3286424064,3286424319,LV 3286424320,3286424575,FR -3286424576,3286424831,UA 3286424832,3286425087,TR 3286425088,3286425343,RU 3286425344,3286425599,IT @@ -83988,7 +85518,6 @@ 3287444480,3287444991,PL 3287445504,3287446527,UA 3287446528,3287447039,PL -3287447040,3287447551,IL 3287447552,3287448063,DK 3287448064,3287448575,GB 3287448576,3287449087,PL @@ -84536,6 +86065,8 @@ 3289212928,3289213183,ZM 3289213184,3289213439,TZ 3289213440,3289213951,ZA +3289213952,3289214207,MA +3289214208,3289214463,AO 3289214976,3289215231,NG 3289215232,3289217279,ZA 3289217280,3289217535,KE @@ -84558,6 +86089,7 @@ 3289233920,3289234175,TZ 3289234176,3289235199,ZA 3289235200,3289235455,KE +3289235456,3289237503,GH 3289237504,3289237759,ZA 3289238528,3289238783,AO 3289238784,3289239039,ZA @@ -84573,8 +86105,10 @@ 3289248768,3289249023,EG 3289249024,3289249279,NG 3289249280,3289250815,ZA +3289250816,3289251071,GH 3289251072,3289251327,EG 3289251328,3289251583,ZA +3289251584,3289251839,KE 3289251840,3289319423,ZA 3289319424,3289319679,A2 3289319680,3289319935,ZA @@ -84652,6 +86186,7 @@ 3290423296,3290427391,NA 3290427392,3290431487,ZA 3290431488,3290433535,JM +3290435584,3290439679,DZ 3290439680,3290447871,TT 3290447872,3290456063,AR 3290456064,3290460159,MZ @@ -84849,6 +86384,7 @@ 3300925440,3300929535,MG 3300933632,3300950015,MU 3300953088,3300954111,MU +3300954112,3300958207,NG 3300966400,3301113855,ZA 3301113856,3301138431,NG 3301138432,3301140479,ZA @@ -84904,6 +86440,7 @@ 3301474304,3301490687,MA 3301490688,3301494783,ZA 3301494784,3301498879,ZM +3301502976,3301507071,MA 3301507328,3301507583,MU 3301507584,3301507839,GH 3301507840,3301508095,EG @@ -84993,6 +86530,7 @@ 3302545408,3302545919,CD 3302545920,3302546431,TZ 3302546432,3302546943,SL +3302546944,3302547455,KE 3302548480,3302548991,GH 3302548992,3302549503,ZA 3302549504,3302550015,KE @@ -85614,6 +87152,7 @@ 3325131776,3325132031,AU 3325132032,3325132799,US 3325132800,3325133823,CO +3325133824,3325134335,BR 3325134336,3325136127,US 3325136128,3325136383,CA 3325136384,3325142015,US @@ -85986,8 +87525,7 @@ 3330640896,3330641151,CH 3330641152,3330646527,US 3330646528,3330647295,CA -3330647296,3330647807,US -3330648064,3330649599,US +3330647296,3330649599,US 3330649600,3330649855,CA 3330649856,3330662911,US 3330662912,3330663167,GB @@ -86119,6 +87657,7 @@ 3332492032,3332500735,CA 3332500736,3332500991,US 3332500992,3332501247,CA +3332501248,3332501503,US 3332501504,3332503039,CA 3332503040,3332503551,US 3332503552,3332505343,CA @@ -86175,8 +87714,8 @@ 3332876288,3332882431,US 3332882432,3332890623,KN 3332890624,3332897279,US -3332897280,3332898559,CA -3332898560,3332899071,US +3332897280,3332898815,CA +3332898816,3332899071,US 3332899072,3332906495,CA 3332906496,3332909567,US 3332909568,3332922879,CA @@ -86272,7 +87811,9 @@ 3334007552,3334007807,EU 3334007808,3334020095,US 3334020096,3334021119,CA -3334021120,3334138623,US +3334021120,3334068479,US +3334068480,3334068735,CA +3334068736,3334138623,US 3334138624,3334138879,BM 3334138880,3334187775,US 3334187776,3334188031,BM @@ -86527,7 +88068,11 @@ 3338935040,3338935295,GB 3338935296,3338964991,US 3338964992,3338965247,CA -3338965248,3339075583,US +3338965248,3338976767,US +3338976768,3338977023,CA +3338977024,3338993407,US +3338993408,3338993663,CA +3338993664,3339075583,US 3339075584,3339076863,GB 3339076864,3339077631,JP 3339077632,3339077887,SG @@ -86570,11 +88115,13 @@ 3339261952,3339263999,HK 3339264000,3339327999,US 3339328512,3339329535,CA -3339329536,3339337727,US -3339337984,3339338239,US +3339329536,3339338239,US 3339338240,3339338495,CA -3339338496,3339669503,US +3339338496,3339342847,US +3339342848,3339343103,CA +3339343104,3339669503,US 3339669504,3339671807,CA +3339671808,3339672063,US 3339672576,3339679487,US 3339679488,3339679743,CN 3339679744,3339707391,US @@ -86646,7 +88193,9 @@ 3340677120,3340679167,CA 3340679168,3340694783,US 3340694784,3340695039,CA -3340695040,3340852479,US +3340695040,3340851455,US +3340851456,3340851711,CA +3340851712,3340852479,US 3340852736,3340853247,CA 3340853248,3340857343,US 3340857344,3340858367,CA @@ -86698,9 +88247,10 @@ 3341518848,3341520895,CA 3341520896,3341521663,US 3341521664,3341531135,CA -3341531136,3341534207,US -3341534976,3341537279,CA -3341537280,3341546239,US +3341531136,3341533951,US +3341533952,3341534207,CA +3341534976,3341536767,CA +3341536768,3341546239,US 3341546240,3341547007,CA 3341547008,3341547519,CH 3341547520,3341549567,CA @@ -87184,7 +88734,9 @@ 3351043584,3351044095,CA 3351044096,3351047167,US 3351047168,3351047679,A1 -3351047680,3351071743,US +3351047680,3351058943,US +3351058944,3351059455,CA +3351059456,3351071743,US 3351071744,3351072767,CA 3351072768,3351074815,US 3351074816,3351076863,CA @@ -87321,6 +88873,7 @@ 3351441408,3351441919,US 3351441920,3351442175,CA 3351442176,3351474687,US +3351474688,3351475199,CA 3351475200,3351475711,US 3351475712,3351475967,IS 3351475968,3351483391,US @@ -87395,7 +88948,9 @@ 3352563200,3352563455,US 3352563456,3352573951,CA 3352573952,3352574463,US -3352574464,3352583935,CA +3352574464,3352581631,CA +3352581632,3352582143,US +3352582144,3352583935,CA 3352583936,3352584191,US 3352584192,3352591359,CA 3352591360,3352591615,US @@ -87487,12 +89042,11 @@ 3354955776,3354956031,AR 3354956032,3354972159,US 3354972160,3354972415,CA -3354972416,3355013119,US -3355013120,3355017215,CA +3354972416,3355012607,US +3355012608,3355017215,CA 3355017216,3355052287,US 3355052288,3355053311,CA -3355053312,3355053567,US -3355054080,3355249151,US +3355053312,3355249151,US 3355249152,3355249663,CA 3355249664,3355260927,US 3355260928,3355262719,CA @@ -87724,7 +89278,9 @@ 3355918336,3355923455,EC 3355923456,3355924479,UY 3355924480,3355926527,TT -3355926528,3355930623,PA +3355926528,3355927039,NL +3355927040,3355928063,US +3355928064,3355930623,PA 3355930624,3355934719,BR 3355934720,3355939839,AR 3355939840,3355940863,SR @@ -87749,30 +89305,31 @@ 3356052480,3356053247,BR 3356053248,3356054015,CL 3356054016,3356054527,US -3356054528,3356057599,BR +3356054528,3356056575,BR +3356056832,3356057087,BR +3356057088,3356057343,CO +3356057344,3356057599,BR 3356057600,3356057855,EC 3356057856,3356059135,CL 3356059136,3356060671,BR 3356060672,3356061695,CL 3356061696,3356062463,BR 3356062464,3356062719,JM -3356062720,3356062975,BR -3356062976,3356063231,CR -3356063232,3356063743,BR +3356062720,3356063743,CR 3356064000,3356064255,BR 3356064256,3356064511,CL -3356064768,3356065791,BR +3356064512,3356065791,BR 3356065792,3356066047,CL 3356066048,3356069119,BR 3356069120,3356069631,CL -3356069888,3356070143,BR +3356069632,3356070143,BR 3356070144,3356070655,CL 3356070656,3356070911,AR 3356070912,3356071423,BR 3356071424,3356072447,CL 3356073216,3356073471,AR -3356073472,3356075007,BR -3356075008,3356076287,BO +3356073472,3356075263,BR +3356075264,3356076287,BO 3356076288,3356078079,BR 3356078080,3356078335,EC 3356078336,3356079359,CL @@ -88034,6 +89591,7 @@ 3357007872,3357011967,BR 3357011968,3357016063,MX 3357016064,3357018623,CO +3357018624,3357019135,BR 3357019136,3357020159,CL 3357020160,3357032447,CO 3357032448,3357040639,BR @@ -88987,11 +90545,13 @@ 3367840768,3367841791,HN 3367841792,3368052991,BR 3368052992,3368053247,PE -3368053760,3368086015,BR +3368053760,3368086527,BR 3368086528,3368087551,CR 3368087552,3368157183,BR 3368157184,3368173567,MX -3368173568,3370188799,BR +3368173568,3368601799,BR +3368601800,3368601800,A1 +3368601801,3370188799,BR 3370188800,3370196991,MX 3370196992,3370214399,BR 3370214400,3370215423,AR @@ -89063,7 +90623,9 @@ 3380833792,3380834303,SV 3380834304,3380834815,MX 3380834816,3380835071,CO +3380835072,3380835327,NI 3380835328,3380835839,MX +3380835840,3380836351,AR 3380836352,3380836607,MX 3380836608,3380836863,PE 3380836864,3380837375,SV @@ -89837,7 +91399,9 @@ 3391094784,3391192063,JP 3391192064,3391192319,AP 3391192320,3391356927,JP -3391356928,3391444479,NZ +3391356928,3391441407,NZ +3391441408,3391441663,PH +3391441664,3391444479,NZ 3391444480,3391444991,VN 3391444992,3391453183,NZ 3391453184,3391453439,ID @@ -91215,7 +92779,6 @@ 3398684672,3398688767,JP 3398688768,3398705151,ID 3398705152,3398709247,CN -3398709248,3398711295,AU 3398713344,3398729727,CN 3398729728,3398737919,AU 3398737920,3398742015,SG @@ -91420,7 +92983,9 @@ 3399999488,3400000475,SG 3400000476,3400000479,US 3400000480,3400000487,AU -3400000488,3400006143,SG +3400000488,3400002303,SG +3400002304,3400002367,HK +3400002368,3400006143,SG 3400006144,3400006399,AP 3400006400,3400007679,SG 3400007680,3400024063,AU @@ -91552,7 +93117,9 @@ 3400648816,3400648831,HK 3400648832,3400649943,SG 3400649944,3400649951,HK -3400649952,3400650409,SG +3400649952,3400650143,SG +3400650144,3400650159,HK +3400650160,3400650409,SG 3400650410,3400650410,AU 3400650411,3400650751,SG 3400650752,3400654847,AU @@ -92072,7 +93639,8 @@ 3406737408,3406737663,ID 3406737664,3406739199,AU 3406739200,3406739455,ID -3406739456,3406741503,HK +3406739456,3406740991,HK +3406740992,3406741503,SG 3406741504,3406741759,CN 3406741760,3406742015,AU 3406742016,3406742527,CN @@ -93119,8 +94687,8 @@ 3409455104,3409455359,CN 3409455360,3409456639,AU 3409456640,3409456895,CN -3409456896,3409457151,AU -3409457152,3409459199,HK +3409456896,3409457152,AU +3409457153,3409459199,HK 3409459200,3409462271,AU 3409462272,3409462783,CN 3409462784,3409465855,AU @@ -93288,7 +94856,6 @@ 3410903040,3410911231,HK 3410911232,3410915327,TH 3410915328,3410919423,ID -3410919424,3410923519,IN 3410927616,3410931711,NP 3410931712,3410935807,TW 3410935808,3410939903,MY @@ -93322,7 +94889,8 @@ 3411051008,3411051263,PK 3411051264,3411051519,SG 3411051520,3411052543,CN -3411052544,3411054591,HK +3411052544,3411052544,JP +3411052545,3411054591,HK 3411054592,3411058687,CN 3411058688,3411062783,AU 3411062784,3411064831,HK @@ -93470,7 +95038,9 @@ 3411857408,3411859249,JP 3411859250,3411859251,AU 3411859252,3411859711,JP -3411859712,3411860223,AP +3411859712,3411859815,AP +3411859816,3411859816,CN +3411859817,3411860223,AP 3411860224,3411861503,JP 3411861504,3411869695,AU 3411869696,3411943423,CN @@ -94171,7 +95741,6 @@ 3418273792,3418275839,ID 3418275840,3418279935,AU 3418279936,3418281983,NZ -3418281984,3418282239,IN 3418282240,3418282495,AU 3418282496,3418283519,PH 3418283520,3418284031,AU @@ -94393,7 +95962,7 @@ 3420032256,3420032511,AU 3420032512,3420033023,NZ 3420033024,3420034047,IN -3420034048,3420036095,AU +3420034048,3420035071,AU 3420036096,3420037119,JP 3420037120,3420037631,AU 3420039168,3420040191,KH @@ -94416,7 +95985,9 @@ 3420366960,3420366975,KR 3420366976,3420367359,AU 3420367360,3420367615,AP -3420367616,3420370559,AU +3420367616,3420369007,AU +3420369008,3420369023,HK +3420369024,3420370559,AU 3420370560,3420370575,JP 3420370576,3420372991,AU 3420372992,3420374527,HK @@ -95310,7 +96881,11 @@ 3448987648,3448989695,IN 3448989696,3448990719,HK 3448990720,3448991743,IN -3448991744,3449159679,US +3448991744,3449098751,US +3449098752,3449099263,DE +3449099264,3449100799,US +3449100800,3449101311,AU +3449101312,3449159679,US 3449159680,3449160703,CA 3449160704,3449161471,US 3449161472,3449163519,CA @@ -95838,8 +97413,8 @@ 3454664448,3454672895,US 3454672896,3454681087,CA 3454681088,3454727935,US -3454727936,3454727951,JP -3454727952,3454730239,US +3454727936,3454728191,JP +3454728192,3454730239,US 3454730240,3454732287,EC 3454732288,3454796031,US 3454796032,3454808831,CA @@ -96180,8 +97755,10 @@ 3459620864,3459622911,US 3459624960,3459629055,BM 3459629056,3459686399,US -3459686400,3459688447,NL -3459688448,3459731455,US +3459686400,3459688479,NL +3459688480,3459689215,US +3459689216,3459689471,NL +3459689472,3459731455,US 3459731456,3459735551,CA 3459735552,3459745535,US 3459745536,3459745791,IT @@ -96477,7 +98054,7 @@ 3464171776,3464172031,US 3464172032,3464173567,CA 3464173568,3464173823,US -3464173824,3464174591,CA +3464173824,3464175103,CA 3464175104,3464175359,US 3464175360,3464180735,CA 3464180736,3464200703,US @@ -96633,7 +98210,9 @@ 3466938812,3466958079,US 3466958080,3466958335,CA 3466958336,3467051007,US -3467051008,3467116543,CA +3467051008,3467068927,CA +3467068928,3467069439,US +3467069440,3467116543,CA 3467116544,3467378687,US 3467378688,3467444223,CA 3467444224,3467554815,US @@ -96767,7 +98346,9 @@ 3469186304,3469186559,MX 3469186560,3469893631,US 3469893632,3469901823,CA -3469901824,3470131199,US +3469901824,3469989887,US +3469989888,3469990399,CA +3469990400,3470131199,US 3470131200,3470135295,AG 3470135296,3470137343,LC 3470137344,3470139391,VG @@ -96931,9 +98512,7 @@ 3476545536,3476547583,A2 3476547584,3476881407,US 3476881408,3476946943,CA -3476946944,3477312511,US -3477312512,3477312767,A1 -3477312768,3478114303,US +3476946944,3478114303,US 3478114304,3478118399,PE 3478118400,3478192127,US 3478192128,3478257663,CA @@ -97091,7 +98670,9 @@ 3481843456,3481843711,GB 3481843712,3481958271,US 3481958272,3481958399,NL -3481958400,3481964575,US +3481958400,3481959020,US +3481959021,3481959021,GB +3481959022,3481964575,US 3481964576,3481964579,IE 3481964580,3481993791,US 3481993792,3481993799,CA @@ -97971,7 +99552,9 @@ 3495375872,3495376895,CA 3495376896,3495399423,US 3495399424,3495400447,KN -3495400448,3495412735,US +3495400448,3495406335,US +3495406336,3495406591,LB +3495406592,3495412735,US 3495412736,3495413759,CA 3495413760,3495429119,US 3495429120,3495430143,CA @@ -98626,7 +100209,9 @@ 3510268928,3510269951,US 3510269952,3510270719,LY 3510270720,3510270975,SY -3510270976,3510321151,US +3510270976,3510284298,US +3510284299,3510284299,SG +3510284300,3510321151,US 3510321152,3510321663,VG 3510321664,3510321919,AG 3510321920,3510322175,KN @@ -98891,10 +100476,7 @@ 3515222272,3515224831,TR 3515224832,3515301887,US 3515301888,3515318271,CA -3515318272,3515326463,US -3515334656,3515339519,US -3515339520,3515339775,A1 -3515339776,3515358975,US +3515318272,3515358975,US 3515358976,3515359231,MX 3515359232,3515596799,US 3515596800,3515613183,CA @@ -99479,9 +101061,9 @@ 3534758976,3534759039,PH 3534759040,3534759167,AU 3534759168,3534759183,JP -3534759184,3534760703,AU -3534760704,3534760711,NZ -3534760712,3534761983,AU +3534759184,3534760447,AU +3534760448,3534760959,NZ +3534760960,3534761983,AU 3534761984,3534763775,HK 3534763776,3534764031,AP 3534764032,3534863443,HK @@ -99931,7 +101513,9 @@ 3559153664,3559178239,GB 3559178240,3559186431,LB 3559186432,3559194623,RU -3559194624,3559202815,SE +3559194624,3559200255,SE +3559200256,3559200511,FI +3559200512,3559202815,SE 3559202816,3559211007,DE 3559211008,3559219199,SK 3559219200,3559227391,SE @@ -100035,7 +101619,8 @@ 3559940096,3559948287,DE 3559948288,3559956479,RU 3559956480,3559964671,IT -3559964672,3559981055,RU +3559964672,3559976959,RU +3559976960,3559981055,HU 3559981056,3559989247,EE 3559989248,3559997439,PL 3559997440,3560005631,KE @@ -102288,7 +103873,9 @@ 3583410176,3583418367,SE 3583418368,3583426559,TN 3583426560,3583428607,CV -3583428608,3583434751,CI +3583428608,3583430655,CI +3583430656,3583432703,ZA +3583432704,3583434751,CI 3583434752,3583442943,AT 3583442944,3583451135,RU 3583451136,3583459327,IL @@ -102588,12 +104175,32 @@ 3585597440,3585605631,RU 3585605632,3585613823,PL 3585613824,3585622015,EE -3585630208,3585638399,IL +3585630208,3585632255,IL +3585632256,3585632511,GB +3585632512,3585632639,NL +3585632640,3585632767,IL +3585632768,3585633535,GB +3585633536,3585634047,IT +3585634048,3585634303,IL +3585634304,3585634559,IT +3585634560,3585634687,IL +3585634688,3585634815,NL +3585634816,3585635071,IT +3585635072,3585635199,NL +3585635200,3585635455,IL +3585635456,3585635711,NL +3585635712,3585635967,IL +3585635968,3585636095,NL +3585636096,3585637375,IL +3585637376,3585637503,NL +3585637504,3585638399,IL 3585638400,3585646591,RU 3585646592,3585654783,SA 3585654784,3585662975,NO 3585662976,3585671167,BY -3585671168,3585679359,SE +3585671168,3585675306,SE +3585675307,3585675307,DK +3585675308,3585679359,SE 3585679360,3585687551,FI 3585687552,3585695743,DE 3585695744,3585703935,A2 @@ -102726,11 +104333,15 @@ 3586680512,3586680519,GB 3586680520,3586681471,FR 3586681472,3586681487,GB -3586681488,3586681615,FR +3586681488,3586681527,FR +3586681528,3586681535,GB +3586681536,3586681615,FR 3586681616,3586681631,CZ 3586681632,3586682239,FR 3586682240,3586682367,US -3586682368,3586682879,FR +3586682368,3586682415,FR +3586682416,3586682423,DE +3586682424,3586682879,FR 3586682880,3586686975,US 3586686976,3586703359,SE 3586703360,3586719743,CH @@ -103068,7 +104679,9 @@ 3590234112,3590242303,GB 3590242304,3590244351,US 3590244352,3590244607,DE -3590244608,3590245311,FR +3590244608,3590245263,FR +3590245264,3590245271,GB +3590245272,3590245311,FR 3590245312,3590245439,US 3590245440,3590247048,FR 3590247049,3590247049,IT @@ -103290,7 +104903,9 @@ 3628161024,3628161279,CA 3628161280,3628179455,US 3628179456,3628187647,CA -3628187648,3628225387,US +3628187648,3628225097,US +3628225098,3628225098,AT +3628225099,3628225387,US 3628225388,3628225395,GB 3628225396,3628225779,US 3628225780,3628225783,GB @@ -104311,7 +105926,11 @@ 3641941760,3641942015,EU 3641942016,3641950207,DE 3641950208,3641954303,FR -3641954304,3641958399,MD +3641954304,3641957119,MD +3641957120,3641957631,GB +3641957632,3641957887,MD +3641957888,3641958143,GB +3641958144,3641958399,MD 3641958400,3641960447,BE 3641960448,3641960703,NL 3641960704,3641961727,BE @@ -104539,7 +106158,9 @@ 3644919808,3644923903,DE 3644923904,3644924927,IL 3644924928,3644925183,US -3644925184,3644926463,IL +3644925184,3644925439,IL +3644925440,3644925695,US +3644925696,3644926463,IL 3644926464,3644926719,US 3644926720,3644927999,IL 3644928000,3644932095,GI @@ -104603,7 +106224,7 @@ 3645202432,3645206527,CZ 3645206528,3645210623,LV 3645210624,3645214719,RU -3645214720,3645218815,NL +3645214720,3645218815,SE 3645218816,3645222911,DE 3645222912,3645227007,KW 3645227008,3645235199,RU @@ -105224,9 +106845,7 @@ 3650920458,3650920458,GB 3650920459,3650920703,FR 3650920704,3650920895,GB -3650920896,3650920897,GR -3650920898,3650920898,GB -3650920899,3650920927,GR +3650920896,3650920927,GR 3650920928,3650922799,GB 3650922800,3650922815,FR 3650922816,3650926335,GB @@ -105736,7 +107355,7 @@ 3707109376,3707174911,HK 3707174912,3707207679,JP 3707209728,3707211775,CN -3707211776,3707215871,NZ +3707211776,3707215871,ID 3707215872,3707217919,BD 3707217920,3707219967,ID 3707219968,3707222015,AU diff --git a/installer/resources/geoipv6.dat.gz b/installer/resources/geoipv6.dat.gz index 5c00c5c68a551c2e97ab65987093af1845c8a89f..c19c99b8884678b96787e47e694a06b42acd6a96 100644 GIT binary patch literal 143965 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%0A|Qn0M|$*z%9qD)O%8R|qE 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

y4 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

kDo`8pa@9IQT3?xGt74-c_RfB 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 A`Tzg` From 157d494deeac8f8703a5f31302da30667386ca6a Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 11 Sep 2015 00:54:45 +0000 Subject: [PATCH 144/258] bump build to -8-rc --- 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 c76c0f106..74605163f 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = "-rc"; From 9d0542420262d8ae231592b5c1383d16999a5dd1 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 11 Sep 2015 13:24:10 +0000 Subject: [PATCH 145/258] Router: Reduce rekey probability from 10% to 5% --- router/java/src/net/i2p/router/RouterVersion.java | 2 +- router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 74605163f..47667df53 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 = 8; + public final static long BUILD = 9; /** for example "-test" */ public final static String EXTRA = "-rc"; diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java index eebd0f02b..75977e0ab 100644 --- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java +++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java @@ -113,8 +113,8 @@ class LoadRouterInfoJob extends JobImpl { if (sigTypeChanged && getContext().getProperty(CreateRouterInfoJob.PROP_ROUTER_SIGTYPE) == null) { // Not explicitly configured, and default has changed // Give a 10% chance of rekeying for each restart - // TODO reduce from 10 to ~3 (i.e. increase probability) in future release - if (getContext().random().nextInt(10) > 0) { + // TODO reduce from 20 to ~3 (i.e. increase probability) in future release + if (getContext().random().nextInt(20) > 0) { sigTypeChanged = false; if (_log.shouldWarn()) _log.warn("Deferring RI rekey from " + stype + " to " + cstype); From fd606064d910fac026d6a72ebdda6c68e573d53a Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 12 Sep 2015 13:55:30 +0000 Subject: [PATCH 146/258] 0.9.22 --- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 2 ++ installer/install.xml | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 4343c9074..2a1175c6e 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -18,7 +18,7 @@ public class CoreVersion { /** deprecated */ public final static String ID = "Monotone"; - public final static String VERSION = "0.9.21"; + public final static String VERSION = "0.9.22"; /** * For Vuze. diff --git a/history.txt b/history.txt index 34ba9f682..94a5475e4 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,5 @@ +* 2015-09-12 0.9.22 released + 2015-09-11 kytv * Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country database from 2015-09-02. diff --git a/installer/install.xml b/installer/install.xml index 582e0c284..f7cdcfbbd 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.9.21 + 0.9.22 diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 47667df53..a411b0099 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,10 +18,10 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 9; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); From d5cbccf186a53a5d4f3ae0e88cca0edf3bda7e66 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Sep 2015 13:33:00 +0000 Subject: [PATCH 147/258] checklist update --- installer/resources/checklist.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/installer/resources/checklist.txt b/installer/resources/checklist.txt index 80f4c8336..4533e363b 100644 --- a/installer/resources/checklist.txt +++ b/installer/resources/checklist.txt @@ -1,6 +1,20 @@ Release checklist ----------------- +One week before: + Make announcement on Transifex with checkin deadline + + +A day or two before: +Write the release announcement and push to Transifex: + Checkout i2p.newsxml branch + See README for setup + ./create_new_entry.sh + tx push -s + mtn ci + Make announcement on Transifex asking for news translation + + Ensure all translation updates are imported from Transifex Sync with mtn.i2p2.i2p Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p @@ -66,9 +80,11 @@ Generate PGP signatures: (end of tasks automated by 'ant release') ========================================= -Add magnet links to news.xml +Add magnet links, change release dates and release number in to old-format news.xml, +and distribute to news hosts +In the i2p.newsxml branch, edit magnet links, release dates and release number in data/releases.json, and check in -Seed update torrents +Seed update torrents (su2 and su3) Notify the following people: All in-network update hosts From 7117438b048b4b1ba21c1a6e535a2cb5b407b5e4 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Sep 2015 13:34:10 +0000 Subject: [PATCH 148/258] RIP ugha --- apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 223862576..8f2b48266 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -63,7 +63,7 @@ public class HomeHelper extends HelperBase { "stats.i2p" + S + _x("I2P Network Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "chart_line.png" + S + _x("Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S + _x("Trac Wiki") + S + S + "http://trac.i2p2.i2p/" + S + I + "billiard_marker.png" + S + - _x("Ugha's Wiki") + S + S + "http://ugha.i2p/" + S + I + "billiard_marker.png" + S + + //_x("Ugha's Wiki") + S + S + "http://ugha.i2p/" + S + I + "billiard_marker.png" + S + _x("Sponge's main site") + S + _x("Seedless and the Robert BitTorrent applications") + S + "http://sponge.i2p/" + S + I + "user_astronaut.png" + S + ""; From ac1a28e988e1694b59f45a5a3ae12c8949b509ac Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Sep 2015 13:34:51 +0000 Subject: [PATCH 149/258] print usage if no arg --- .../java/src/net/i2p/router/news/NewsXMLParser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java index 841dba9b4..01ffe4d94 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java @@ -432,6 +432,10 @@ public class NewsXMLParser { } public static void main(String[] args) { + if (args.length != 1) { + System.err.println("Usage: NewsXMLParser file.xml"); + System.exit(1); + } try { I2PAppContext ctx = new I2PAppContext(); Debug.initialize(ctx); From ed3e444d1e961bf3f22bc10be364f008a3c6b3a8 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 13 Sep 2015 13:38:19 +0000 Subject: [PATCH 150/258] log tweak --- router/java/src/net/i2p/router/RouterVersion.java | 2 +- router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b0099..87e5bffca 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 = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java index c799bd16a..5b2bdfb2a 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java @@ -640,7 +640,9 @@ class BuildHandler implements Runnable { _context.statManager().addRateData("tunnel.rejectHostile", 1); // We are 2 hops in a row? Drop it without a reply. // No way to recognize if we are every other hop, but see below - _log.error("Dropping build request, we are the next hop"); + // old i2pd + if (_log.shouldWarn()) + _log.warn("Dropping build request, we are the next hop"); return; } // previous test should be sufficient to keep it from getting here but maybe not? From 6f5739b9d8fae513bcb782fc15a7be217501c9b5 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 14 Sep 2015 11:06:35 +0000 Subject: [PATCH 151/258] News: Store/load individual news entries as XML in separate files by UUID. WIP, not yet hooked in. --- .../net/i2p/router/news/NewsXMLParser.java | 27 +- .../src/net/i2p/router/news/PersistNews.java | 263 ++++++++++++++++++ 2 files changed, 286 insertions(+), 4 deletions(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java index 01ffe4d94..8850cb141 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java @@ -247,6 +247,10 @@ public class NewsXMLParser { return rv; } + /** + * This does not check for any missing values. + * Any fields in any NewsEntry may be null. + */ private List extractNewsEntries(Node feed) throws I2PParserException { List rv = new ArrayList(); List entries = getNodes(feed, "entry"); @@ -345,8 +349,10 @@ public class NewsXMLParser { /** * Helper to get all Nodes matching the name + * + * @return non-null */ - private static List getNodes(Node node, String name) { + static List getNodes(Node node, String name) { List rv = new ArrayList(); int count = node.getNNodes(); for (int i = 0; i < count; i++) { @@ -432,8 +438,8 @@ public class NewsXMLParser { } public static void main(String[] args) { - if (args.length != 1) { - System.err.println("Usage: NewsXMLParser file.xml"); + if (args.length <= 0 || args.length > 2) { + System.err.println("Usage: NewsXMLParser file.xml [parserMode]"); System.exit(1); } try { @@ -454,9 +460,22 @@ public class NewsXMLParser { System.out.println("Release timestamp: " + latestRelease.date); System.out.println("Feed timestamp: " + ud.feedUpdated); System.out.println("Found " + entries.size() + " news entries"); + Set uuids = new HashSet(entries.size()); for (int i = 0; i < entries.size(); i++) { NewsEntry e = entries.get(i); - System.out.println("News #" + (i+1) + ": " + e.title + '\n' + e.content); + System.out.println("\n****** News #" + (i+1) + ": " + e.title + '\n' + e.content); + if (e.id == null) + throw new IOException("missing ID"); + if (e.title == null) + throw new IOException("missing title"); + if (e.content == null) + throw new IOException("missing content"); + if (e.authorName == null) + throw new IOException("missing author"); + if (e.updated == 0) + throw new IOException("missing updated"); + if (!uuids.add(e.id)) + throw new IOException("duplicate ID"); } } catch (IOException ioe) { ioe.printStackTrace(); diff --git a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java new file mode 100644 index 000000000..96b8e062f --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java @@ -0,0 +1,263 @@ +package net.i2p.router.news; + +import java.io.BufferedInputStream; +import java.util.Collections; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; + +import net.i2p.I2PAppContext; +import net.i2p.data.Base64; +import net.i2p.data.DataHelper; +import net.i2p.data.Hash; +import net.i2p.util.Log; +import net.i2p.util.SecureDirectory; +import net.i2p.util.SecureFileOutputStream; + +import org.cybergarage.util.Debug; +import org.cybergarage.xml.Node; +import org.cybergarage.xml.ParserException; + +/** + * Store and retrieve news entries from disk. + * Each entry is stored in a separate file, with the name + * derived from the UUID. + * + * @since 0.9.23 + */ +public class PersistNews { + + private static final String DIR = "docs/news"; + private static final String PFX = "news-"; + private static final String SFX = ".xml.gz"; + private static final String XML_START = "\n"; + + /** + * Store each entry. + * Old entries are always overwritten, as they may change even without the updated date changing. + * + * @param entries each one should be "entry" at the root + * @return success + */ + public static boolean store(I2PAppContext ctx, List entries) { + Log log = ctx.logManager().getLog(PersistNews.class); + File dir = new SecureDirectory(ctx.getConfigDir(), DIR); + if (!dir.exists()) + dir.mkdirs(); + StringBuilder buf = new StringBuilder(); + boolean rv = true; + for (Node entry : entries) { + Node nid = entry.getNode("id"); + if (nid == null) { + if (log.shouldWarn()) + log.warn("entry without UUID"); + continue; + } + String id = nid.getValue(); + if (id == null) { + if (log.shouldWarn()) + log.warn("entry without UUID"); + continue; + } + String name = idToName(ctx, id); + File file = new File(dir, name); + Writer out = null; + try { + out = new OutputStreamWriter(new GZIPOutputStream(new SecureFileOutputStream(file))); + out.write(XML_START); + XMLParser.toString(buf, entry); + out.write(buf.toString()); + buf.setLength(0); + } catch (IOException ioe) { + if (log.shouldWarn()) + log.warn("failed store to " + file, ioe); + rv = false; + } finally { + if (out != null) try { out.close(); } catch (IOException ioe) {} + } + } + return rv; + } + + /** + * This does not check for any missing values. + * Any fields in any NewsEntry may be null. + * Content is not sanitized by NewsXMLParser here, do that before storing. + * + * @return non-null, sorted by updated date, newest first + */ + public static List load(I2PAppContext ctx) { + Log log = ctx.logManager().getLog(PersistNews.class); + File dir = new File(ctx.getConfigDir(), DIR); + List rv = new ArrayList(); + File[] files = dir.listFiles(); + if (files == null) + return rv; + for (File file : files) { + String name = file.getName(); + if (!name.startsWith(PFX) || !name.endsWith(SFX)) + continue; + XMLParser parser = new XMLParser(ctx); + InputStream in = null; + Node node; + boolean error = false; + try { + in = new GZIPInputStream(new FileInputStream(file)); + node = parser.parse(in); + NewsEntry entry = extract(node); + if (entry != null) { + rv.add(entry); + } else { + if (log.shouldWarn()) + log.warn("load error from " + file); + error = true; + } + } catch (ParserException pe) { + if (log.shouldWarn()) + log.warn("load error from " + file, pe); + error = true; + } catch (IOException ioe) { + if (log.shouldWarn()) + log.warn("load error from " + file, ioe); + error = true; + } finally { + if (in != null) try { in.close(); } catch (IOException ioe) {} + } + if (error) + file.delete(); + } + Collections.sort(rv); + return rv; + } + + /** + * This does not check for any missing values. + * Any fields in any NewsEntry may be null. + * Content is not sanitized by NewsXMLParser here, do that before storing. + * + * @return non-null, throws on errors + */ + private static NewsEntry extract(Node entry) { + NewsEntry e = new NewsEntry(); + Node n = entry.getNode("title"); + if (n != null) { + e.title = n.getValue(); + if (e.title != null) + e.title = e.title.trim(); + } + n = entry.getNode("link"); + if (n != null) { + e.link = n.getValue(); + if (e.link != null) + e.link = e.link.trim(); + } + n = entry.getNode("id"); + if (n != null) { + e.id = n.getValue(); + if (e.id != null) + e.id = e.id.trim(); + } + n = entry.getNode("updated"); + if (n != null) { + String v = n.getValue(); + if (v != null) { + long time = RFC3339Date.parse3339Date(v.trim()); + if (time > 0) + e.updated = time; + } + } + n = entry.getNode("summary"); + if (n != null) { + e.summary = n.getValue(); + if (e.summary != null) + e.summary = e.summary.trim(); + } + n = entry.getNode("author"); + if (n != null) { + n = n.getNode("name"); + if (n != null) { + e.authorName = n.getValue(); + if (e.authorName != null) + e.authorName = e.authorName.trim(); + } + } + n = entry.getNode("content"); + if (n != null) { + String a = n.getAttributeValue("type"); + if (a.length() > 0) + e.contentType = a; + // now recursively sanitize + // and convert everything in the content to string + StringBuilder buf = new StringBuilder(256); + for (int i = 0; i < n.getNNodes(); i++) { + Node sn = n.getNode(i); + XMLParser.toString(buf, sn); + } + e.content = buf.toString(); + } + return e; + } + + /** + * @return success + */ + public static boolean delete(I2PAppContext ctx, NewsEntry entry) { + String id = entry.id; + if (id == null) + return false; + String name = idToName(ctx, id); + File dir = new File(ctx.getConfigDir(), DIR); + File file = new File(dir, name); + return file.delete(); + } + + /** + * @param id non-null + */ + private static String idToName(I2PAppContext ctx, String id) { + byte[] bid = DataHelper.getUTF8(id); + byte[] hash = new byte[Hash.HASH_LENGTH]; + ctx.sha().calculateHash(bid, 0, bid.length, hash, 0); + return PFX + Base64.encode(hash) + SFX; + } + + public static void main(String[] args) { + if (args.length != 1) { + System.err.println("Usage: PersistNews file.xml"); + System.exit(1); + } + I2PAppContext ctx = new I2PAppContext(); + Debug.initialize(ctx); + XMLParser parser = new XMLParser(ctx); + InputStream in = null; + try { + in = new FileInputStream(args[0]); + Node root = parser.parse(in); + List entries = NewsXMLParser.getNodes(root, "entry"); + store(ctx, entries); + System.out.println("Stored " + entries.size() + " entries"); + } catch (ParserException pe) { + System.out.println("load error from " + args[0]); + pe.printStackTrace(); + } catch (IOException ioe) { + System.out.println("load error from " + args[0]); + ioe.printStackTrace(); + } finally { + if (in != null) try { in.close(); } catch (IOException ioe) {} + } + List entries = load(ctx); + System.out.println("Loaded " + entries.size() + " news entries"); + for (int i = 0; i < entries.size(); i++) { + NewsEntry e = entries.get(i); + System.out.println("\n****** News #" + (i+1) + ": " + e.title + '\n' + e.content); + } + } +} From 7912d7650daaa44d42206575f8c90b165b263ac1 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 14 Sep 2015 14:49:20 +0000 Subject: [PATCH 152/258] News: new NewsManager to maintain current news entries. WIP, not yet hooked in. --- .../src/net/i2p/router/news/NewsManager.java | 242 ++++++++++++++++++ 1 file changed, 242 insertions(+) create mode 100644 apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java new file mode 100644 index 000000000..5fb8cb492 --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java @@ -0,0 +1,242 @@ +package net.i2p.router.news; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import net.i2p.I2PAppContext; +import net.i2p.app.ClientAppManager; +import net.i2p.app.ClientAppState; +import static net.i2p.app.ClientAppState.*; +import net.i2p.router.app.RouterApp; +import net.i2p.util.FileUtil; +import net.i2p.util.Log; +import net.i2p.util.TranslateReader; + +import org.cybergarage.xml.Node; + +/** + * Manage current news. + * Keeps current entries in memory, and provide methods to + * add new entries and store them to disk. + * + * @since 0.9.23 + */ +public class NewsManager implements RouterApp { + + private final I2PAppContext _context; + private final Log _log; + private final ClientAppManager _cmgr; + private volatile ClientAppState _state = UNINITIALIZED; + private List _currentNews; + private NewsMetadata _currentMetadata; + + public static final String APP_NAME = "news"; + private static final String BUNDLE_NAME = "net.i2p.router.news.messages"; + + /** + * @param args ignored + */ + public NewsManager(I2PAppContext ctx, ClientAppManager listener, String[] args) { + _context = ctx; + _cmgr = listener; + _log = ctx.logManager().getLog(NewsManager.class); + _state = INITIALIZED; + } + + /** + * + * @return non-null, sorted by updated date, newest first + */ + public synchronized List getEntries() { + if (!_currentNews.isEmpty()) + return new ArrayList(_currentNews); + // load old news.xml + List rv = parseOldNews(); + if (!rv.isEmpty()) { + _currentNews = rv; + // don't save to disk as we don't have the UUIDs so they will be dups ?? + return rv; + } + // load and translate initialnews + // We don't save it to _currentNews, as the language may change + return parseInitialNews(); + } + + /** + * Store each entry. + * Old entries are always overwritten, as they may change even without the updated date changing. + * Does NOT update the NewsEntry list. + * + * @param entries each one should be "entry" at the root + * @return success + */ + public synchronized boolean storeEntries(List entries) { + return PersistNews.store(_context, entries); + } + + /** + * Add or replace each entry in the list. + * Does NOT store them to disk. + */ + public synchronized void addEntries(List entries) { + for (NewsEntry e : entries) { + String id = e.id; + if (id == null) + continue; + boolean found = false; + for (int i = 0; i < _currentNews.size(); i++) { + NewsEntry old = _currentNews.get(i); + if (id.equals(old.id)) { + _currentNews.set(i, e); + found = true; + break; + } + } + if (!found) + _currentNews.add(e); + } + Collections.sort(_currentNews); + } + + /////// ClientApp methods + + /** + * ClientApp interface + */ + public synchronized void startup() { + changeState(STARTING); + _currentNews = PersistNews.load(_context); + changeState(RUNNING); + if (_cmgr != null) + _cmgr.register(this); + } + + /** + * ClientApp interface + * @param args ignored + */ + public synchronized void shutdown(String[] args) { + changeState(STOPPED); + } + + public ClientAppState getState() { + return _state; + } + + public String getName() { + return APP_NAME; + } + + public String getDisplayName() { + return "News Manager"; + } + + /////// end ClientApp methods + + private synchronized void changeState(ClientAppState state) { + _state = state; + if (_cmgr != null) + _cmgr.notify(this, state, null, null); + } + + private List parseOldNews() { + File file = new File(_context.getConfigDir(), "docs/news.xml"); + String newsContent = FileUtil.readTextFile(file.toString(), -1, true); + if (newsContent == null || newsContent.equals("")) + return Collections.emptyList(); + return parseNews(newsContent); + } + + private List parseInitialNews() { + NewsEntry entry = new NewsEntry(); + File file = new File(_context.getBaseDir(), "docs/initialNews/initialNews.xml"); + Reader reader = null; + try { + char[] buf = new char[512]; + StringBuilder out = new StringBuilder(2048); + reader = new TranslateReader(_context, BUNDLE_NAME, new FileInputStream(file)); + int len; + while((len = reader.read(buf)) > 0) { + out.append(buf, 0, len); + } + List rv = parseNews(out.toString()); + if (!rv.isEmpty()) { + rv.get(0).updated = RFC3339Date.parse3339Date("2015-01-01"); + } else { + if (_log.shouldWarn()) + _log.warn("failed to load " + file); + } + return rv; + } catch (IOException ioe) { + if (_log.shouldWarn()) + _log.warn("failed to load " + file, ioe); + return Collections.emptyList(); + } finally { + try { + if (reader != null) + reader.close(); + } catch (IOException foo) {} + } + } + + private List parseNews(String newsContent) { + List rv = new ArrayList(); + // Parse news content for headings. + boolean foundEntry = false; + int start = newsContent.indexOf("

"); + while (start >= 0) { + NewsEntry entry = new NewsEntry(); + // Add offset to start: + // 4 - gets rid of

+ // 16 - gets rid of the date as well (assuming form "

yyyy-mm-dd: Foobarbaz...") + // Don't truncate the "congratulations" in initial news + if (newsContent.length() > start + 16 && + newsContent.substring(start + 4, start + 6).equals("20") && + newsContent.substring(start + 14, start + 16).equals(": ")) { + entry.updated = RFC3339Date.parse3339Date(newsContent.substring(start + 4, start + 14)); + newsContent = newsContent.substring(start+16); + } else { + newsContent = newsContent.substring(start+4); + } + int end = newsContent.indexOf("

"); + if (end >= 0) { + String heading = newsContent.substring(0, end); + entry.title = heading; + // use title as UUID + entry.id = heading; + newsContent = newsContent.substring(end + 5); + end = newsContent.indexOf("

"); + if (end > 0) + entry.content = newsContent.substring(0, end); + else + entry.content = newsContent; + rv.add(entry); + start = end; + } + } + Collections.sort(rv); + return rv; + } + + public static void main(String[] args) { + if (args.length != 0) { + System.err.println("Usage: NewsManager"); + System.exit(1); + } + I2PAppContext ctx = new I2PAppContext(); + NewsManager mgr = new NewsManager(ctx, null, null); + mgr.startup(); + List entries = mgr.getEntries(); + System.out.println("Loaded " + entries.size() + " news entries"); + for (int i = 0; i < entries.size(); i++) { + NewsEntry e = entries.get(i); + System.out.println("\n****** News #" + (i+1) + ": " + e.title + ' ' + new Date(e.updated) + '\n' + e.content); + } + } +} From a2e38503febc9f03a51922061b54668079b895f6 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 14 Sep 2015 16:15:21 +0000 Subject: [PATCH 153/258] News: New /news page and helper to show all news WIP, not yet hooked in --- .../src/net/i2p/router/news/NewsManager.java | 6 ++ .../src/net/i2p/router/news/PersistNews.java | 2 +- .../net/i2p/router/web/NewsFeedHelper.java | 81 +++++++++++++++++++ apps/routerconsole/jsp/news.jsp | 18 +++++ 4 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java create mode 100644 apps/routerconsole/jsp/news.jsp diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java index 5fb8cb492..91290988c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java @@ -57,6 +57,8 @@ public class NewsManager implements RouterApp { if (!_currentNews.isEmpty()) return new ArrayList(_currentNews); // load old news.xml + if (_log.shouldWarn()) + _log.warn("no real XML, falling back to news.xml"); List rv = parseOldNews(); if (!rv.isEmpty()) { _currentNews = rv; @@ -65,6 +67,8 @@ public class NewsManager implements RouterApp { } // load and translate initialnews // We don't save it to _currentNews, as the language may change + if (_log.shouldWarn()) + _log.warn("no news.xml, falling back to initialNews"); return parseInitialNews(); } @@ -112,6 +116,8 @@ public class NewsManager implements RouterApp { public synchronized void startup() { changeState(STARTING); _currentNews = PersistNews.load(_context); + if (_log.shouldWarn()) + _log.warn("Initialized with " + _currentNews.size() + " entries"); changeState(RUNNING); if (_cmgr != null) _cmgr.register(this); diff --git a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java index 96b8e062f..47fb63e4a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java @@ -33,7 +33,7 @@ import org.cybergarage.xml.ParserException; * * @since 0.9.23 */ -public class PersistNews { +class PersistNews { private static final String DIR = "docs/news"; private static final String PFX = "news-"; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java new file mode 100644 index 000000000..a70d0061d --- /dev/null +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -0,0 +1,81 @@ +package net.i2p.router.web; + +import java.text.DateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.TimeZone; + +import net.i2p.I2PAppContext; +import net.i2p.app.ClientAppManager; +import net.i2p.router.news.NewsEntry; +import net.i2p.router.news.NewsManager; + + +/** + * HTML-formatted full news entries + * + * @since 0.9.23 + */ +public class NewsFeedHelper extends HelperBase { + + private int _start = 0; + private int _limit = 3; + + /** + * @param limit less than or equal to zero means all + */ + public void setLimit(int limit) { + _limit = limit; + } + + public void setStart(int start) { + _start = start; + } + + public String getEntries() { + return getEntries(_context, _start, _limit); + } + + /** + * @param max less than or equal to zero means all + * @return non-null, "" if none + */ + static String getEntries(I2PAppContext ctx, int start, int max) { + if (max <= 0) + max = Integer.MAX_VALUE; + StringBuilder buf = new StringBuilder(512); + List entries = Collections.emptyList(); + ClientAppManager cmgr = ctx.clientAppManager(); + if (cmgr != null) { + NewsManager nmgr = (NewsManager) cmgr.getRegisteredApp(NewsManager.APP_NAME); + if (nmgr != null) + entries = nmgr.getEntries(); + } + if (!entries.isEmpty()) { + DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT); + // the router sets the JVM time zone to UTC but saves the original here so we can get it + String systemTimeZone = ctx.getProperty("i2p.systemTimeZone"); + if (systemTimeZone != null) + fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone)); + int i = 0; + for (NewsEntry entry : entries) { + if (i++ < start) + continue; + buf.append("

"); + if (entry.updated > 0) { + Date date = new Date(entry.updated); + buf.append(fmt.format(date)) + .append(": "); + } + buf.append(entry.title) + .append("

\n") + .append(entry.content) + .append("\n"); + if (i >= start + max) + break; + } + } + return buf.toString(); + } +} diff --git a/apps/routerconsole/jsp/news.jsp b/apps/routerconsole/jsp/news.jsp new file mode 100644 index 000000000..7629083bd --- /dev/null +++ b/apps/routerconsole/jsp/news.jsp @@ -0,0 +1,18 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("News")%> + +<%@include file="summaryajax.jsi" %> + +<%@include file="summary.jsi" %> +

<%=intl._("Latest News")%>

+
+ +" /> +<% feedHelper.setLimit(0); %> + +
From addc9c5ca339172618c1089a570c176d3906c645 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 15 Sep 2015 13:33:29 +0000 Subject: [PATCH 154/258] News: connect it all together (ticket #1425): - Enable new NewsManager to load/store feed items on disk by UUID - News items are stored forever, not lost when they are removed from feed - News read in once at startup, not at every summary bar refresh - Convert old initialNews.xml and news.xml to NewsEntry format - Limit display to 2 news items in summary bar, /home and /console - New /news page to show all news --- .../src/net/i2p/router/news/NewsManager.java | 49 ++++++++++-- .../net/i2p/router/news/NewsXMLParser.java | 11 ++- .../src/net/i2p/router/news/PersistNews.java | 4 +- .../net/i2p/router/update/NewsFetcher.java | 17 ++++- .../net/i2p/router/web/NewsFeedHelper.java | 8 +- .../src/net/i2p/router/web/NewsHelper.java | 32 ++------ .../i2p/router/web/RouterConsoleRunner.java | 5 +- .../i2p/router/web/SummaryBarRenderer.java | 74 ++++++++++--------- apps/routerconsole/jsp/news.jsp | 3 +- history.txt | 6 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- 11 files changed, 130 insertions(+), 81 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java index 91290988c..781449ac9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java @@ -4,10 +4,13 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.Reader; +import java.text.DateFormat; +import java.text.ParseException; import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.TimeZone; import net.i2p.I2PAppContext; import net.i2p.app.ClientAppManager; @@ -34,7 +37,13 @@ public class NewsManager implements RouterApp { private final ClientAppManager _cmgr; private volatile ClientAppState _state = UNINITIALIZED; private List _currentNews; - private NewsMetadata _currentMetadata; + // TODO + // Metadata is persisted in the old news.xml format by + // NewsFetcher.outputOldNewsXML() and read in at startup by + // ConsoleUpdateManager.startup() and NewsFetcher.checkForUpdates(). + // While running, the UpdateManager keeps the metadata. + // NewsHelper looks at the news.xml timestamp. + //private NewsMetadata _currentMetadata; public static final String APP_NAME = "news"; private static final String BUNDLE_NAME = "net.i2p.router.news.messages"; @@ -93,10 +102,13 @@ public class NewsManager implements RouterApp { String id = e.id; if (id == null) continue; + String title = e.title; boolean found = false; for (int i = 0; i < _currentNews.size(); i++) { NewsEntry old = _currentNews.get(i); - if (id.equals(old.id)) { + // try to prevent dups with those created from old news.xml, + // where the UUID is the title + if (id.equals(old.id) || (title != null && title.equals(old.id))) { _currentNews.set(i, e); found = true; break; @@ -156,7 +168,7 @@ public class NewsManager implements RouterApp { String newsContent = FileUtil.readTextFile(file.toString(), -1, true); if (newsContent == null || newsContent.equals("")) return Collections.emptyList(); - return parseNews(newsContent); + return parseNews(newsContent, false); } private List parseInitialNews() { @@ -171,7 +183,7 @@ public class NewsManager implements RouterApp { while((len = reader.read(buf)) > 0) { out.append(buf, 0, len); } - List rv = parseNews(out.toString()); + List rv = parseNews(out.toString(), true); if (!rv.isEmpty()) { rv.get(0).updated = RFC3339Date.parse3339Date("2015-01-01"); } else { @@ -191,7 +203,12 @@ public class NewsManager implements RouterApp { } } - private List parseNews(String newsContent) { + /** + * Used for initialNews.xml and news.xml + * + * @param addMissingDiv true for initialNews, false for news.xml + */ + private List parseNews(String newsContent, boolean addMissingDiv) { List rv = new ArrayList(); // Parse news content for headings. boolean foundEntry = false; @@ -205,10 +222,28 @@ public class NewsManager implements RouterApp { if (newsContent.length() > start + 16 && newsContent.substring(start + 4, start + 6).equals("20") && newsContent.substring(start + 14, start + 16).equals(": ")) { + // initialNews.xml, or old news.xml from server entry.updated = RFC3339Date.parse3339Date(newsContent.substring(start + 4, start + 14)); newsContent = newsContent.substring(start+16); } else { newsContent = newsContent.substring(start+4); + int colon = newsContent.indexOf(": "); + if (colon > 0 && colon <= 10) { + // Parse the format we wrote it out in, in NewsFetcher.outputOldNewsXML() + // Doesn't work if the date has a : in it, but SHORT hopefully does not + DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT); + // the router sets the JVM time zone to UTC but saves the original here so we can get it + String systemTimeZone = _context.getProperty("i2p.systemTimeZone"); + if (systemTimeZone != null) + fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone)); + try { + Date date = fmt.parse(newsContent.substring(0, colon)); + entry.updated = date.getTime(); + newsContent = newsContent.substring(colon + 2); + } catch (ParseException pe) { + // can't find date, will be zero + } + } } int end = newsContent.indexOf("

"); if (end >= 0) { @@ -222,6 +257,10 @@ public class NewsManager implements RouterApp { entry.content = newsContent.substring(0, end); else entry.content = newsContent; + // initialNews.xml has the
before the

, not after, so we lose it... + // add it back. + if (addMissingDiv) + entry.content = "
\n" + entry.content; rv.add(entry); start = end; } diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java index 8850cb141..20d8746c7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsXMLParser.java @@ -97,10 +97,11 @@ public class NewsXMLParser { * * @param file XML content only. Any su3 or gunzip handling must have * already happened. + * @return the root node * @throws IOException on any parse error */ - public void parse(File file) throws IOException { - parse(new BufferedInputStream(new FileInputStream(file))); + public Node parse(File file) throws IOException { + return parse(new BufferedInputStream(new FileInputStream(file))); } /** @@ -108,15 +109,17 @@ public class NewsXMLParser { * * @param in XML content only. Any su3 or gunzip handling must have * already happened. + * @return the root node * @throws IOException on any parse error */ - public void parse(InputStream in) throws IOException { + public Node parse(InputStream in) throws IOException { _entries = null; _metadata = null; XMLParser parser = new XMLParser(_context); try { Node root = parser.parse(in); extract(root); + return root; } catch (ParserException pe) { throw new I2PParserException(pe); } @@ -352,7 +355,7 @@ public class NewsXMLParser { * * @return non-null */ - static List getNodes(Node node, String name) { + public static List getNodes(Node node, String name) { List rv = new ArrayList(); int count = node.getNNodes(); for (int i = 0; i < count; i++) { diff --git a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java index 47fb63e4a..65e17c6bc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java +++ b/apps/routerconsole/java/src/net/i2p/router/news/PersistNews.java @@ -35,7 +35,7 @@ import org.cybergarage.xml.ParserException; */ class PersistNews { - private static final String DIR = "docs/news"; + private static final String DIR = "docs/feed/news"; private static final String PFX = "news-"; private static final String SFX = ".xml.gz"; private static final String XML_START = "\n"; @@ -207,6 +207,8 @@ class PersistNews { } /** + * Unused for now, as we don't have any way to remember it's deleted. + * * @return success */ public static boolean delete(I2PAppContext ctx, NewsEntry entry) { diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index 19d878908..44ab24e3c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -21,12 +21,14 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TimeZone; +import net.i2p.app.ClientAppManager; import net.i2p.crypto.SU3File; import net.i2p.crypto.TrustedUpdate; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; import net.i2p.router.RouterVersion; import net.i2p.router.news.NewsEntry; +import net.i2p.router.news.NewsManager; import net.i2p.router.news.NewsMetadata; import net.i2p.router.news.NewsXMLParser; import net.i2p.router.util.RFC822Date; @@ -45,6 +47,8 @@ import net.i2p.util.SSLEepGet; import net.i2p.util.Translate; import net.i2p.util.VersionComparator; +import org.cybergarage.xml.Node; + /** * Task to fetch updates to the news.xml, and to keep * track of whether that has an announcement for a new version. @@ -475,10 +479,21 @@ class NewsFetcher extends UpdateRunner { xml = to1; } NewsXMLParser parser = new NewsXMLParser(_context); - parser.parse(xml); + Node root = parser.parse(xml); xml.delete(); NewsMetadata data = parser.getMetadata(); List entries = parser.getEntries(); + // add entries to the news manager + ClientAppManager cmgr = _context.clientAppManager(); + if (cmgr != null) { + NewsManager nmgr = (NewsManager) cmgr.getRegisteredApp(NewsManager.APP_NAME); + if (nmgr != null) { + nmgr.addEntries(entries); + List nodes = NewsXMLParser.getNodes(root, "entry"); + nmgr.storeEntries(nodes); + } + } + // store entries and metadata in old news.xml format String sudVersion = su3.getVersionString(); String signingKeyName = su3.getSignerString(); File to3 = new File(_context.getTempDir(), "tmp3-" + _context.random().nextInt() + ".xml"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java index a70d0061d..7a9adae76 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java @@ -20,7 +20,7 @@ import net.i2p.router.news.NewsManager; public class NewsFeedHelper extends HelperBase { private int _start = 0; - private int _limit = 3; + private int _limit = 2; /** * @param limit less than or equal to zero means all @@ -62,16 +62,16 @@ public class NewsFeedHelper extends HelperBase { for (NewsEntry entry : entries) { if (i++ < start) continue; - buf.append("

"); + buf.append("

"); if (entry.updated > 0) { Date date = new Date(entry.updated); buf.append(fmt.format(date)) .append(": "); } buf.append(entry.title) - .append("

\n") + .append("

\n
\n") .append(entry.content) - .append("\n"); + .append("\n
\n"); if (i >= start + max) break; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java index be3b5685b..5b068f4b1 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java @@ -204,37 +204,12 @@ public class NewsHelper extends ContentHelper { return mgr.getStatus(); } - private static final String BUNDLE_NAME = "net.i2p.router.news.messages"; - /** * If we haven't downloaded news yet, use the translated initial news file */ @Override public String getContent() { - File news = new File(_page); - if (!news.exists()) { - _page = (new File(_context.getBaseDir(), "docs/initialNews/initialNews.xml")).getAbsolutePath(); - // don't use super, translate on-the-fly - Reader reader = null; - try { - char[] buf = new char[512]; - StringBuilder out = new StringBuilder(2048); - reader = new TranslateReader(_context, BUNDLE_NAME, new FileInputStream(_page)); - int len; - while((len = reader.read(buf)) > 0) { - out.append(buf, 0, len); - } - return out.toString(); - } catch (IOException ioe) { - return ""; - } finally { - try { - if (reader != null) - reader.close(); - } catch (IOException foo) {} - } - } - return super.getContent(); + return NewsFeedHelper.getEntries(_context, 0, 2); } /** @@ -312,7 +287,10 @@ public class NewsHelper extends ContentHelper { buf.append(" ") .append(Messages.getString("Show news", ctx)); } - buf.append(""); + buf.append("" + + " - ") + .append(Messages.getString("Show all news", ctx)) + .append(""); } return buf.toString(); } 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 0c36391dd..35e96b6ea 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -26,8 +26,9 @@ import net.i2p.crypto.KeyStoreUtil; import net.i2p.data.DataHelper; import net.i2p.jetty.I2PLogger; import net.i2p.router.RouterContext; -import net.i2p.router.update.ConsoleUpdateManager; import net.i2p.router.app.RouterApp; +import net.i2p.router.news.NewsManager; +import net.i2p.router.update.ConsoleUpdateManager; import net.i2p.util.Addresses; import net.i2p.util.FileUtil; import net.i2p.util.I2PAppThread; @@ -706,6 +707,8 @@ public class RouterConsoleRunner implements RouterApp { ConsoleUpdateManager um = new ConsoleUpdateManager(_context, _mgr, null); um.start(); + NewsManager nm = new NewsManager(_context, _mgr, null); + nm.startup(); if (PluginStarter.pluginsEnabled(_context)) { t = new I2PAppThread(new PluginStarter(_context), "PluginStarter", true); 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 1dd724e95..9f79dbfc7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -3,14 +3,20 @@ package net.i2p.router.web; import java.io.File; import java.io.IOException; import java.io.Writer; +import java.text.DateFormat; import java.util.Collections; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TimeZone; +import net.i2p.app.ClientAppManager; import net.i2p.crypto.SigType; import net.i2p.data.DataHelper; import net.i2p.router.RouterContext; +import net.i2p.router.news.NewsEntry; +import net.i2p.router.news.NewsManager; import net.i2p.util.PortMapper; /** @@ -604,49 +610,45 @@ public class SummaryBarRenderer { String consoleNonce = CSSHelper.getNonce(); if (consoleNonce != null) { // Set up title and pre-headings stuff. - buf.append("

") + //buf.append("

") + buf.append("

") .append(_("News & Updates")) .append("

\n"); // Get news content. - String newsContent = newshelper.getContent(); - if (newsContent != "") { + List entries = Collections.emptyList(); + ClientAppManager cmgr = _context.clientAppManager(); + if (cmgr != null) { + NewsManager nmgr = (NewsManager) cmgr.getRegisteredApp(NewsManager.APP_NAME); + if (nmgr != null) + entries = nmgr.getEntries(); + } + if (!entries.isEmpty()) { buf.append("
    \n"); - // Parse news content for headings. - boolean foundEntry = false; - int start = newsContent.indexOf("

    "); - while (start >= 0) { - // Add offset to start: - // 4 - gets rid of

    - // 16 - gets rid of the date as well (assuming form "

    yyyy-mm-dd: Foobarbaz...") - // Don't truncate the "congratulations" in initial news - if (newsContent.length() > start + 16 && - newsContent.substring(start + 4, start + 6).equals("20") && - newsContent.substring(start + 14, start + 16).equals(": ")) - newsContent = newsContent.substring(start+16, newsContent.length()); - else - newsContent = newsContent.substring(start+4, newsContent.length()); - int end = newsContent.indexOf("

    "); - if (end >= 0) { - String heading = newsContent.substring(0, end); - buf.append("
  • ") - .append(heading) - .append("
    • \n"); - foundEntry = true; + DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT); + // the router sets the JVM time zone to UTC but saves the original here so we can get it + String systemTimeZone = _context.getProperty("i2p.systemTimeZone"); + if (systemTimeZone != null) + fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone)); + int i = 0; + final int max = 2; + for (NewsEntry entry : entries) { + buf.append("
  • "); + if (entry.updated > 0) { + Date date = new Date(entry.updated); + buf.append(fmt.format(date)) + .append(": "); } - start = newsContent.indexOf("

    "); + buf.append(entry.title) + .append("

    • \n"); + if (++i >= max) + break; } buf.append("
\n"); - // Set up string containing to show news. - String requestURI = _helper.getRequestURI(); - if (requestURI.contains("/home") && !foundEntry) { - buf.append("") - .append(_("Show news")) - .append("\n"); - } + //buf.append("") + // .append(_("Show all news")) + // .append("\n"); } else { buf.append("
") .append(_("none")) diff --git a/apps/routerconsole/jsp/news.jsp b/apps/routerconsole/jsp/news.jsp index 7629083bd..422c8b48f 100644 --- a/apps/routerconsole/jsp/news.jsp +++ b/apps/routerconsole/jsp/news.jsp @@ -14,5 +14,6 @@ " /> <% feedHelper.setLimit(0); %> +
-
+

diff --git a/history.txt b/history.txt index 94a5475e4..5b8cecb7d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2015-09-15 zzz + * Console: + - Store news feed items separately on disk in XML, like a real feed reader + - Limit display to 2 news items in summary bar, /home and /console + - New /news page to show all news (ticket #1425) + * 2015-09-12 0.9.22 released 2015-09-11 kytv diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 87e5bffca..282c18b42 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 = ""; From 37597b8c7de6882a4aff149202b40bb7ba8e66dc Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 16 Sep 2015 14:21:02 +0000 Subject: [PATCH 155/258] Build: - Include geoip in update files for next release - Add created-by string to release torrents i2psnark: - Store torrent added and completed times in config files, display on details page - Display dates on details page in local time zone - Add metainfo creation command line support for created-by string --- .../java/src/org/klomp/snark/MetaInfo.java | 5 ++- .../src/org/klomp/snark/SnarkManager.java | 33 +++++++++++++-- .../java/src/org/klomp/snark/Storage.java | 42 ++++++++++++++++--- .../org/klomp/snark/web/I2PSnarkServlet.java | 30 +++++++++++-- build.xml | 9 +++- 5 files changed, 103 insertions(+), 16 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 543753331..a40a68f8d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -74,10 +74,11 @@ public class MetaInfo * @param files null for single-file torrent * @param lengths null for single-file torrent * @param announce_list may be null + * @param created_by may be null */ MetaInfo(String announce, String name, String name_utf8, List> files, List lengths, int piece_length, byte[] piece_hashes, long length, boolean privateTorrent, - List> announce_list) + List> announce_list, String created_by) { this.announce = announce; this.name = name; @@ -91,7 +92,7 @@ public class MetaInfo this.privateTorrent = privateTorrent; this.announce_list = announce_list; this.comment = null; - this.created_by = null; + this.created_by = created_by; this.creation_date = I2PAppContext.getGlobalContext().clock().now(); // TODO if we add a parameter for other keys diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 7d64813e5..0552f9c67 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -96,6 +96,8 @@ public class SnarkManager implements CompleteListener { private static final String PROP_META_PRIORITY = "priority"; private static final String PROP_META_PRESERVE_NAMES = "preserveFileNames"; private static final String PROP_META_UPLOADED = "uploaded"; + private static final String PROP_META_ADDED = "added"; + private static final String PROP_META_COMPLETED = "completed"; //private static final String PROP_META_BITFIELD_SUFFIX = ".bitfield"; //private static final String PROP_META_PRIORITY_SUFFIX = ".priority"; private static final String PROP_META_MAGNET_PREFIX = "i2psnark.magnet."; @@ -1623,6 +1625,25 @@ public class SnarkManager implements CompleteListener { } return 0; } + + /** + * Get setting for a torrent from the config file. + * @return non-null, rv[0] is added time or 0; rv[1] is completed time or 0 + * @since 0.9.23 + */ + public long[] getSavedAddedAndCompleted(Snark snark) { + long[] rv = new long[2]; + Properties config = getConfig(snark); + if (config != null) { + try { + rv[0] = Long.parseLong(config.getProperty(PROP_META_ADDED)); + } catch (NumberFormatException nfe) {} + try { + rv[1] = Long.parseLong(config.getProperty(PROP_META_COMPLETED)); + } catch (NumberFormatException nfe) {} + } + return rv; + } /** * Save the completion status of a torrent and other data in the config file @@ -1661,19 +1682,25 @@ public class SnarkManager implements CompleteListener { private void locked_saveTorrentStatus(MetaInfo metainfo, BitField bitfield, int[] priorities, File base, boolean preserveNames, long uploaded, boolean stopped) { byte[] ih = metainfo.getInfoHash(); + Properties config = getConfig(ih); + String now = Long.toString(System.currentTimeMillis()); + config.setProperty(PROP_META_STAMP, now); + if (config.getProperty(PROP_META_ADDED) == null) + config.setProperty(PROP_META_ADDED, now); String bfs; if (bitfield.complete()) { bfs = "."; + if (config.getProperty(PROP_META_COMPLETED) == null) + config.setProperty(PROP_META_COMPLETED, now); } else { byte[] bf = bitfield.getFieldBytes(); bfs = Base64.encode(bf); + config.remove(PROP_META_COMPLETED); } - boolean running = !stopped; - Properties config = getConfig(ih); - config.setProperty(PROP_META_STAMP, Long.toString(System.currentTimeMillis())); config.setProperty(PROP_META_BITFIELD, bfs); config.setProperty(PROP_META_PRESERVE_NAMES, Boolean.toString(preserveNames)); config.setProperty(PROP_META_UPLOADED, Long.toString(uploaded)); + boolean running = !stopped; config.setProperty(PROP_META_RUNNING, Boolean.toString(running)); if (base != null) config.setProperty(PROP_META_BASE, base.getAbsolutePath()); diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 1a4b1fb4c..3156cf497 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -39,6 +39,8 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; +import gnu.getopt.Getopt; + import net.i2p.I2PAppContext; import net.i2p.crypto.SHA1; import net.i2p.data.ByteArray; @@ -123,10 +125,12 @@ public class Storage implements Closeable * * @param announce may be null * @param listener may be null + * @param created_by may be null * @throws IOException when creating and/or checking files fails. */ public Storage(I2PSnarkUtil util, File baseFile, String announce, List> announce_list, + String created_by, boolean privateTorrent, StorageListener listener) throws IOException { @@ -195,7 +199,7 @@ public class Storage implements Closeable byte[] piece_hashes = fast_digestCreate(); metainfo = new MetaInfo(announce, baseFile.getName(), null, files, lengthsList, piece_size, piece_hashes, total, privateTorrent, - announce_list); + announce_list, created_by); } @@ -1373,18 +1377,44 @@ public class Storage implements Closeable * @since 0.9.4 */ public static void main(String[] args) { - if (args.length < 1 || args.length > 2) { - System.err.println("Usage: Storage file-or-dir [announceURL]"); + boolean error = false; + String created_by = null; + String announce = null; + Getopt g = new Getopt("Storage", args, "a:c:"); + try { + int c; + while ((c = g.getopt()) != -1) { + switch (c) { + case 'a': + announce = g.getOptarg(); + break; + + case 'c': + created_by = g.getOptarg(); + break; + + case '?': + case ':': + default: + error = true; + break; + } // switch + } // while + } catch (Exception e) { + e.printStackTrace(); + error = true; + } + if (error || args.length - g.getOptind() != 1) { + System.err.println("Usage: Storage [-a announceURL] [-c created-by] file-or-dir"); System.exit(1); } - File base = new File(args[0]); - String announce = args.length == 2 ? args[1] : null; + File base = new File(args[g.getOptind()]); I2PAppContext ctx = I2PAppContext.getGlobalContext(); I2PSnarkUtil util = new I2PSnarkUtil(ctx); File file = null; FileOutputStream out = null; try { - Storage storage = new Storage(util, base, announce, null, false, null); + Storage storage = new Storage(util, base, announce, null, created_by, false, null); MetaInfo meta = storage.getMetaInfo(); file = new File(storage.getBaseName() + ".torrent"); out = new FileOutputStream(file); 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 4582bba68..f969687ca 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -18,6 +18,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; +import java.util.TimeZone; import java.util.TreeMap; import javax.servlet.ServletConfig; @@ -1230,7 +1231,7 @@ public class I2PSnarkServlet extends BasicServlet { // it shouldn't be THAT bad, so keep it in this thread. // TODO thread it for big torrents, perhaps a la FetchAndAdd boolean isPrivate = _manager.getPrivateTrackers().contains(announceURL); - Storage s = new Storage(_manager.util(), baseFile, announceURL, announceList, isPrivate, null); + Storage s = new Storage(_manager.util(), baseFile, announceURL, announceList, null, isPrivate, null); s.close(); // close the files... maybe need a way to pass this Storage to addTorrent rather than starting over MetaInfo info = s.getMetaInfo(); File torrentFile = new File(_manager.getDataDir(), s.getBaseName() + ".torrent"); @@ -2763,13 +2764,17 @@ public class I2PSnarkServlet extends BasicServlet { .append("

"); toThemeImg(buf, "details"); buf.append(" ") .append(_("Created")).append(": ") - .append(date).append(" UTC") + .append(date) .append("
"); + toThemeImg(buf, "details"); + buf.append(" ") + .append(_("Added")).append(": ") + .append(date) + .append("
"); + toThemeImg(buf, "details"); + buf.append(" ") + .append(_("Completed")).append(": ") + .append(date) + .append("
" + _("Allocating"); - } else if (err != null && curPeers == 0) { + } else if (err != null && isRunning && curPeers == 0) { + //} else if (err != null && curPeers == 0) { // Also don't show if seeding... but then we won't see the not-registered error // && remaining != 0 && needed != 0) { // let's only show this if we have no peers, otherwise PEX and DHT should bail us out, user doesn't care @@ -1486,19 +1487,19 @@ public class I2PSnarkServlet extends BasicServlet { // curPeers + thinsp(noThinsp) + // ngettext("1 peer", "{0} peers", knownPeers) + ""; //else if (isRunning) - if (isRunning) + //if (isRunning) { statusString = toThemeImg("trackererror", "", err) + "" + _("Tracker Error") + ": " + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); - else { - if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) - err = DataHelper.escapeHTML(err.substring(0, MAX_DISPLAYED_ERROR_LENGTH)) + "…"; - else - err = DataHelper.escapeHTML(err); - statusString = toThemeImg("trackererror", "", err) + "" + _("Tracker Error"); - } + //} else { + // if (err.length() > MAX_DISPLAYED_ERROR_LENGTH) + // err = DataHelper.escapeHTML(err.substring(0, MAX_DISPLAYED_ERROR_LENGTH)) + "…"; + // else + // err = DataHelper.escapeHTML(err); + // statusString = toThemeImg("trackererror", "", err) + "" + _("Tracker Error"); + //} } else if (snark.isStarting()) { statusString = toThemeImg("stalled", "", _("Starting")) + "" + _("Starting"); From b8a909c4cccc8e337597c78f7f7a50e2f4b53f3d Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 20:43:54 +0000 Subject: [PATCH 166/258] Fix eepget man page (ticket #1631) retry default was changed to 0 a while ago --- installer/resources/man/eepget.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/resources/man/eepget.1 b/installer/resources/man/eepget.1 index 8e4a4e3c4..c24e0fe0c 100644 --- a/installer/resources/man/eepget.1 +++ b/installer/resources/man/eepget.1 @@ -1,4 +1,4 @@ -.TH EEEPGET 1 "February 5, 2014" "" "Eepget - I2P Downloader" +.TH EEEPGET 1 "September 18, 2015" "" "Eepget - I2P Downloader" .SH NAME Eepget \- I2P downloader @@ -15,7 +15,7 @@ regular Internet are supported. .P Eepget is able to cope with slow or unstable network connections; if a download is not successful because of a network problem, it will keep retrying until the -whole file has been retrieved (by default up to three times). If supported by +whole file has been retrieved (if the -n option is set). If supported by the remote server, eepget will instruct the server to continue the download from the point of interruption. @@ -53,7 +53,7 @@ Controls the progress display. \fB\ markSize \fP is the number of bytes one '#' .B \fB\-n\fR retries .TP -Specify the number of times to retry downloading if the download isn't successful. If this option is not specified, eepget will retry downloading the file 5 times. +Specify the number of times to retry downloading if the download isn't successful. If this option is not specified, eepget will not retry. .TP .B From 462c882f4e31b881bace77eabe409e5d7c1ab12f Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 18 Sep 2015 22:54:32 +0000 Subject: [PATCH 167/258] i2psnark: Improve directory listing efficiency (ticket #1079) --- .../java/src/org/klomp/snark/Storage.java | 56 +++++++++++++++---- .../org/klomp/snark/web/I2PSnarkServlet.java | 4 +- .../java/src/org/klomp/snark/web/Sorters.java | 5 +- history.txt | 16 +++++- .../src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 3156cf497..d7f5d3988 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -341,29 +341,28 @@ public class Storage implements Closeable * @return number of bytes remaining; -1 if unknown file * @since 0.7.14 */ +/**** public long remaining(int fileIndex) { if (fileIndex < 0 || fileIndex >= _torrentFiles.size()) return -1; + if (complete()) + return 0; long bytes = 0; for (int i = 0; i < _torrentFiles.size(); i++) { TorrentFile tf = _torrentFiles.get(i); if (i == fileIndex) { - File f = tf.RAFfile; - if (complete()) - return 0; - int psz = piece_size; long start = bytes; long end = start + tf.length; - int pc = (int) (bytes / psz); + int pc = (int) (bytes / piece_size); long rv = 0; if (!bitfield.get(pc)) - rv = Math.min(psz - (start % psz), tf.length); - for (int j = pc + 1; (((long)j) * psz) < end && j < pieces; j++) { + rv = Math.min(piece_size - (start % piece_size), tf.length); + for (int j = pc + 1; (((long)j) * piece_size) < end && j < pieces; j++) { if (!bitfield.get(j)) { - if (((long)(j+1))*psz < end) - rv += psz; + if (((long)(j+1))*piece_size < end) + rv += piece_size; else - rv += end - (((long)j) * psz); + rv += end - (((long)j) * piece_size); } } return rv; @@ -372,6 +371,40 @@ public class Storage implements Closeable } return -1; } +****/ + + /** + * For efficiency, calculate remaining bytes for all files at once + * + * @return number of bytes remaining for each file, use indexOf() to get index for a file + * @since 0.9.23 + */ + public long[] remaining() { + long[] rv = new long[_torrentFiles.size()]; + if (complete()) + return rv; + long bytes = 0; + for (int i = 0; i < _torrentFiles.size(); i++) { + TorrentFile tf = _torrentFiles.get(i); + long start = bytes; + long end = start + tf.length; + int pc = (int) (bytes / piece_size); + long rvi = 0; + if (!bitfield.get(pc)) + rvi = Math.min(piece_size - (start % piece_size), tf.length); + for (int j = pc + 1; (((long)j) * piece_size) < end && j < pieces; j++) { + if (!bitfield.get(j)) { + if (((long)(j+1))*piece_size < end) + rvi += piece_size; + else + rvi += end - (((long)j) * piece_size); + } + } + rv[i] = rvi; + bytes += tf.length; + } + return rv; + } /** * @param fileIndex as obtained from indexOf @@ -455,9 +488,8 @@ public class Storage implements Closeable int file = 0; long pcEnd = -1; long fileEnd = _torrentFiles.get(0).length - 1; - int psz = piece_size; for (int i = 0; i < rv.length; i++) { - pcEnd += psz; + pcEnd += piece_size; int pri = _torrentFiles.get(file).priority; while (fileEnd <= pcEnd && file < _torrentFiles.size() - 1) { file++; 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 549ac435f..9d576f06e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -2936,8 +2936,10 @@ public class I2PSnarkServlet extends BasicServlet { Storage storage = snark != null ? snark.getStorage() : null; List fileList = new ArrayList(ls.length); + // precompute remaining for all files for efficiency + long[] remainingArray = (storage != null) ? storage.remaining() : null; for (int i = 0; i < ls.length; i++) { - fileList.add(new Sorters.FileAndIndex(ls[i], storage)); + fileList.add(new Sorters.FileAndIndex(ls[i], storage, remainingArray)); } boolean showSort = fileList.size() > 1; diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java index 3b71cf3f1..0bf598fd9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java @@ -356,13 +356,14 @@ class Sorters { /** * @param storage may be null + * @param remaining precomputed, non-null iff storage is non-null */ - public FileAndIndex(File file, Storage storage) { + public FileAndIndex(File file, Storage storage, long[] remainingArray) { this.file = file; index = storage != null ? storage.indexOf(file) : -1; if (index >= 0) { isDirectory = false; - remaining = storage.remaining(index); + remaining = remainingArray[index]; priority = storage.getPriority(index); } else { isDirectory = file.isDirectory(); diff --git a/history.txt b/history.txt index 97cc89d69..fec2331ba 100644 --- a/history.txt +++ b/history.txt @@ -1,7 +1,21 @@ +2015-09-18 zzz + * EepGet: + - Send Accept-Encoding: gzip even when proxied + - Fix man page (ticket #1631) + * i2psnark: + - Don't display "Tracker Error" if torrent is stopped (ticket #1654) + - Improve directory listing efficiency (ticket #1079) + * i2ptunnel: + - Pass Accept-Encoding header through HTTP client and server proxies, + to allow end-to-end compression + - Don't do transparent response compression if response + Content-Encoding indicates it is already compressed + * Streaming: Move remaining timers from the context to streaming's SimpleTimer2 + 2015-09-17 zzz * i2psnark: - Store magnet parameters across restart (ticket #1485) - - Don't delete torrent config file after error on initial startup (ticket #1658) + - Don't delete torrent config file after error on initial startup (tickets #1575, #1658) 2015-09-16 zzz * Build: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4e28a2c8d..c10128fe6 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 = ""; From 287f94ad19e805db20f61cc933091dbd7aa0da82 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Sep 2015 17:05:09 +0000 Subject: [PATCH 168/258] i2psnark: Add recheck/start/stop buttons to details page (ticket #372) remove dup CSS item --- .../java/src/org/klomp/snark/Snark.java | 3 +- .../src/org/klomp/snark/SnarkManager.java | 90 +++++++++++++++---- .../java/src/org/klomp/snark/Storage.java | 24 +++++ .../org/klomp/snark/web/I2PSnarkServlet.java | 53 +++++++++-- history.txt | 3 + .../resources/themes/snark/ubergine/snark.css | 18 ++-- .../resources/themes/snark/vanilla/snark.css | 12 +++ .../src/net/i2p/router/RouterVersion.java | 2 +- 8 files changed, 176 insertions(+), 29 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 60e8f6189..ba62cf627 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -1264,7 +1264,8 @@ public class Snark public void setWantedPieces(Storage storage) { - coordinator.setWantedPieces(); + if (coordinator != null) + coordinator.setWantedPieces(); } ///////////// End StorageListener methods diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 1e6f152a9..f140d4bab 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -8,6 +8,7 @@ import java.io.FilenameFilter; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -2364,28 +2365,36 @@ public class SnarkManager implements CompleteListener { public void startTorrent(byte[] infoHash) { for (Snark snark : _snarks.values()) { if (DataHelper.eq(infoHash, snark.getInfoHash())) { - if (snark.isStarting() || !snark.isStopped()) { - addMessage("Torrent already started"); - return; - } - boolean connected = _util.connected(); - if ((!connected) && !_util.isConnecting()) - addMessage(_("Opening the I2P tunnel")); - addMessage(_("Starting up torrent {0}", snark.getBaseName())); - if (connected) { - snark.startTorrent(); - } else { - // mark it for the UI - snark.setStarting(); - (new I2PAppThread(new ThreadedStarter(snark), "TorrentStarter", true)).start(); - try { Thread.sleep(200); } catch (InterruptedException ie) {} - } + startTorrent(snark); return; } } addMessage("Torrent not found?"); } + /** + * If not connected, thread it, otherwise inline + * @since 0.9.23 + */ + public void startTorrent(Snark snark) { + if (snark.isStarting() || !snark.isStopped()) { + addMessage("Torrent already started"); + return; + } + boolean connected = _util.connected(); + if ((!connected) && !_util.isConnecting()) + addMessage(_("Opening the I2P tunnel")); + addMessage(_("Starting up torrent {0}", snark.getBaseName())); + if (connected) { + snark.startTorrent(); + } else { + // mark it for the UI + snark.setStarting(); + (new I2PAppThread(new ThreadedStarter(snark), "TorrentStarter", true)).start(); + try { Thread.sleep(200); } catch (InterruptedException ie) {} + } + } + /** * If not connected, thread it, otherwise inline * @since 0.9.1 @@ -2498,6 +2507,55 @@ public class SnarkManager implements CompleteListener { } } } + + /** + * Threaded. Torrent must be stopped. + * @since 0.9.23 + */ + public void recheckTorrent(Snark snark) { + if (snark.isStarting() || !snark.isStopped()) { + addMessage("Cannot check " + snark.getBaseName() + ", torrent already started"); + return; + } + Storage storage = snark.getStorage(); + if (storage == null) { + addMessage("Cannot check " + snark.getBaseName() + ", no storage"); + return; + } + (new I2PAppThread(new ThreadedRechecker(snark), "TorrentRechecker", true)).start(); + try { Thread.sleep(200); } catch (InterruptedException ie) {} + } + + /** + * @since 0.9.23 + */ + private class ThreadedRechecker implements Runnable { + private final Snark snark; + /** must have non-null storage */ + public ThreadedRechecker(Snark s) { snark = s; } + public void run() { + try { + if (_log.shouldWarn()) + _log.warn("Starting recheck of " + snark.getBaseName()); + boolean changed = snark.getStorage().recheck(); + if (changed) + updateStatus(snark); + if (_log.shouldWarn()) + _log.warn("Finished recheck of " + snark.getBaseName() + " changed? " + changed); + if (changed) { + int pieces = snark.getPieces(); + double completion = (pieces - snark.getNeeded()) / (double) pieces; + String complete = (new DecimalFormat("0.00%")).format(completion); + addMessage(_("Finished recheck of torrent {0}, now {1} complete", snark.getBaseName(), complete)); + } else { + addMessage(_("Finished recheck of torrent {0}, unchanged", snark.getBaseName())); + } + } catch (Exception e) { + _log.error("Error rechecking " + snark.getBaseName(), e); + addMessage(_("Error checking the torrent {0}", snark.getBaseName()) + ": " + e); + } + } + } /** * ignore case, current locale diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index d7f5d3988..6d73ed658 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -533,6 +533,9 @@ public class Storage implements Closeable /** * Creates (and/or checks) all files from the metainfo file list. * Only call this once, and only after the constructor with the metainfo. + * Use recheck() to check again later. + * + * @throws IllegalStateException if called more than once */ public void check() throws IOException { @@ -543,6 +546,9 @@ public class Storage implements Closeable * Creates (and/or checks) all files from the metainfo file list. * Use a saved bitfield and timestamp from a config file. * Only call this once, and only after the constructor with the metainfo. + * Use recheck() to check again later. + * + * @throws IllegalStateException if called more than once */ public void check(long savedTime, BitField savedBitField) throws IOException { @@ -821,6 +827,24 @@ public class Storage implements Closeable return rv; } + /** + * Blocking. Holds lock. + * Recommend running only when stopped. + * Caller should thread. + * Calls listener.setWantedPieces() on completion if anything changed. + * + * @return true if anything changed, false otherwise + * @since 0.9.23 + */ + public boolean recheck() throws IOException { + int previousNeeded = needed; + checkCreateFiles(true); + boolean changed = previousNeeded != needed; + if (listener != null && changed) + listener.setWantedPieces(this); + return changed; + } + /** * This is called at the beginning, and at presumed completion, * so we have to be careful about locking. 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 9d576f06e..2368c7536 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -2613,10 +2613,21 @@ public class I2PSnarkServlet extends BasicServlet { String[] val = postParams.get("nonce"); if (val != null) { String nonce = val[0]; - if (String.valueOf(_nonce).equals(nonce)) - savePriorities(snark, postParams); - else + if (String.valueOf(_nonce).equals(nonce)) { + if (postParams.get("savepri") != null) { + savePriorities(snark, postParams); + } else if (postParams.get("stop") != null) { + _manager.stopTorrent(snark, false); + } else if (postParams.get("start") != null) { + _manager.startTorrent(snark); + } else if (postParams.get("recheck") != null) { + _manager.recheckTorrent(snark); + } else { + _manager.addMessage("Unknown command"); + } + } else { _manager.addMessage("Please retry form submission (bad nonce)"); + } } return null; } @@ -2639,6 +2650,7 @@ public class I2PSnarkServlet extends BasicServlet { r = new File(""); } + boolean showStopStart = snark != null; boolean showPriority = snark != null && snark.getStorage() != null && !snark.getStorage().complete() && r.isDirectory(); @@ -2668,7 +2680,8 @@ public class I2PSnarkServlet extends BasicServlet { if (parent) // always true buf.append("
"); - if (showPriority) { + // for stop/start/check + if (showStopStart || showPriority) { buf.append("\n"); buf.append("\n"); if (sortParam != null) { @@ -2905,7 +2918,36 @@ public class I2PSnarkServlet extends BasicServlet { .append(": ") .append(formatSize(snark.getPieceLength(0))) .append("
"); + toThemeImg(buf, "file"); + if (snark.isChecking()) { + buf.append(" ").append(_("Checking")).append("…   ") + .append("") + .append(_("Refresh page for results")).append(""); + } else if (snark.isStarting()) { + buf.append(" ").append(_("Starting")).append("…"); + } else if (snark.isAllocating()) { + buf.append(" ").append(_("Allocating")).append("…"); + } else { + boolean isRunning = !snark.isStopped(); + buf.append(" \n"); + else + buf.append(_("Start")).append("\" name=\"start\" class=\"starttorrent\">\n"); + buf.append("   \n"); + else + buf.append("\" class=\"reload\">\n"); + } + buf.append("
Not found
resource=\"").append(r.toString()) .append("\"
base=\"").append(base) @@ -3158,7 +3200,8 @@ public class I2PSnarkServlet extends BasicServlet { "
\n"); - if (showPriority) + // for stop/start/check + if (showStopStart || showPriority) buf.append(""); buf.append("
\n"); diff --git a/history.txt b/history.txt index fec2331ba..b88780ae4 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-09-19 zzz + * i2psnark: Add recheck/start/stop buttons to details page (ticket #372) + 2015-09-18 zzz * EepGet: - Send Accept-Encoding: gzip even when proxied diff --git a/installer/resources/themes/snark/ubergine/snark.css b/installer/resources/themes/snark/ubergine/snark.css index f2e09b4f9..facb2fae5 100644 --- a/installer/resources/themes/snark/ubergine/snark.css +++ b/installer/resources/themes/snark/ubergine/snark.css @@ -656,12 +656,6 @@ input.add { min-height: 22px; } -input.create { - background: #989 url('images/create.png') no-repeat 2px center; - padding: 2px 3px 2px 20px !important; - min-height: 22px; -} - input.cancel { background: #989 url('../../console/images/cancel.png') no-repeat 2px center; padding: 2px 3px 2px 20px !important; @@ -686,6 +680,18 @@ input.reload { min-height: 22px; } +input.starttorrent { + background: #989 url('images/start.png') no-repeat 2px center; + padding: 2px 3px 2px 20px !important; + min-height: 22px; +} + +input.stoptorrent { + background: #989 url('images/stop.png') no-repeat 2px center; + padding: 2px 3px 2px 20px !important; + min-height: 22px; +} + select { background: #333; background: url('/themes/snark/ubergine/images/graytile.png') !important; diff --git a/installer/resources/themes/snark/vanilla/snark.css b/installer/resources/themes/snark/vanilla/snark.css index ddbcd8e8c..b5ab1155b 100644 --- a/installer/resources/themes/snark/vanilla/snark.css +++ b/installer/resources/themes/snark/vanilla/snark.css @@ -694,6 +694,18 @@ input.reload { min-height: 22px; } +input.starttorrent { + background: #f3efc7 url('images/start.png') no-repeat 2px center; + padding: 2px 3px 2px 20px !important; + min-height: 22px; +} + +input.stoptorrent { + background: #f3efc7 url('images/stop.png') no-repeat 2px center; + padding: 2px 3px 2px 20px !important; + min-height: 22px; +} + select { background: #fff; /* background: url('/themes/snark/ubergine/images/graytile.png') !important;*/ diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index c10128fe6..fecba78d6 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 = ""; From 2a3b55f3a405755fbd2382c54b6f8bcb2099cfca Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Sep 2015 17:54:07 +0000 Subject: [PATCH 169/258] i2psnark: Add check progress output --- .../java/src/org/klomp/snark/Snark.java | 12 ++++++++++ .../java/src/org/klomp/snark/Storage.java | 22 +++++++++++++++++++ .../org/klomp/snark/web/I2PSnarkServlet.java | 8 ++++--- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index ba62cf627..c8fd37970 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -745,6 +745,18 @@ public class Snark return storage != null && storage.isChecking(); } + /** + * If checking is in progress, return completion 0-100, + * else return 100. + * @since 0.9.23 + */ + public double getCheckingProgress() { + if (storage != null && storage.isChecking()) + return storage.getCheckingProgress(); + else + return 100.0d; + } + /** * Disk allocation (ballooning) in progress. * @since 0.9.3 diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 6d73ed658..7d80aa291 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -73,6 +73,7 @@ public class Storage implements Closeable private boolean changed; private volatile boolean _isChecking; private final AtomicInteger _allocateCount = new AtomicInteger(); + private final AtomicInteger _checkProgress = new AtomicInteger(); /** The default piece size. */ private static final int DEFAULT_PIECE_SIZE = 256*1024; @@ -311,6 +312,18 @@ public class Storage implements Closeable return _isChecking; } + /** + * If checking is in progress, return completion 0-100, + * else return 100. + * @since 0.9.23 + */ + public double getCheckingProgress() { + if (_isChecking) + return _checkProgress.get() / (double) pieces; + else + return 100.0d; + } + /** * Disk allocation (ballooning) in progress. * Always false on Windows. @@ -869,6 +882,7 @@ public class Storage implements Closeable private void locked_checkCreateFiles(boolean recheck) throws IOException { + _checkProgress.set(0); // Whether we are resuming or not, // if any of the files already exists we assume we are resuming. boolean resume = false; @@ -885,13 +899,16 @@ public class Storage implements Closeable // Make sure all files are available and of correct length // The files should all exist as they have been created with zero length by createFilesFromNames() + long lengthProgress = 0; for (TorrentFile tf : _torrentFiles) { long length = tf.RAFfile.length(); + lengthProgress += tf.length; if(tf.RAFfile.exists() && length == tf.length) { if (listener != null) listener.storageAllocated(this, length); + _checkProgress.set(0); resume = true; // XXX Could dynamicly check } else if (length == 0) { @@ -903,6 +920,8 @@ public class Storage implements Closeable tf.closeRAF(); } catch (IOException ioe) {} } + if (!resume) + _checkProgress.set((int) (pieces * lengthProgress / total_length)); } else { String msg = "File '" + tf.name + "' exists, but has wrong length (expected " + tf.length + " but found " + length + ") - repairing corruption"; @@ -911,6 +930,7 @@ public class Storage implements Closeable _log.error(msg); changed = true; resume = true; + _checkProgress.set(0); _probablyComplete = false; // to force RW synchronized(tf) { RandomAccessFile raf = tf.checkRAF(); @@ -931,6 +951,7 @@ public class Storage implements Closeable long pieceEnd = 0; for (int i = 0; i < pieces; i++) { + _checkProgress.set(i); int length = getUncheckedPiece(i, piece); boolean correctHash = metainfo.checkPiece(i, piece, 0, length); // close as we go so we don't run out of file descriptors @@ -957,6 +978,7 @@ public class Storage implements Closeable } } + _checkProgress.set(pieces); _probablyComplete = complete(); // close all the files so we don't end up with a zillion open ones; // we will reopen as needed 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 2368c7536..f59ae0bdc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1471,7 +1471,8 @@ public class I2PSnarkServlet extends BasicServlet { String statusString; if (snark.isChecking()) { statusString = toThemeImg("stalled", "", _("Checking")) + "" + - "" + _("Checking"); + "" + _("Checking") + ' ' + + (new DecimalFormat("0.00%")).format(snark.getCheckingProgress()); } else if (snark.isAllocating()) { statusString = toThemeImg("stalled", "", _("Allocating")) + "" + "" + _("Allocating"); @@ -2924,8 +2925,9 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); toThemeImg(buf, "file"); if (snark.isChecking()) { - buf.append(" ").append(_("Checking")).append("…   ") - .append("") + buf.append(" ").append(_("Checking")).append("… ") + .append((new DecimalFormat("0.00%")).format(snark.getCheckingProgress())) + .append("   ") .append(_("Refresh page for results")).append(""); } else if (snark.isStarting()) { buf.append(" ").append(_("Starting")).append("…"); From cfc0664756fb66c83b3371178c762696d02b6ed7 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 19 Sep 2015 19:06:07 +0000 Subject: [PATCH 170/258] Don't try to fetch subscriptions, news, or plugin updates while in VM Comm system --- .../java/src/net/i2p/addressbook/SubscriptionIterator.java | 3 ++- .../java/src/net/i2p/router/update/NewsFetcher.java | 5 +++++ .../java/src/net/i2p/router/web/PluginStarter.java | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java index b8b1df28b..74e946f95 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/SubscriptionIterator.java @@ -76,7 +76,8 @@ class SubscriptionIterator implements Iterator { public AddressBook next() { Subscription sub = this.subIterator.next(); if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() && - I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0) { + I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 && + !I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) { //System.err.println("Fetching addressbook from " + sub.getLocation()); return new AddressBook(sub, this.proxyHost, this.proxyPort); } else { diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index 44ab24e3c..209d91253 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -99,6 +99,11 @@ class NewsFetcher extends UpdateRunner { _log.warn("Cannot fetch news - HTTP client tunnel not running"); return; } + if (shouldProxy && _context.commSystem().isDummy()) { + if (_log.shouldWarn()) + _log.warn("Cannot fetch news - VM Comm system"); + return; + } for (URI uri : _urls) { _currentURI = addLang(uri); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java index d0a6277e0..608de2aea 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java @@ -157,6 +157,12 @@ public class PluginStarter implements Runnable { Messages.getString("HTTP client proxy tunnel must be running", ctx)); return; } + if (ctx.commSystem().isDummy()) { + mgr.notifyComplete(null, Messages.getString("Plugin update check failed", ctx) + + " - " + + "VM Comm System"); + return; + } Log log = ctx.logManager().getLog(PluginStarter.class); int updated = 0; From 02a0ef3526fe874861d965baf6b8a9145213391c Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 20 Sep 2015 00:44:51 +0000 Subject: [PATCH 171/258] include man pages in the update --- build.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.xml b/build.xml index 7d409ff1f..ea10ca4bb 100644 --- a/build.xml +++ b/build.xml @@ -1402,6 +1402,9 @@ ---------------- EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE" + + + From b81cbedd5ca33d9ce75ec7be3c8dfe15e653322a Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 20 Sep 2015 11:08:27 +0000 Subject: [PATCH 172/258] format multiplies by 100, so complete is 1.0 --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 6 +++--- apps/i2psnark/java/src/org/klomp/snark/Storage.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index c8fd37970..952850597 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -746,15 +746,15 @@ public class Snark } /** - * If checking is in progress, return completion 0-100, - * else return 100. + * If checking is in progress, return completion 0.0 ... 1.0, + * else return 1.0. * @since 0.9.23 */ public double getCheckingProgress() { if (storage != null && storage.isChecking()) return storage.getCheckingProgress(); else - return 100.0d; + return 1.0d; } /** diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java index 7d80aa291..62cb1aa45 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java @@ -313,15 +313,15 @@ public class Storage implements Closeable } /** - * If checking is in progress, return completion 0-100, - * else return 100. + * If checking is in progress, return completion 0.0 ... 1.0, + * else return 1.0. * @since 0.9.23 */ public double getCheckingProgress() { if (_isChecking) return _checkProgress.get() / (double) pieces; else - return 100.0d; + return 1.0d; } /** From c56f686d8c65403fdd28d6511e358cea3f896a14 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sun, 20 Sep 2015 19:23:50 +0000 Subject: [PATCH 173/258] Fix typo. --- apps/i2psnark/java/src/org/klomp/snark/Snark.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/Snark.java b/apps/i2psnark/java/src/org/klomp/snark/Snark.java index 952850597..f8dadb627 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/Snark.java +++ b/apps/i2psnark/java/src/org/klomp/snark/Snark.java @@ -1286,7 +1286,7 @@ public class Snark /** SnarkSnutdown callback unused */ public void shutdown() { - // Should not be necessary since all non-deamon threads should + // Should not be necessary since all non-daemon threads should // have died. But in reality this does not always happen. //System.exit(0); } From 6685b81834ece39789654e738cea542ec927406e Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sun, 20 Sep 2015 19:28:11 +0000 Subject: [PATCH 174/258] /configreseed: Add 'Reset URL list' button for revert to default hosts (ticket #1554, thanks dzirtt@gmail.com) --- .../java/src/net/i2p/router/web/ConfigReseedHandler.java | 9 +++++++++ apps/routerconsole/jsp/configreseed.jsp | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java index 2dd4330a1..8ae56c77c 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java @@ -96,10 +96,19 @@ public class ConfigReseedHandler extends FormHandler { } } else if (_action.equals(_("Save changes"))) { saveChanges(); + } else if (_action.equals(_("Reset URL list"))) { + resetUrlList(); } //addFormError(_("Unsupported") + ' ' + _action + '.'); } + private void resetUrlList() { + if (_context.router().saveConfig(Reseeder.PROP_RESEED_URL, null)) + addFormNotice(_("URL list reset successfully")); + else + addFormError(_("URL list reset failed")); + } + /** @since 0.8.9 */ private void saveString(String config, String param) { String val = getJettyString(param); diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index b78b4cb14..de2351e9e 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -77,7 +77,9 @@ > <%=intl._("Use non-SSL only")%> <%=intl._("Reseed URLs")%>: - + +
" />
+ <%=intl._("Enable HTTP Proxy?")%> > From 7dd438b5f0a8f7db22f0a14ba567828c2a94d63d Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sun, 20 Sep 2015 19:29:47 +0000 Subject: [PATCH 175/258] bump --- 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 fecba78d6..a6204817e 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 = 7; + public final static long BUILD = 8; /** for example "-test" */ public final static String EXTRA = ""; From 5a2f22b00f660ca8fe710d1bf19df949431fdd4f Mon Sep 17 00:00:00 2001 From: dg2-new Date: Sun, 20 Sep 2015 19:34:10 +0000 Subject: [PATCH 176/258] history --- history.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/history.txt b/history.txt index b88780ae4..b6097d90a 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-09-20 dg + * /configreseed: Add 'Reset URL list' button for revert to default hosts (ticket #1554, thanks dzirtt@gmail.com) + 2015-09-19 zzz * i2psnark: Add recheck/start/stop buttons to details page (ticket #372) From 62acfc0cae044bf72bf22d6d19821ba3eabf3ed0 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 21 Sep 2015 12:35:39 +0000 Subject: [PATCH 177/258] use standard error message --- .../java/src/net/i2p/router/web/ConfigReseedHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java index 8ae56c77c..ba45058f4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigReseedHandler.java @@ -106,7 +106,7 @@ public class ConfigReseedHandler extends FormHandler { if (_context.router().saveConfig(Reseeder.PROP_RESEED_URL, null)) addFormNotice(_("URL list reset successfully")); else - addFormError(_("URL list reset failed")); + addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs")); } /** @since 0.8.9 */ From 53ae7279357ae3082917dab5dc7414449dde27d5 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 21 Sep 2015 14:54:08 +0000 Subject: [PATCH 178/258] synch fix --- apps/jetty/java/src/net/i2p/jetty/JettyStart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java index 73b4b4d78..6cac1cbae 100644 --- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java +++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java @@ -98,7 +98,7 @@ public class JettyStart implements ClientApp { } } - public void startup() { + public synchronized void startup() { if (_state != INITIALIZED) return; if (_jettys.isEmpty()) { From 3f213cf1dbfbcdce50eec622506e4f7d8d6058c4 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 21 Sep 2015 15:13:39 +0000 Subject: [PATCH 179/258] register I2CP with the PortMapper --- core/java/src/net/i2p/util/PortMapper.java | 2 ++ .../net/i2p/router/client/ClientListenerRunner.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java index 816020433..d32a4f5a5 100644 --- a/core/java/src/net/i2p/util/PortMapper.java +++ b/core/java/src/net/i2p/util/PortMapper.java @@ -33,6 +33,8 @@ public class PortMapper { public static final String SVC_BOB = "BOB"; /** not necessary, already in config? */ public static final String SVC_I2CP = "I2CP"; + /** @since 0.9.23 */ + public static final String SVC_I2CP_SSL = "I2CP-SSL"; /** * @param context unused for now diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java index e88339b0e..10e924106 100644 --- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java +++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java @@ -18,6 +18,7 @@ import net.i2p.client.I2PClient; import net.i2p.router.Router; import net.i2p.router.RouterContext; import net.i2p.util.Log; +import net.i2p.util.PortMapper; /** * Listen for connections on the specified port, and toss them onto the client manager's @@ -78,13 +79,18 @@ class ClientListenerRunner implements Runnable { protected void runServer() { _running = true; int curDelay = 1000; + final String portMapperService = (this instanceof SSLClientListenerRunner) ? PortMapper.SVC_I2CP_SSL + : PortMapper.SVC_I2CP; while (_running) { try { _socket = getServerSocket(); if (_log.shouldLog(Log.DEBUG)) _log.debug("ServerSocket created, before accept: " + _socket); - + if (_port > 0) { + // not for DomainClientListenerRunner + _context.portMapper().register(portMapperService, _socket.getInetAddress().getHostAddress(), _port); + } curDelay = 1000; _listening = true; while (_running) { @@ -115,6 +121,11 @@ class ClientListenerRunner implements Runnable { } catch (IOException ioe) { if (isAlive()) _log.error("Error listening on port " + _port, ioe); + } finally { + if (_port > 0) { + // not for DomainClientListenerRunner + _context.portMapper().unregister(portMapperService); + } } _listening = false; From 04d653a8b919047aae12f85bed368ed01c30ef38 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 21 Sep 2015 15:21:54 +0000 Subject: [PATCH 180/258] comment out main() --- core/java/src/net/i2p/crypto/KeyStoreUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java index c374ad120..06b73cea8 100644 --- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java +++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java @@ -501,6 +501,7 @@ public class KeyStoreUtil { l.log(level, msg, t); } +/**** public static void main(String[] args) { try { if (args.length > 0) { @@ -521,4 +522,5 @@ public class KeyStoreUtil { e.printStackTrace(); } } +****/ } From 0faa5ba2f4b429f48d679795ce5e71fb9005f3b5 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 24 Sep 2015 18:28:26 +0000 Subject: [PATCH 181/258] i2psnark: - Rename bad .torrent files instead of deleting them - Add mime type for .xz --- .../src/org/klomp/snark/SnarkManager.java | 58 ++++++++++--------- .../org/klomp/snark/web/I2PSnarkServlet.java | 2 +- apps/i2psnark/mime.properties | 1 + 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index f140d4bab..af9293db0 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1242,30 +1242,34 @@ public class SnarkManager implements CompleteListener { } String rejectMessage = validateTorrent(info); if (rejectMessage != null) { - sfile.delete(); - addMessage(rejectMessage); - return; - } else { - // TODO load saved closest DHT nodes and pass to the Snark ? - // This may take a LONG time - if (baseFile == null) - baseFile = getSavedBaseFile(info.getInfoHash()); - if (_log.shouldLog(Log.INFO)) - _log.info("New Snark, torrent: " + filename + " base: " + baseFile); - torrent = new Snark(_util, filename, null, -1, null, null, this, - _peerCoordinatorSet, _connectionAcceptor, - shouldAutoStart(), dataDir.getPath(), baseFile); - loadSavedFilePriorities(torrent); - synchronized (_snarks) { - _snarks.put(filename, torrent); - } + throw new IOException(rejectMessage); + } + + // TODO load saved closest DHT nodes and pass to the Snark ? + // This may take a LONG time + if (baseFile == null) + baseFile = getSavedBaseFile(info.getInfoHash()); + if (_log.shouldLog(Log.INFO)) + _log.info("New Snark, torrent: " + filename + " base: " + baseFile); + torrent = new Snark(_util, filename, null, -1, null, null, this, + _peerCoordinatorSet, _connectionAcceptor, + shouldAutoStart(), dataDir.getPath(), baseFile); + loadSavedFilePriorities(torrent); + synchronized (_snarks) { + _snarks.put(filename, torrent); } } catch (IOException ioe) { - String err = _("Torrent in \"{0}\" is invalid", sfile.getName()) + ": " + ioe.getMessage(); + String err = _("Torrent in \"{0}\" is invalid", sfile.toString()) + ": " + ioe.getMessage(); addMessage(err); _log.error(err, ioe); - if (sfile.exists()) - sfile.delete(); + File rename = new File(filename + ".BAD"); + if (rename.exists()) { + if (sfile.delete()) + addMessage(_("Torrent file deleted: {0}", sfile.toString())); + } else { + if (FileUtil.rename(sfile, rename)) + addMessage(_("Torrent file moved from {0} to {1}", sfile.toString(), rename.toString())); + } return; } catch (OutOfMemoryError oom) { addMessage(_("ERROR - Out of memory, cannot create torrent from {0}", sfile.getName()) + ": " + oom.getMessage()); @@ -1895,18 +1899,18 @@ public class SnarkManager implements CompleteListener { private String validateTorrent(MetaInfo info) { List> files = info.getFiles(); if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) { - return _("Too many files in \"{0}\" ({1}), deleting it!", info.getName(), files.size()); + return _("Too many files in \"{0}\" ({1})!", info.getName(), files.size()); } else if ( (files == null) && (info.getName().endsWith(".torrent")) ) { - return _("Torrent file \"{0}\" cannot end in \".torrent\", deleting it!", info.getName()); + return _("Torrent file \"{0}\" cannot end in \".torrent\"!", info.getName()); } else if (info.getPieces() <= 0) { - return _("No pieces in \"{0}\", deleting it!", info.getName()); + return _("No pieces in \"{0}\"!", info.getName()); } else if (info.getPieces() > Storage.MAX_PIECES) { - return _("Too many pieces in \"{0}\", limit is {1}, deleting it!", info.getName(), Storage.MAX_PIECES); + return _("Too many pieces in \"{0}\", limit is {1}!", info.getName(), Storage.MAX_PIECES); } else if (info.getPieceLength(0) > Storage.MAX_PIECE_SIZE) { - return _("Pieces are too large in \"{0}\" ({1}B), deleting it.", info.getName(), DataHelper.formatSize2(info.getPieceLength(0))) + ' ' + + return _("Pieces are too large in \"{0}\" ({1}B)!", info.getName(), DataHelper.formatSize2(info.getPieceLength(0))) + ' ' + _("Limit is {0}B", DataHelper.formatSize2(Storage.MAX_PIECE_SIZE)); } else if (info.getTotalLength() <= 0) { - return _("Torrent \"{0}\" has no data, deleting it!", info.getName()); + return _("Torrent \"{0}\" has no data!", info.getName()); } else if (info.getTotalLength() > Storage.MAX_TOTAL_SIZE) { System.out.println("torrent info: " + info.toString()); List lengths = info.getLengths(); @@ -1914,7 +1918,7 @@ public class SnarkManager implements CompleteListener { for (int i = 0; i < lengths.size(); i++) System.out.println("File " + i + " is " + lengths.get(i) + " long."); - return _("Torrents larger than {0}B are not supported yet, deleting \"{1}\"", Storage.MAX_TOTAL_SIZE, info.getName()); + return _("Torrents larger than {0}B are not supported yet \"{1}\"!", Storage.MAX_TOTAL_SIZE, info.getName()); } else { // ok return null; 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 f59ae0bdc..08ea4c24f 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -3274,7 +3274,7 @@ public class I2PSnarkServlet extends BasicServlet { icon = "itoopie_xxsm"; else icon = "compress"; - } else if (mime.equals("application/x-gtar") || + } else if (mime.equals("application/x-gtar") || mime.equals("application/x-xz") || mime.equals("application/compress") || mime.equals("application/gzip") || mime.equals("application/x-7z-compressed") || mime.equals("application/x-rar-compressed") || mime.equals("application/x-tar") || mime.equals("application/x-bzip2")) diff --git a/apps/i2psnark/mime.properties b/apps/i2psnark/mime.properties index 6739efc49..7f21bea1c 100644 --- a/apps/i2psnark/mime.properties +++ b/apps/i2psnark/mime.properties @@ -31,3 +31,4 @@ war = application/java-archive webm = video/webm wma = audio/x-ms-wma wmv = video/x-ms-wmv +xz = application/x-xz From 04690bed9f1be9bb1b1b5c7c8e7cf21bba983eec Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 24 Sep 2015 19:08:36 +0000 Subject: [PATCH 182/258] close before rename --- apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index af9293db0..ee9aa5ccb 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -1259,6 +1259,8 @@ public class SnarkManager implements CompleteListener { _snarks.put(filename, torrent); } } catch (IOException ioe) { + // close before rename/delete for windows + if (fis != null) try { fis.close(); fis = null; } catch (IOException ioe2) {} String err = _("Torrent in \"{0}\" is invalid", sfile.toString()) + ": " + ioe.getMessage(); addMessage(err); _log.error(err, ioe); From 22b9876b68a8fb6bc40d7b8c313d75dac678e116 Mon Sep 17 00:00:00 2001 From: dg2-new Date: Fri, 25 Sep 2015 19:55:36 +0000 Subject: [PATCH 183/258] Rename _() for translation to _t() for Java 9 compatibility (ticket #1456) --- apps/desktopgui/bundle-messages.sh | 10 +- .../i2p/desktopgui/ExternalTrayManager.java | 4 +- .../i2p/desktopgui/InternalTrayManager.java | 8 +- .../src/net/i2p/desktopgui/TrayManager.java | 4 +- .../gui/DesktopguiConfigurationFrame.java | 8 +- .../desktopgui/i18n/DesktopguiTranslator.java | 4 +- apps/i2psnark/java/bundle-messages.sh | 4 +- .../src/org/klomp/snark/I2PSnarkUtil.java | 2 +- .../src/org/klomp/snark/SnarkManager.java | 190 +++---- .../src/org/klomp/snark/web/FetchAndAdd.java | 24 +- .../org/klomp/snark/web/I2PSnarkServlet.java | 514 +++++++++--------- apps/i2psnark/locale/messages_ar.po | 2 +- apps/i2psnark/locale/messages_cs.po | 2 +- apps/i2psnark/locale/messages_de.po | 2 +- apps/i2psnark/locale/messages_en.po | 2 +- apps/i2psnark/locale/messages_es.po | 2 +- apps/i2psnark/locale/messages_fr.po | 2 +- apps/i2psnark/locale/messages_hu.po | 2 +- apps/i2psnark/locale/messages_it.po | 2 +- apps/i2psnark/locale/messages_nb.po | 2 +- apps/i2psnark/locale/messages_nl.po | 2 +- apps/i2psnark/locale/messages_pl.po | 2 +- apps/i2psnark/locale/messages_pt.po | 2 +- apps/i2psnark/locale/messages_pt_bR.po | 2 +- apps/i2psnark/locale/messages_ro.po | 2 +- apps/i2psnark/locale/messages_ru.po | 2 +- apps/i2psnark/locale/messages_sk.po | 2 +- apps/i2psnark/locale/messages_sv.po | 2 +- apps/i2psnark/locale/messages_vi.po | 2 +- apps/i2psnark/locale/messages_zh.po | 2 +- apps/i2ptunnel/java/bundle-messages-proxy.sh | 6 +- apps/i2ptunnel/java/bundle-messages.sh | 6 +- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 22 +- .../i2ptunnel/I2PTunnelHTTPClientBase.java | 12 +- .../localServer/LocalHTTPServer.java | 28 +- .../net/i2p/i2ptunnel/ui/GeneralHelper.java | 8 +- .../src/net/i2p/i2ptunnel/web/EditBean.java | 10 +- .../src/net/i2p/i2ptunnel/web/IndexBean.java | 60 +- .../src/net/i2p/i2ptunnel/web/Messages.java | 8 +- apps/i2ptunnel/jsp/editClient.jsp | 194 +++---- apps/i2ptunnel/jsp/editServer.jsp | 200 +++---- apps/i2ptunnel/jsp/index.jsp | 116 ++-- apps/i2ptunnel/jsp/wizard.jsp | 192 +++---- apps/ministreaming/java/bundle-messages.sh | 4 +- .../client/streaming/I2PSocketException.java | 6 +- .../java/bundle-messages-countries.sh | 8 +- .../java/bundle-messages-news.sh | 6 +- apps/routerconsole/java/bundle-messages.sh | 10 +- .../router/update/ConsoleUpdateManager.java | 32 +- .../router/update/DevSU3UpdateChecker.java | 6 +- .../router/update/DevSU3UpdateHandler.java | 2 +- .../i2p/router/update/DevSU3UpdateRunner.java | 2 +- .../net/i2p/router/update/NewsFetcher.java | 8 +- .../router/update/PluginUpdateChecker.java | 4 +- .../router/update/PluginUpdateHandler.java | 4 +- .../i2p/router/update/PluginUpdateRunner.java | 84 +-- .../router/update/UnsignedUpdateChecker.java | 4 +- .../router/update/UnsignedUpdateHandler.java | 2 +- .../router/update/UnsignedUpdateRunner.java | 2 +- .../net/i2p/router/update/UpdateHandler.java | 2 +- .../net/i2p/router/update/UpdateRunner.java | 18 +- .../net/i2p/router/web/BanlistRenderer.java | 22 +- .../src/net/i2p/router/web/CSSHelper.java | 4 +- .../i2p/router/web/ConfigAdvancedHandler.java | 10 +- .../i2p/router/web/ConfigClientsHandler.java | 94 ++-- .../i2p/router/web/ConfigClientsHelper.java | 66 +-- .../net/i2p/router/web/ConfigHomeHandler.java | 22 +- .../i2p/router/web/ConfigKeyringHandler.java | 20 +- .../i2p/router/web/ConfigLoggingHandler.java | 4 +- .../i2p/router/web/ConfigLoggingHelper.java | 12 +- .../net/i2p/router/web/ConfigNavHelper.java | 2 +- .../net/i2p/router/web/ConfigNetHandler.java | 68 +-- .../net/i2p/router/web/ConfigNetHelper.java | 12 +- .../net/i2p/router/web/ConfigPeerHandler.java | 28 +- .../i2p/router/web/ConfigReseedHandler.java | 42 +- .../net/i2p/router/web/ConfigRestartBean.java | 26 +- .../i2p/router/web/ConfigServiceHandler.java | 56 +- .../i2p/router/web/ConfigStatsHandler.java | 10 +- .../net/i2p/router/web/ConfigStatsHelper.java | 4 +- .../i2p/router/web/ConfigSummaryHandler.java | 48 +- .../i2p/router/web/ConfigTunnelsHandler.java | 8 +- .../i2p/router/web/ConfigTunnelsHelper.java | 26 +- .../net/i2p/router/web/ConfigUIHandler.java | 30 +- .../net/i2p/router/web/ConfigUIHelper.java | 16 +- .../i2p/router/web/ConfigUpdateHandler.java | 38 +- .../i2p/router/web/ConfigUpdateHelper.java | 14 +- .../net/i2p/router/web/EventLogHelper.java | 28 +- .../src/net/i2p/router/web/FormHandler.java | 14 +- .../src/net/i2p/router/web/GraphHelper.java | 60 +- .../src/net/i2p/router/web/HelperBase.java | 10 +- .../src/net/i2p/router/web/HomeHelper.java | 14 +- .../net/i2p/router/web/JobQueueHelper.java | 36 +- .../src/net/i2p/router/web/LogsHelper.java | 16 +- .../java/src/net/i2p/router/web/Messages.java | 2 +- .../src/net/i2p/router/web/NetDbHelper.java | 4 +- .../src/net/i2p/router/web/NetDbRenderer.java | 76 +-- .../router/web/ProfileOrganizerRenderer.java | 110 ++-- .../net/i2p/router/web/ProfilesHelper.java | 4 +- .../src/net/i2p/router/web/SearchHelper.java | 2 +- .../net/i2p/router/web/StatSummarizer.java | 4 +- .../net/i2p/router/web/StatsGenerator.java | 56 +- .../i2p/router/web/SummaryBarRenderer.java | 190 +++---- .../src/net/i2p/router/web/SummaryHelper.java | 122 ++--- .../net/i2p/router/web/SummaryRenderer.java | 30 +- .../net/i2p/router/web/TunnelRenderer.java | 60 +- apps/routerconsole/java/strings/Strings.java | 100 ++-- apps/routerconsole/jsp/config.jsp | 32 +- apps/routerconsole/jsp/configadvanced.jsp | 28 +- apps/routerconsole/jsp/configclients.jsp | 98 ++-- apps/routerconsole/jsp/confighome.jsp | 44 +- apps/routerconsole/jsp/configkeyring.jsp | 24 +- apps/routerconsole/jsp/configlogging.jsp | 32 +- apps/routerconsole/jsp/confignet.jsp | 240 ++++---- apps/routerconsole/jsp/configpeer.jsp | 28 +- apps/routerconsole/jsp/configreseed.jsp | 84 +-- apps/routerconsole/jsp/configservice.jsp | 70 +-- apps/routerconsole/jsp/configsidebar.jsp | 14 +- apps/routerconsole/jsp/configstats.jsp | 26 +- apps/routerconsole/jsp/configtunnels.jsp | 24 +- apps/routerconsole/jsp/configui.jsp | 26 +- apps/routerconsole/jsp/configupdate.jsp | 44 +- apps/routerconsole/jsp/console.jsp | 4 +- apps/routerconsole/jsp/dns.jsp | 6 +- apps/routerconsole/jsp/error.jsp | 4 +- apps/routerconsole/jsp/error500.jsp | 20 +- apps/routerconsole/jsp/events.jsp | 2 +- apps/routerconsole/jsp/graph.jsp | 2 +- apps/routerconsole/jsp/graphs.jsp | 2 +- apps/routerconsole/jsp/home.jsp | 16 +- apps/routerconsole/jsp/i2ptunnelmgr.jsp | 6 +- apps/routerconsole/jsp/jobs.jsp | 2 +- apps/routerconsole/jsp/logs.jsp | 22 +- apps/routerconsole/jsp/netdb.jsp | 2 +- apps/routerconsole/jsp/news.jsp | 2 +- apps/routerconsole/jsp/nowebapp.jsp | 6 +- apps/routerconsole/jsp/peers.jsp | 2 +- apps/routerconsole/jsp/profiles.jsp | 2 +- apps/routerconsole/jsp/stats.jsp | 2 +- apps/routerconsole/jsp/summary.jsi | 6 +- apps/routerconsole/jsp/summaryajax.jsi | 2 +- apps/routerconsole/jsp/summaryframe.jsp | 6 +- apps/routerconsole/jsp/summarynoframe.jsi | 2 +- apps/routerconsole/jsp/torrents.jsp | 6 +- apps/routerconsole/jsp/tunnels.jsp | 2 +- apps/routerconsole/jsp/viewprofile.jsp | 4 +- apps/routerconsole/jsp/webmail.jsp | 6 +- apps/routerconsole/locale/messages_ar.po | 4 +- apps/routerconsole/locale/messages_cs.po | 4 +- apps/routerconsole/locale/messages_da.po | 4 +- apps/routerconsole/locale/messages_de.po | 4 +- apps/routerconsole/locale/messages_el.po | 4 +- apps/routerconsole/locale/messages_en.po | 4 +- apps/routerconsole/locale/messages_es.po | 4 +- apps/routerconsole/locale/messages_et.po | 4 +- apps/routerconsole/locale/messages_fi.po | 4 +- apps/routerconsole/locale/messages_fr.po | 4 +- apps/routerconsole/locale/messages_hu.po | 4 +- apps/routerconsole/locale/messages_it.po | 4 +- apps/routerconsole/locale/messages_ja.po | 4 +- apps/routerconsole/locale/messages_nb.po | 4 +- apps/routerconsole/locale/messages_nl.po | 4 +- apps/routerconsole/locale/messages_pl.po | 4 +- apps/routerconsole/locale/messages_pt.po | 4 +- apps/routerconsole/locale/messages_pt_BR.po | 4 +- apps/routerconsole/locale/messages_ro.po | 4 +- apps/routerconsole/locale/messages_ru.po | 4 +- apps/routerconsole/locale/messages_sv.po | 4 +- apps/routerconsole/locale/messages_tr.po | 4 +- apps/routerconsole/locale/messages_uk.po | 4 +- apps/routerconsole/locale/messages_vi.po | 4 +- apps/routerconsole/locale/messages_zh.po | 4 +- apps/susidns/src/bundle-messages.sh | 6 +- .../java/src/i2p/susi/dns/AddressBean.java | 42 +- .../src/i2p/susi/dns/AddressbookBean.java | 40 +- .../src/java/src/i2p/susi/dns/BaseBean.java | 6 +- .../src/java/src/i2p/susi/dns/ConfigBean.java | 12 +- .../src/java/src/i2p/susi/dns/Messages.java | 4 +- .../src/i2p/susi/dns/NamingServiceBean.java | 42 +- .../src/i2p/susi/dns/SubscriptionsBean.java | 14 +- apps/susidns/src/jsp/addressbook.jsp | 70 +-- apps/susidns/src/jsp/config.jsp | 64 +-- apps/susidns/src/jsp/details.jsp | 56 +- apps/susidns/src/jsp/index.jsp | 44 +- apps/susidns/src/jsp/subscriptions.jsp | 36 +- apps/susimail/bundle-messages.sh | 4 +- apps/susimail/locale/messages_cs.po | 10 +- apps/susimail/locale/messages_da.po | 10 +- apps/susimail/locale/messages_de.po | 10 +- apps/susimail/locale/messages_en.po | 10 +- apps/susimail/locale/messages_es.po | 10 +- apps/susimail/locale/messages_fi.po | 10 +- apps/susimail/locale/messages_fr.po | 10 +- apps/susimail/locale/messages_hu.po | 10 +- apps/susimail/locale/messages_in.po | 10 +- apps/susimail/locale/messages_it.po | 10 +- apps/susimail/locale/messages_ja.po | 10 +- apps/susimail/locale/messages_mg.po | 10 +- apps/susimail/locale/messages_nl.po | 10 +- apps/susimail/locale/messages_pl.po | 10 +- apps/susimail/locale/messages_pt.po | 10 +- apps/susimail/locale/messages_pt_BR.po | 10 +- apps/susimail/locale/messages_ro.po | 10 +- apps/susimail/locale/messages_ru.po | 10 +- apps/susimail/locale/messages_sq.po | 10 +- apps/susimail/locale/messages_sv.po | 10 +- apps/susimail/locale/messages_uk.po | 10 +- apps/susimail/locale/messages_vi.po | 10 +- apps/susimail/locale/messages_zh.po | 10 +- .../src/src/i2p/susi/webmail/MailPart.java | 4 +- .../src/src/i2p/susi/webmail/Messages.java | 2 +- .../src/src/i2p/susi/webmail/WebMail.java | 274 +++++----- .../i2p/susi/webmail/pop3/POP3MailBox.java | 16 +- .../src/i2p/susi/webmail/smtp/SMTPClient.java | 16 +- core/java/src/net/i2p/data/DataHelper.java | 6 +- core/java/src/net/i2p/util/LogWriterBase.java | 4 +- core/java/src/net/i2p/util/Translate.java | 2 +- history.txt | 3 + router/java/src/net/i2p/router/Blocklist.java | 12 +- .../src/net/i2p/router/RouterVersion.java | 2 +- .../i2p/router/networkdb/reseed/Reseeder.java | 24 +- .../transport/CommSystemFacadeImpl.java | 4 +- .../i2p/router/transport/TransportImpl.java | 4 +- .../router/transport/TransportManager.java | 68 +-- .../src/net/i2p/router/transport/UPnP.java | 74 +-- .../net/i2p/router/transport/UPnPManager.java | 4 +- .../router/transport/ntcp/NTCPTransport.java | 36 +- .../router/transport/udp/UDPTransport.java | 86 +-- 227 files changed, 2930 insertions(+), 2927 deletions(-) diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh index 957199923..997c76887 100644 --- a/apps/desktopgui/bundle-messages.sh +++ b/apps/desktopgui/bundle-messages.sh @@ -64,19 +64,19 @@ do 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") + # _t("foo") # _x("foo") - # intl._("foo") + # intl._t("foo") # intl.title("foo") - # handler._("foo") - # formhandler._("foo") + # handler._t("foo") + # formhandler._t("foo") # net.i2p.router.web.Messages.getString("foo") # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. find $JPATHS -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ - --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ + --keyword=_t --keyword=_x --keyword=intl._ --keyword=intl.title \ --keyword=handler._ --keyword=formhandler._ \ --keyword=net.i2p.router.web.Messages.getString \ -o ${i}t diff --git a/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java index 6fea46fef..2a3a16b63 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/ExternalTrayManager.java @@ -20,7 +20,7 @@ public class ExternalTrayManager extends TrayManager { @Override public PopupMenu getMainMenu() { PopupMenu popup = new PopupMenu(); - MenuItem startItem = new MenuItem(_("Start I2P")); + MenuItem startItem = new MenuItem(_t("Start I2P")); startItem.addActionListener(new ActionListener() { @Override @@ -35,7 +35,7 @@ public class ExternalTrayManager extends TrayManager { @Override protected void done() { - trayIcon.displayMessage(_("Starting"), _("I2P is starting!"), TrayIcon.MessageType.INFO); + trayIcon.displayMessage(_t("Starting"), _t("I2P is starting!"), TrayIcon.MessageType.INFO); //Hide the tray icon. //We cannot stop the desktopgui program entirely, //since that risks killing the I2P process as well. diff --git a/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java index e1247dde6..1cb464308 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java @@ -23,7 +23,7 @@ public class InternalTrayManager extends TrayManager { public PopupMenu getMainMenu() { PopupMenu popup = new PopupMenu(); - MenuItem browserLauncher = new MenuItem(_("Launch I2P Browser")); + MenuItem browserLauncher = new MenuItem(_t("Launch I2P Browser")); browserLauncher.addActionListener(new ActionListener() { @Override @@ -47,7 +47,7 @@ public class InternalTrayManager extends TrayManager { }.execute(); } }); - MenuItem desktopguiConfigurationLauncher = new MenuItem(_("Configure desktopgui")); + MenuItem desktopguiConfigurationLauncher = new MenuItem(_t("Configure desktopgui")); desktopguiConfigurationLauncher.addActionListener(new ActionListener() { @Override @@ -64,7 +64,7 @@ public class InternalTrayManager extends TrayManager { } }); - MenuItem restartItem = new MenuItem(_("Restart I2P")); + MenuItem restartItem = new MenuItem(_t("Restart I2P")); restartItem.addActionListener(new ActionListener() { @Override @@ -82,7 +82,7 @@ public class InternalTrayManager extends TrayManager { } }); - MenuItem stopItem = new MenuItem(_("Stop I2P")); + MenuItem stopItem = new MenuItem(_t("Stop I2P")); stopItem.addActionListener(new ActionListener() { @Override diff --git a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java index f124ee3f6..227050735 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java @@ -78,7 +78,7 @@ public abstract class TrayManager { return image; } - protected static String _(String s) { - return DesktopguiTranslator._(s); + protected static String _t(String s) { + return DesktopguiTranslator._t(s); } } diff --git a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java index 1e49f6609..a697c5779 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/gui/DesktopguiConfigurationFrame.java @@ -40,10 +40,10 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame { cancelButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - setTitle(_("Tray icon configuration")); + setTitle(_t("Tray icon configuration")); desktopguiEnabled.setSelected(true); - desktopguiEnabled.setText(_("Should tray icon be enabled?")); + desktopguiEnabled.setText(_t("Should tray icon be enabled?")); desktopguiEnabled.setActionCommand("shouldDesktopguiBeEnabled"); okButton.setText("OK"); @@ -98,8 +98,8 @@ public class DesktopguiConfigurationFrame extends javax.swing.JFrame { configureDesktopgui(); }//GEN-LAST:event_okButtonMouseReleased - protected static String _(String s) { - return DesktopguiTranslator._(s); + protected static String _t(String s) { + return DesktopguiTranslator._t(s); } private void configureDesktopgui() { diff --git a/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java b/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java index e95cbc01f..3778c4ad9 100644 --- a/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java +++ b/apps/desktopgui/src/net/i2p/desktopgui/i18n/DesktopguiTranslator.java @@ -16,11 +16,11 @@ public class DesktopguiTranslator { return ctx; } - public static String _(String s) { + public static String _t(String s) { return Translate.getString(s, getRouterContext(), BUNDLE_NAME); } - public static String _(String s, Object o) { + public static String _t(String s, Object o) { return Translate.getString(s, o, getRouterContext(), BUNDLE_NAME); } } diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh index 033e1195b..9632ee958 100755 --- a/apps/i2psnark/java/bundle-messages.sh +++ b/apps/i2psnark/java/bundle-messages.sh @@ -63,13 +63,13 @@ do 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") + # _t("foo") # _x("foo") # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean poupdate. find $JPATHS -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ - --keyword=_ --keyword=_x \ + --keyword=_t --keyword=_x \ -o ${i}t if [ $? -ne 0 ] then diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 75570e04a..e75ef301e 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -660,7 +660,7 @@ public class I2PSnarkUtil { * 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. * Use autoboxing to call with ints, longs, floats, etc. */ diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index ee9aa5ccb..bcb4fa34c 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -776,9 +776,9 @@ public class SnarkManager implements CompleteListener { _util.setMaxUploaders(limit); changed = true; _config.setProperty(PROP_UPLOADERS_TOTAL, Integer.toString(limit)); - addMessage(_("Total uploaders limit changed to {0}", limit)); + addMessage(_t("Total uploaders limit changed to {0}", limit)); } else { - addMessage(_("Minimum total uploaders limit is {0}", Snark.MIN_TOTAL_UPLOADERS)); + addMessage(_t("Minimum total uploaders limit is {0}", Snark.MIN_TOTAL_UPLOADERS)); } } } @@ -790,9 +790,9 @@ public class SnarkManager implements CompleteListener { _util.setMaxUpBW(limit); changed = true; _config.setProperty(PROP_UPBW_MAX, Integer.toString(limit)); - addMessage(_("Up BW limit changed to {0}KBps", limit)); + addMessage(_t("Up BW limit changed to {0}KBps", limit)); } else { - addMessage(_("Minimum up bandwidth limit is {0}KBps", MIN_UP_BW)); + addMessage(_t("Minimum up bandwidth limit is {0}KBps", MIN_UP_BW)); } } } @@ -804,7 +804,7 @@ public class SnarkManager implements CompleteListener { _util.setStartupDelay(minutes); changed = true; _config.setProperty(PROP_STARTUP_DELAY, Integer.toString(minutes)); - addMessage(_("Startup delay changed to {0}", DataHelper.formatDuration2(minutes * (60L * 1000)))); + addMessage(_t("Startup delay changed to {0}", DataHelper.formatDuration2(minutes * (60L * 1000)))); } } @@ -815,9 +815,9 @@ public class SnarkManager implements CompleteListener { changed = true; _config.setProperty(PROP_REFRESH_DELAY, Integer.toString(secs)); if (secs >= 0) - addMessage(_("Refresh time changed to {0}", DataHelper.formatDuration2(secs * 1000))); + addMessage(_t("Refresh time changed to {0}", DataHelper.formatDuration2(secs * 1000))); else - addMessage(_("Refresh disabled")); + addMessage(_t("Refresh disabled")); } } catch (NumberFormatException nfe) {} } @@ -833,7 +833,7 @@ public class SnarkManager implements CompleteListener { changed = true; pageSize = Integer.toString(size); _config.setProperty(PROP_PAGE_SIZE, pageSize); - addMessage(_("Page size changed to {0}", pageSize)); + addMessage(_t("Page size changed to {0}", pageSize)); } } catch (NumberFormatException nfe) {} } @@ -842,18 +842,18 @@ public class SnarkManager implements CompleteListener { dataDir = DataHelper.stripHTML(dataDir.trim()); File dd = new File(dataDir); if (!dd.isAbsolute()) { - addMessage(_("Data directory must be an absolute path") + ": " + dataDir); + addMessage(_t("Data directory must be an absolute path") + ": " + dataDir); } else if (!dd.exists()) { - addMessage(_("Data directory does not exist") + ": " + dataDir); + addMessage(_t("Data directory does not exist") + ": " + dataDir); } else if (!dd.isDirectory()) { - addMessage(_("Not a directory") + ": " + dataDir); + addMessage(_t("Not a directory") + ": " + dataDir); } else if (!dd.canRead()) { - addMessage(_("Unreadable") + ": " + dataDir); + addMessage(_t("Unreadable") + ": " + dataDir); } else { changed = true; interruptMonitor = true; _config.setProperty(PROP_DIR, dataDir); - addMessage(_("Data directory changed to {0}", dataDir)); + addMessage(_t("Data directory changed to {0}", dataDir)); } } @@ -908,37 +908,37 @@ public class SnarkManager implements CompleteListener { p.putAll(opts); _util.setI2CPConfig(i2cpHost, port, p); _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW)); - addMessage(_("I2CP and tunnel changes will take effect after stopping all torrents")); + addMessage(_t("I2CP and tunnel changes will take effect after stopping all torrents")); } else if (!reconnect) { // The usual case, the other two are if not in router context _config.setProperty(PROP_I2CP_OPTS, i2cpOpts.trim()); - addMessage(_("I2CP options changed to {0}", i2cpOpts)); + addMessage(_t("I2CP options changed to {0}", i2cpOpts)); _util.setI2CPConfig(oldI2CPHost, oldI2CPPort, opts); } else { // Won't happen, I2CP host/port, are hidden in the GUI if in router context if (_util.connected()) { _util.disconnect(); - addMessage(_("Disconnecting old I2CP destination")); + addMessage(_t("Disconnecting old I2CP destination")); } - addMessage(_("I2CP settings changed to {0}", i2cpHost + ':' + port + ' ' + i2cpOpts)); + addMessage(_t("I2CP settings changed to {0}", i2cpHost + ':' + port + ' ' + i2cpOpts)); _util.setI2CPConfig(i2cpHost, port, opts); _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW)); boolean ok = _util.connect(); if (!ok) { - addMessage(_("Unable to connect with the new settings, reverting to the old I2CP settings")); + addMessage(_t("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(_t("Unable to reconnect with the old settings!")); } else { - addMessage(_("Reconnected on the new I2CP destination")); + addMessage(_t("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()); // no PeerAcceptors/I2PServerSockets to deal with, since all snarks are inactive for (Snark snark : _snarks.values()) { if (snark.restartAcceptor()) { - addMessage(_("I2CP listener restarted for \"{0}\"", snark.getBaseName())); + addMessage(_t("I2CP listener restarted for \"{0}\"", snark.getBaseName())); // this is the common ConnectionAcceptor, so we only need to do it once break; } @@ -952,44 +952,44 @@ public class SnarkManager implements CompleteListener { _config.setProperty(PROP_FILES_PUBLIC, Boolean.toString(filesPublic)); _util.setFilesPublic(filesPublic); if (filesPublic) - addMessage(_("New files will be publicly readable")); + addMessage(_t("New files will be publicly readable")); else - addMessage(_("New files will not be publicly readable")); + addMessage(_t("New files will not be publicly readable")); changed = true; } if (shouldAutoStart() != autoStart) { _config.setProperty(PROP_AUTO_START, Boolean.toString(autoStart)); if (autoStart) - addMessage(_("Enabled autostart")); + addMessage(_t("Enabled autostart")); else - addMessage(_("Disabled autostart")); + addMessage(_t("Disabled autostart")); changed = true; } if (_util.shouldUseOpenTrackers() != useOpenTrackers) { _config.setProperty(PROP_USE_OPENTRACKERS, useOpenTrackers + ""); if (useOpenTrackers) - addMessage(_("Enabled open trackers - torrent restart required to take effect.")); + addMessage(_t("Enabled open trackers - torrent restart required to take effect.")); else - addMessage(_("Disabled open trackers - torrent restart required to take effect.")); + addMessage(_t("Disabled open trackers - torrent restart required to take effect.")); _util.setUseOpenTrackers(useOpenTrackers); changed = true; } if (_util.shouldUseDHT() != useDHT) { _config.setProperty(PROP_USE_DHT, Boolean.toString(useDHT)); if (useDHT) - addMessage(_("Enabled DHT.")); + addMessage(_t("Enabled DHT.")); else - addMessage(_("Disabled DHT.")); + addMessage(_t("Disabled DHT.")); if (_util.connected()) - addMessage(_("DHT change requires tunnel shutdown and reopen")); + addMessage(_t("DHT change requires tunnel shutdown and reopen")); _util.setUseDHT(useDHT); changed = true; } if (theme != null) { if(!theme.equals(_config.getProperty(PROP_THEME))) { _config.setProperty(PROP_THEME, theme); - addMessage(_("{0} theme loaded, return to main i2psnark page to view.", theme)); + addMessage(_t("{0} theme loaded, return to main i2psnark page to view.", theme)); changed = true; } } @@ -999,7 +999,7 @@ public class SnarkManager implements CompleteListener { // Data dir changed. this will stop and remove all old torrents, and add the new ones _monitor.interrupt(); } else { - addMessage(_("Configuration unchanged.")); + addMessage(_t("Configuration unchanged.")); } } @@ -1031,7 +1031,7 @@ public class SnarkManager implements CompleteListener { if (ot == null) ot = getListConfig(PROP_OPENTRACKERS, DEFAULT_OPENTRACKERS); _util.setOpenTrackers(ot); - addMessage(_("Open Tracker list changed - torrent restart required to take effect.")); + addMessage(_t("Open Tracker list changed - torrent restart required to take effect.")); saveConfig(); } @@ -1041,7 +1041,7 @@ public class SnarkManager implements CompleteListener { */ public void savePrivateTrackers(List pt) { setListConfig(PROP_PRIVATETRACKERS, pt); - addMessage(_("Private tracker list changed - affects newly created torrents only.")); + addMessage(_t("Private tracker list changed - affects newly created torrents only.")); saveConfig(); } @@ -1087,7 +1087,7 @@ public class SnarkManager implements CompleteListener { DataHelper.storeProps(_config, _configFile); } } catch (IOException ioe) { - addMessage(_("Unable to save the config to {0}", _configFile.getAbsolutePath())); + addMessage(_t("Unable to save the config to {0}", _configFile.getAbsolutePath())); } } @@ -1168,10 +1168,10 @@ public class SnarkManager implements CompleteListener { */ private void addTorrent(String filename, File baseFile, boolean dontAutoStart, File dataDir) { if ((!dontAutoStart) && !_util.connected()) { - addMessage(_("Connecting to I2P")); + addMessage(_t("Connecting to I2P")); boolean ok = _util.connect(); if (!ok) { - addMessage(_("Error connecting to I2P - check your I2CP settings!")); + addMessage(_t("Error connecting to I2P - check your I2CP settings!")); return; } } @@ -1180,7 +1180,7 @@ public class SnarkManager implements CompleteListener { filename = sfile.getCanonicalPath(); } catch (IOException ioe) { _log.error("Unable to add the torrent " + filename, ioe); - addMessage(_("Error: Could not add the torrent {0}", filename) + ": " + ioe); + addMessage(_t("Error: Could not add the torrent {0}", filename) + ": " + ioe); return; } if (dataDir == null) @@ -1203,7 +1203,7 @@ public class SnarkManager implements CompleteListener { fis = new FileInputStream(sfile); } catch (IOException ioe) { // catch this here so we don't try do delete it below - addMessage(_("Cannot open \"{0}\"", sfile.getName()) + ": " + ioe.getMessage()); + addMessage(_t("Cannot open \"{0}\"", sfile.getName()) + ": " + ioe.getMessage()); return; } @@ -1222,21 +1222,21 @@ public class SnarkManager implements CompleteListener { Snark snark = getTorrentByInfoHash(info.getInfoHash()); if (snark != null) { // TODO - if the existing one is a magnet, delete it and add the metainfo instead? - addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); + addMessage(_t("Torrent with this info hash is already running: {0}", snark.getBaseName())); return; } if (!TrackerClient.isValidAnnounce(info.getAnnounce())) { if (info.isPrivate()) { - addMessage(_("ERROR - No I2P trackers in private torrent \"{0}\"", info.getName())); + addMessage(_t("ERROR - No I2P trackers in private torrent \"{0}\"", info.getName())); } else if (!_util.getOpenTrackers().isEmpty()) { - addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName())); - //addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only.", info.getName())); + addMessage(_t("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName())); + //addMessage(_t("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers only.", info.getName())); } else if (_util.shouldUseDHT()) { - addMessage(_("Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will announce to DHT only.", info.getName())); + addMessage(_t("Warning - No I2P trackers in \"{0}\", and open trackers are disabled, will announce to DHT only.", info.getName())); } else { - addMessage(_("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName())); - //addMessage(_("Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is enabled before starting this torrent.", info.getName())); + addMessage(_t("Warning - No I2P trackers in \"{0}\", and DHT and open trackers are disabled, you should enable open trackers or DHT before starting the torrent.", info.getName())); + //addMessage(_t("Warning - No I2P Trackers found in \"{0}\". Make sure Open Tracker is enabled before starting this torrent.", info.getName())); dontAutoStart = true; } } @@ -1261,20 +1261,20 @@ public class SnarkManager implements CompleteListener { } catch (IOException ioe) { // close before rename/delete for windows if (fis != null) try { fis.close(); fis = null; } catch (IOException ioe2) {} - String err = _("Torrent in \"{0}\" is invalid", sfile.toString()) + ": " + ioe.getMessage(); + String err = _t("Torrent in \"{0}\" is invalid", sfile.toString()) + ": " + ioe.getMessage(); addMessage(err); _log.error(err, ioe); File rename = new File(filename + ".BAD"); if (rename.exists()) { if (sfile.delete()) - addMessage(_("Torrent file deleted: {0}", sfile.toString())); + addMessage(_t("Torrent file deleted: {0}", sfile.toString())); } else { if (FileUtil.rename(sfile, rename)) - addMessage(_("Torrent file moved from {0} to {1}", sfile.toString(), rename.toString())); + addMessage(_t("Torrent file moved from {0} to {1}", sfile.toString(), rename.toString())); } return; } catch (OutOfMemoryError oom) { - addMessage(_("ERROR - Out of memory, cannot create torrent from {0}", sfile.getName()) + ": " + oom.getMessage()); + addMessage(_t("ERROR - Out of memory, cannot create torrent from {0}", sfile.getName()) + ": " + oom.getMessage()); return; } finally { if (fis != null) try { fis.close(); } catch (IOException ioe) {} @@ -1295,9 +1295,9 @@ public class SnarkManager implements CompleteListener { // Were we running last time? if (!dontAutoStart && shouldAutoStart() && running) { torrent.startTorrent(); - addMessage(_("Torrent added and started: \"{0}\"", torrent.getBaseName())); + addMessage(_t("Torrent added and started: \"{0}\"", torrent.getBaseName())); } else { - addMessage(_("Torrent added: \"{0}\"", torrent.getBaseName())); + addMessage(_t("Torrent added: \"{0}\"", torrent.getBaseName())); } } @@ -1362,7 +1362,7 @@ public class SnarkManager implements CompleteListener { synchronized (_snarks) { Snark snark = getTorrentByInfoHash(ih); if (snark != null) { - addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); + addMessage(_t("Torrent with this info hash is already running: {0}", snark.getBaseName())); return null; } // Tell the dir monitor not to delete us @@ -1373,17 +1373,17 @@ public class SnarkManager implements CompleteListener { } if (autoStart) { startTorrent(ih); - addMessage(_("Fetching {0}", name)); + addMessage(_t("Fetching {0}", name)); DHT dht = _util.getDHT(); boolean shouldWarn = _util.connected() && _util.getOpenTrackers().isEmpty() && ((!_util.shouldUseDHT()) || dht == null || dht.size() <= 0); if (shouldWarn) { - addMessage(_("Open trackers are disabled and we have no DHT peers. " + + addMessage(_t("Open trackers are disabled and we have no DHT peers. " + "Fetch of {0} may not succeed until you start another torrent, enable open trackers, or enable DHT.", name)); } } else { - addMessage(_("Adding {0}", name)); + addMessage(_t("Adding {0}", name)); } return torrent; } @@ -1416,7 +1416,7 @@ public class SnarkManager implements CompleteListener { synchronized (_snarks) { Snark snark = getTorrentByInfoHash(torrent.getInfoHash()); if (snark != null) { - addMessage(_("Download already running: {0}", snark.getBaseName())); + addMessage(_t("Download already running: {0}", snark.getBaseName())); return; } String name = torrent.getName(); @@ -1450,7 +1450,7 @@ public class SnarkManager implements CompleteListener { synchronized (_snarks) { Snark snark = getTorrentByInfoHash(metainfo.getInfoHash()); if (snark != null) { - addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); + addMessage(_t("Torrent with this info hash is already running: {0}", snark.getBaseName())); return false; } else { saveTorrentStatus(metainfo, bitfield, null, baseFile, true, 0, true); // no file priorities @@ -1461,7 +1461,7 @@ public class SnarkManager implements CompleteListener { // hold the lock for a long time addTorrent(filename, baseFile, dontAutoStart); } catch (IOException ioe) { - addMessage(_("Failed to copy torrent file to {0}", filename)); + addMessage(_t("Failed to copy torrent file to {0}", filename)); _log.error("Failed to write torrent file", ioe); return false; } @@ -1487,7 +1487,7 @@ public class SnarkManager implements CompleteListener { synchronized (_snarks) { boolean success = FileUtil.copy(fromfile.getAbsolutePath(), filename, false); if (!success) { - addMessage(_("Failed to copy torrent file to {0}", filename)); + addMessage(_t("Failed to copy torrent file to {0}", filename)); _log.error("Failed to write torrent file to " + filename); return; } @@ -1901,18 +1901,18 @@ public class SnarkManager implements CompleteListener { private String validateTorrent(MetaInfo info) { List> files = info.getFiles(); if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) { - return _("Too many files in \"{0}\" ({1})!", info.getName(), files.size()); + return _t("Too many files in \"{0}\" ({1})!", info.getName(), files.size()); } else if ( (files == null) && (info.getName().endsWith(".torrent")) ) { - return _("Torrent file \"{0}\" cannot end in \".torrent\"!", info.getName()); + return _t("Torrent file \"{0}\" cannot end in \".torrent\"!", info.getName()); } else if (info.getPieces() <= 0) { - return _("No pieces in \"{0}\"!", info.getName()); + return _t("No pieces in \"{0}\"!", info.getName()); } else if (info.getPieces() > Storage.MAX_PIECES) { - return _("Too many pieces in \"{0}\", limit is {1}!", info.getName(), Storage.MAX_PIECES); + return _t("Too many pieces in \"{0}\", limit is {1}!", info.getName(), Storage.MAX_PIECES); } else if (info.getPieceLength(0) > Storage.MAX_PIECE_SIZE) { - return _("Pieces are too large in \"{0}\" ({1}B)!", info.getName(), DataHelper.formatSize2(info.getPieceLength(0))) + ' ' + - _("Limit is {0}B", DataHelper.formatSize2(Storage.MAX_PIECE_SIZE)); + return _t("Pieces are too large in \"{0}\" ({1}B)!", info.getName(), DataHelper.formatSize2(info.getPieceLength(0))) + ' ' + + _t("Limit is {0}B", DataHelper.formatSize2(Storage.MAX_PIECE_SIZE)); } else if (info.getTotalLength() <= 0) { - return _("Torrent \"{0}\" has no data!", info.getName()); + return _t("Torrent \"{0}\" has no data!", info.getName()); } else if (info.getTotalLength() > Storage.MAX_TOTAL_SIZE) { System.out.println("torrent info: " + info.toString()); List lengths = info.getLengths(); @@ -1920,7 +1920,7 @@ public class SnarkManager implements CompleteListener { for (int i = 0; i < lengths.size(); i++) System.out.println("File " + i + " is " + lengths.get(i) + " long."); - return _("Torrents larger than {0}B are not supported yet \"{1}\"!", Storage.MAX_TOTAL_SIZE, info.getName()); + return _t("Torrents larger than {0}B are not supported yet \"{1}\"!", Storage.MAX_TOTAL_SIZE, info.getName()); } else { // ok return null; @@ -1937,7 +1937,7 @@ public class SnarkManager implements CompleteListener { filename = sfile.getCanonicalPath(); } catch (IOException ioe) { _log.error("Unable to remove the torrent " + filename, ioe); - addMessage(_("Error: Could not remove the torrent {0}", filename) + ": " + ioe.getMessage()); + addMessage(_t("Error: Could not remove the torrent {0}", filename) + ": " + ioe.getMessage()); return null; } int remaining = 0; @@ -1960,7 +1960,7 @@ public class SnarkManager implements CompleteListener { if (shouldRemove) removeTorrentStatus(torrent); if (!wasStopped) - addMessage(_("Torrent stopped: \"{0}\"", torrent.getBaseName())); + addMessage(_t("Torrent stopped: \"{0}\"", torrent.getBaseName())); } return torrent; } @@ -1979,7 +1979,7 @@ public class SnarkManager implements CompleteListener { boolean wasStopped = torrent.isStopped(); torrent.stopTorrent(); if (!wasStopped) - addMessage(_("Torrent stopped: \"{0}\"", torrent.getBaseName())); + addMessage(_t("Torrent stopped: \"{0}\"", torrent.getBaseName())); if (shouldRemove) removeTorrentStatus(torrent); } @@ -1999,7 +1999,7 @@ public class SnarkManager implements CompleteListener { File torrentFile = new File(filename); torrentFile.delete(); } - addMessage(_("Torrent removed: \"{0}\"", torrent.getBaseName())); + addMessage(_t("Torrent removed: \"{0}\"", torrent.getBaseName())); } private class DirMonitor implements Runnable { @@ -2007,7 +2007,7 @@ public class SnarkManager implements CompleteListener { // don't bother delaying if auto start is false long delay = (60L * 1000) * getStartupDelayMinutes(); if (delay > 0 && shouldAutoStart()) { - addMessage(_("Adding torrents in {0}", DataHelper.formatDuration2(delay))); + addMessage(_t("Adding torrents in {0}", DataHelper.formatDuration2(delay))); try { Thread.sleep(delay); } catch (InterruptedException ie) {} // Remove that first message if (_messages.size() == 1) @@ -2041,7 +2041,7 @@ public class SnarkManager implements CompleteListener { _log.error("Error in the DirectoryMonitor", e); } if (!_snarks.isEmpty()) - addMessage(_("Up bandwidth limit is {0} KBps", _util.getMaxUpBW())); + addMessage(_t("Up bandwidth limit is {0} KBps", _util.getMaxUpBW())); // To fix bug where files were left behind, // but also good for when user removes snarks when i2p is not running // Don't run if there was an error, as we would delete the torrent config @@ -2072,7 +2072,7 @@ public class SnarkManager implements CompleteListener { buf.append('/'); buf.append("\">").append(base).append(""); if (snark.getDownloaded() > 0) - addMessageNoEscape(_("Download finished: {0}", buf.toString())); // + " (" + _("size: {0}B", DataHelper.formatSize2(len)) + ')'); + addMessageNoEscape(_t("Download finished: {0}", buf.toString())); // + " (" + _t("size: {0}B", DataHelper.formatSize2(len)) + ')'); updateStatus(snark); } @@ -2127,11 +2127,11 @@ public class SnarkManager implements CompleteListener { } _magnets.remove(snark.getName()); removeMagnetStatus(snark.getInfoHash()); - addMessage(_("Metainfo received for {0}", snark.getName())); - addMessage(_("Starting up torrent {0}", storage.getBaseName())); + addMessage(_t("Metainfo received for {0}", snark.getName())); + addMessage(_t("Starting up torrent {0}", storage.getBaseName())); return name; } catch (IOException ioe) { - addMessage(_("Failed to copy torrent file to {0}", name)); + addMessage(_t("Failed to copy torrent file to {0}", name)); _log.error("Failed to write torrent file", ioe); } } @@ -2143,7 +2143,7 @@ public class SnarkManager implements CompleteListener { * @since 0.9 */ public void fatal(Snark snark, String error) { - addMessage(_("Error on torrent {0}", snark.getName()) + ": " + error); + addMessage(_t("Error on torrent {0}", snark.getName()) + ": " + error); } /** @@ -2180,7 +2180,7 @@ public class SnarkManager implements CompleteListener { Properties config = getConfig(ih); String name = config.getProperty(PROP_META_MAGNET_DN); if (name == null) - name = _("Magnet") + ' ' + I2PSnarkUtil.toHex(ih); + name = _t("Magnet") + ' ' + I2PSnarkUtil.toHex(ih); String tracker = config.getProperty(PROP_META_MAGNET_TR); String dir = config.getProperty(PROP_META_MAGNET_DIR); File dirf = (dir != null) ? (new File(dir)) : null; @@ -2223,13 +2223,13 @@ public class SnarkManager implements CompleteListener { // already known. noop } else { if (shouldAutoStart() && !_util.connect()) - addMessage(_("Unable to connect to I2P!")); + addMessage(_t("Unable to connect to I2P!")); try { // Snark.fatal() throws a RuntimeException // don't let one bad torrent kill the whole loop addTorrent(name, null, !shouldAutoStart()); } catch (Exception e) { - addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e); + addMessage(_t("Error: Could not add the torrent {0}", name) + ": " + e); _log.error("Unable to add the torrent " + name, e); rv = false; } @@ -2256,17 +2256,17 @@ public class SnarkManager implements CompleteListener { } /** translate */ - private String _(String s) { + private String _t(String s) { return _util.getString(s); } /** translate */ - private String _(String s, Object o) { + private String _t(String s, Object o) { return _util.getString(s, o); } /** translate */ - private String _(String s, Object o, Object o2) { + private String _t(String s, Object o, Object o2) { return _util.getString(s, o, o2); } @@ -2389,8 +2389,8 @@ public class SnarkManager implements CompleteListener { } boolean connected = _util.connected(); if ((!connected) && !_util.isConnecting()) - addMessage(_("Opening the I2P tunnel")); - addMessage(_("Starting up torrent {0}", snark.getBaseName())); + addMessage(_t("Opening the I2P tunnel")); + addMessage(_t("Starting up torrent {0}", snark.getBaseName())); if (connected) { snark.startTorrent(); } else { @@ -2409,7 +2409,7 @@ public class SnarkManager implements CompleteListener { if (_util.connected()) { startAll(); } else { - addMessage(_("Opening the I2P tunnel and starting all torrents.")); + addMessage(_t("Opening the I2P tunnel and starting all torrents.")); for (Snark snark : _snarks.values()) { // mark it for the UI snark.setStarting(); @@ -2472,7 +2472,7 @@ public class SnarkManager implements CompleteListener { for (Snark snark : _snarks.values()) { if (!snark.isStopped()) { if (count == 0) - addMessage(_("Stopping all torrents and closing the I2P tunnel.")); + addMessage(_t("Stopping all torrents and closing the I2P tunnel.")); count++; if (finalShutdown) snark.stopTorrent(true); @@ -2491,14 +2491,14 @@ public class SnarkManager implements CompleteListener { // Schedule this even for final shutdown, as there's a chance // that it's just this webapp that is stopping. _context.simpleTimer2().addEvent(new Disconnector(), 60*1000); - addMessage(_("Closing I2P tunnel after notifying trackers.")); + addMessage(_t("Closing I2P tunnel after notifying trackers.")); if (finalShutdown) { try { Thread.sleep(5*1000); } catch (InterruptedException ie) {} } } else { _util.disconnect(); _stopping = false; - addMessage(_("I2P tunnel closed.")); + addMessage(_t("I2P tunnel closed.")); } } } @@ -2509,7 +2509,7 @@ public class SnarkManager implements CompleteListener { if (_util.connected()) { _util.disconnect(); _stopping = false; - addMessage(_("I2P tunnel closed.")); + addMessage(_t("I2P tunnel closed.")); } } } @@ -2552,13 +2552,13 @@ public class SnarkManager implements CompleteListener { int pieces = snark.getPieces(); double completion = (pieces - snark.getNeeded()) / (double) pieces; String complete = (new DecimalFormat("0.00%")).format(completion); - addMessage(_("Finished recheck of torrent {0}, now {1} complete", snark.getBaseName(), complete)); + addMessage(_t("Finished recheck of torrent {0}, now {1} complete", snark.getBaseName(), complete)); } else { - addMessage(_("Finished recheck of torrent {0}, unchanged", snark.getBaseName())); + addMessage(_t("Finished recheck of torrent {0}, unchanged", snark.getBaseName())); } } catch (Exception e) { _log.error("Error rechecking " + snark.getBaseName(), e); - addMessage(_("Error checking the torrent {0}", snark.getBaseName()) + ": " + e); + addMessage(_t("Error checking the torrent {0}", snark.getBaseName()) + ": " + e); } } } diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java index 99e2f62a6..5537b33f1 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/FetchAndAdd.java @@ -77,7 +77,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl _log = ctx.logManager().getLog(FetchAndAdd.class); _mgr = mgr; _url = url; - _name = _("Download torrent file from {0}", url); + _name = _t("Download torrent file from {0}", url); _dataDir = dataDir; byte[] fake = null; try { @@ -90,7 +90,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl * Set off by startTorrent() */ public void run() { - _mgr.addMessageNoEscape(_("Fetching {0}", urlify(_url))); + _mgr.addMessageNoEscape(_t("Fetching {0}", urlify(_url))); File file = get(); if (!_isRunning) // stopped? return; @@ -100,7 +100,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl _mgr.deleteMagnet(this); add(file); } else { - _mgr.addMessageNoEscape(_("Torrent was not retrieved from {0}", urlify(_url)) + + _mgr.addMessageNoEscape(_t("Torrent was not retrieved from {0}", urlify(_url)) + ((_failCause != null) ? (": " + DataHelper.stripHTML(_failCause)) : "")); } if (file != null) @@ -127,7 +127,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl out.deleteOnExit(); if (!_mgr.util().connected()) { - _mgr.addMessage(_("Opening the I2P tunnel")); + _mgr.addMessage(_t("Opening the I2P tunnel")); if (!_mgr.util().connect()) return null; } @@ -154,7 +154,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl * This Snark may then be deleted. */ private void add(File file) { - _mgr.addMessageNoEscape(_("Torrent fetched from {0}", urlify(_url))); + _mgr.addMessageNoEscape(_t("Torrent fetched from {0}", urlify(_url))); FileInputStream in = null; try { in = new FileInputStream(file); @@ -163,7 +163,7 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl try { in.close(); } catch (IOException ioe) {} Snark snark = _mgr.getTorrentByInfoHash(fileInfoHash); if (snark != null) { - _mgr.addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName())); + _mgr.addMessage(_t("Torrent with this info hash is already running: {0}", snark.getBaseName())); return; } @@ -175,9 +175,9 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl if (torrentFile.exists()) { if (_mgr.getTorrent(canonical) != null) - _mgr.addMessage(_("Torrent already running: {0}", name)); + _mgr.addMessage(_t("Torrent already running: {0}", name)); else - _mgr.addMessage(_("Torrent already in the queue: {0}", name)); + _mgr.addMessage(_t("Torrent already in the queue: {0}", name)); } else { // This may take a LONG time to create the storage. _mgr.copyAndAddTorrent(file, canonical, _dataDir); @@ -188,9 +188,9 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl throw new IOException("Unknown error - check logs"); } } catch (IOException ioe) { - _mgr.addMessageNoEscape(_("Torrent at {0} was not valid", urlify(_url)) + ": " + DataHelper.stripHTML(ioe.getMessage())); + _mgr.addMessageNoEscape(_t("Torrent at {0} was not valid", urlify(_url)) + ": " + DataHelper.stripHTML(ioe.getMessage())); } catch (OutOfMemoryError oom) { - _mgr.addMessageNoEscape(_("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + DataHelper.stripHTML(oom.getMessage())); + _mgr.addMessageNoEscape(_t("ERROR - Out of memory, cannot create torrent from {0}", urlify(_url)) + ": " + DataHelper.stripHTML(oom.getMessage())); } finally { try { if (in != null) in.close(); } catch (IOException ioe) {} } @@ -345,11 +345,11 @@ public class FetchAndAdd extends Snark implements EepGet.StatusListener, Runnabl // End of EepGet status listeners - private String _(String s) { + private String _t(String s) { return _mgr.util().getString(s); } - private String _(String s, String o) { + private String _t(String s, String o) { return _mgr.util().getString(s, o); } 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 08ea4c24f..72ea2ecad 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -266,14 +266,14 @@ public class I2PSnarkServlet extends BasicServlet { "\n" + ""); if (_contextName.equals(DEFAULT_NAME)) - out.write(_("I2PSnark")); + out.write(_t("I2PSnark")); else out.write(_contextName); out.write(" - "); if (isConfigure) - out.write(_("Configuration")); + out.write(_t("Configuration")); else - out.write(_("Anonymous BitTorrent Client")); + out.write(_t("Anonymous BitTorrent Client")); String peerParam = req.getParameter("p"); if ("2".equals(peerParam)) out.write(" | Debug Mode"); @@ -287,7 +287,7 @@ public class I2PSnarkServlet extends BasicServlet { //out.write("<meta http-equiv=\"refresh\" content=\"" + delay + ";/i2psnark/" + peerString + "\">\n"); out.write("<script src=\"/js/ajax.js\" type=\"text/javascript\"></script>\n" + "<script type=\"text/javascript\">\n" + - "var failMessage = \"<div class=\\\"routerdown\\\"><b>" + _("Router is down") + "<\\/b><\\/div>\";\n" + + "var failMessage = \"<div class=\\\"routerdown\\\"><b>" + _t("Router is down") + "<\\/b><\\/div>\";\n" + "function requestAjax1() { ajax(\"" + _contextPath + "/.ajax/xhr1.html" + peerString.replace("&", "&") + // don't html escape in js "\", \"mainsection\", " + (delay*1000) + "); }\n" + @@ -304,27 +304,27 @@ public class I2PSnarkServlet extends BasicServlet { List<Tracker> sortedTrackers = null; if (isConfigure) { out.write("<div class=\"snarknavbar\"><a href=\"" + _contextPath + "/\" title=\""); - out.write(_("Torrents")); + out.write(_t("Torrents")); out.write("\" class=\"snarkRefresh\">"); out.write(toThemeImg("arrow_refresh")); out.write("  "); if (_contextName.equals(DEFAULT_NAME)) - out.write(_("I2PSnark")); + out.write(_t("I2PSnark")); else out.write(_contextName); out.write("</a>"); } else { out.write("<div class=\"snarknavbar\"><a href=\"" + _contextPath + '/' + peerString + "\" title=\""); - out.write(_("Refresh page")); + out.write(_t("Refresh page")); out.write("\" class=\"snarkRefresh\">"); out.write(toThemeImg("arrow_refresh")); out.write("  "); if (_contextName.equals(DEFAULT_NAME)) - out.write(_("I2PSnark")); + out.write(_t("I2PSnark")); else out.write(_contextName); out.write("</a> <a href=\"http://forum.i2p/viewforum.php?f=21\" class=\"snarkRefresh\" target=\"_blank\">"); - out.write(_("Forum")); + out.write(_t("Forum")); out.write("</a>\n"); sortedTrackers = _manager.getSortedTrackers(); @@ -339,7 +339,7 @@ public class I2PSnarkServlet extends BasicServlet { out.write("</div>\n"); String newURL = req.getParameter("newURL"); if (newURL != null && newURL.trim().length() > 0 && req.getMethod().equals("GET")) - _manager.addMessage(_("Click \"Add torrent\" button to fetch torrent")); + _manager.addMessage(_t("Click \"Add torrent\" button to fetch torrent")); out.write("<div class=\"page\"><div id=\"mainsection\" class=\"mainsection\">"); writeMessages(out, isConfigure, peerString); @@ -392,7 +392,7 @@ public class I2PSnarkServlet extends BasicServlet { else out.write("?"); out.write("action=Clear&nonce=" + _nonce + "\">"); - String tx = _("clear messages"); + String tx = _t("clear messages"); out.write(toThemeImg("delete", tx, tx)); out.write("</a>" + "<ul>"); @@ -447,9 +447,9 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("\">"); } - String tx = _("Status"); + String tx = _t("Status"); out.write(toThemeImg("status", tx, - showSort ? _("Sort by {0}", tx) + showSort ? _t("Sort by {0}", tx) : tx)); if (showSort) out.write("</a>"); @@ -460,13 +460,13 @@ public class I2PSnarkServlet extends BasicServlet { // disable peer view out.write(getQueryString(req, "", null, null)); out.write("\">"); - tx = _("Hide Peers"); + tx = _t("Hide Peers"); out.write(toThemeImg("hidepeers", tx, tx)); } else { // enable peer view out.write(getQueryString(req, "1", null, null)); out.write("\">"); - tx = _("Show Peers"); + tx = _t("Show Peers"); out.write(toThemeImg("showpeers", tx, tx)); } out.write("</a><br>\n"); @@ -489,9 +489,9 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<a href=\"" + _contextPath + '/' + getQueryString(req, null, null, sort)); out.write("\">"); } - tx = _("Torrent"); + tx = _t("Torrent"); out.write(toThemeImg("torrent", tx, - showSort ? _("Sort by {0}", (isTypeSort ? _("File type") : tx)) + showSort ? _t("Sort by {0}", (isTypeSort ? _t("File type") : tx)) : tx)); if (showSort) out.write("</a>"); @@ -507,10 +507,10 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\">"); } // Translators: Please keep short or translate as " " - tx = _("ETA"); + tx = _t("ETA"); out.write(toThemeImg("eta", tx, - showSort ? _("Sort by {0}", _("Estimated time remaining")) - : _("Estimated time remaining"))); + showSort ? _t("Sort by {0}", _t("Estimated time remaining")) + : _t("Estimated time remaining"))); if (showSort) out.write("</a>"); } @@ -533,10 +533,10 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\">"); } // Translators: Please keep short or translate as " " - tx = _("RX"); + tx = _t("RX"); out.write(toThemeImg("head_rx", tx, - showSort ? _("Sort by {0}", (isDlSort ? _("Downloaded") : _("Size"))) - : _("Downloaded"))); + showSort ? _t("Sort by {0}", (isDlSort ? _t("Downloaded") : _t("Size"))) + : _t("Downloaded"))); if (showSort) out.write("</a>"); out.write("</th>\n<th align=\"right\">"); @@ -564,10 +564,10 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\">"); } // Translators: Please keep short or translate as " " - tx = _("TX"); + tx = _t("TX"); out.write(toThemeImg("head_tx", tx, - showSort ? _("Sort by {0}", (nextRatSort ? _("Upload ratio") : _("Uploaded"))) - : _("Uploaded"))); + showSort ? _t("Sort by {0}", (nextRatSort ? _t("Upload ratio") : _t("Uploaded"))) + : _t("Uploaded"))); if (showSort) out.write("</a>"); } @@ -579,10 +579,10 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\">"); } // Translators: Please keep short or translate as " " - tx = _("RX Rate"); + tx = _t("RX Rate"); out.write(toThemeImg("head_rxspeed", tx, - showSort ? _("Sort by {0}", _("Down Rate")) - : _("Down Rate"))); + showSort ? _t("Sort by {0}", _t("Down Rate")) + : _t("Down Rate"))); if (showSort) out.write("</a>"); } @@ -594,10 +594,10 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\">"); } // Translators: Please keep short or translate as " " - tx = _("TX Rate"); + tx = _t("TX Rate"); out.write(toThemeImg("head_txspeed", tx, - showSort ? _("Sort by {0}", _("Up Rate")) - : _("Up Rate"))); + showSort ? _t("Sort by {0}", _t("Up Rate")) + : _t("Up Rate"))); if (showSort) out.write("</a>"); } @@ -613,9 +613,9 @@ public class I2PSnarkServlet extends BasicServlet { //out.write("<input type=\"image\" name=\"action\" value=\"StopAll\" title=\""); out.write("<input type=\"image\" name=\"action_StopAll\" value=\"foo\" title=\""); } - out.write(_("Stop all torrents and the I2P tunnel")); + out.write(_t("Stop all torrents and the I2P tunnel")); out.write("\" src=\"" + _imgPath + "stop_all.png\" alt=\""); - out.write(_("Stop All")); + out.write(_t("Stop All")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -627,9 +627,9 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<a href=\"" + _contextPath + "/?action=StartAll&nonce=" + _nonce + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_StartAll\" value=\"foo\" title=\""); - out.write(_("Start all stopped torrents")); + out.write(_t("Start all stopped torrents")); out.write("\" src=\"" + _imgPath + "start_all.png\" alt=\""); - out.write(_("Start All")); + out.write(_t("Start All")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -641,9 +641,9 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<a href=\"" + _contextPath + "/?action=StartAll&nonce=" + _nonce + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_StartAll\" value=\"foo\" title=\""); - out.write(_("Start all torrents and the I2P tunnel")); + out.write(_t("Start all torrents and the I2P tunnel")); out.write("\" src=\"" + _imgPath + "start_all.png\" alt=\""); - out.write(_("Start All")); + out.write(_t("Start All")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -666,13 +666,13 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<tr class=\"snarkTorrentNoneLoaded\">" + "<td class=\"snarkTorrentNoneLoaded\"" + " colspan=\"11\"><i>"); - out.write(_("No torrents loaded.")); + out.write(_t("No torrents loaded.")); out.write("</i></td></tr>\n"); } else /** if (snarks.size() > 1) */ { out.write("<tfoot><tr>\n" + " <th align=\"left\" colspan=\"6\">"); out.write(" "); - out.write(_("Totals")); + out.write(_t("Totals")); out.write(": "); out.write(ngettext("1 torrent", "{0} torrents", total)); out.write(", "); @@ -693,7 +693,7 @@ public class I2PSnarkServlet extends BasicServlet { if(!IPString.equals("unknown")) { // Only truncate if it's an actual dest out.write("; "); - out.write(_("Dest")); + out.write(_t("Dest")); out.write(": <tt>"); out.write(IPString.substring(0, 4)); out.write("</tt>"); @@ -821,7 +821,7 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<a href=\"" + _contextPath); out.write(getQueryString(req, null, "", null)); out.write("\">"); - out.write(toThemeImg("control_rewind_blue", _("First"), _("First page"))); + out.write(toThemeImg("control_rewind_blue", _t("First"), _t("First page"))); out.write("</a> "); int prev = Math.max(0, start - pageSize); //if (prev > 0) { @@ -831,7 +831,7 @@ public class I2PSnarkServlet extends BasicServlet { String sprev = (prev > 0) ? Integer.toString(prev) : ""; out.write(getQueryString(req, null, sprev, null)); out.write("\">"); - out.write(toThemeImg("control_back_blue", _("Prev"), _("Previous page"))); + out.write(toThemeImg("control_back_blue", _t("Prev"), _t("Previous page"))); out.write("</a> "); } } else { @@ -853,7 +853,7 @@ public class I2PSnarkServlet extends BasicServlet { page = pages; else page = 1 + (start / pageSize); - //out.write(" " + _("Page {0}", page) + thinsp(noThinsp) + pages + " "); + //out.write(" " + _t("Page {0}", page) + thinsp(noThinsp) + pages + " "); out.write("  " + page + thinsp(noThinsp) + pages + "  "); } if (start + pageSize < total) { @@ -864,7 +864,7 @@ public class I2PSnarkServlet extends BasicServlet { out.write(" <a href=\"" + _contextPath); out.write(getQueryString(req, null, Integer.toString(next), null)); out.write("\">"); - out.write(toThemeImg("control_play_blue", _("Next"), _("Next page"))); + out.write(toThemeImg("control_play_blue", _t("Next"), _t("Next page"))); out.write("</a> "); } // Last @@ -872,7 +872,7 @@ public class I2PSnarkServlet extends BasicServlet { out.write(" <a href=\"" + _contextPath); out.write(getQueryString(req, null, Integer.toString(last), null)); out.write("\">"); - out.write(toThemeImg("control_fastforward_blue", _("Last"), _("Last page"))); + out.write(toThemeImg("control_fastforward_blue", _t("Last"), _t("Last page"))); out.write("</a> "); } else { out.write(" " + @@ -918,7 +918,7 @@ public class I2PSnarkServlet extends BasicServlet { if ( (newFile != null) && (newFile.trim().length() > 0) ) f = new File(newFile.trim()); if ( (f != null) && (!f.exists()) ) { - _manager.addMessage(_("Torrent file {0} does not exist", newFile)); + _manager.addMessage(_t("Torrent file {0} does not exist", newFile)); } if ( (f != null) && (f.exists()) ) { // NOTE - All this is disabled - load from local file disabled @@ -929,16 +929,16 @@ public class I2PSnarkServlet extends BasicServlet { if (local.exists()) { if (_manager.getTorrent(canonical) != null) - _manager.addMessage(_("Torrent already running: {0}", newFile)); + _manager.addMessage(_t("Torrent already running: {0}", newFile)); else - _manager.addMessage(_("Torrent already in the queue: {0}", newFile)); + _manager.addMessage(_t("Torrent already in the queue: {0}", newFile)); } else { boolean ok = FileUtil.copy(f.getAbsolutePath(), local.getAbsolutePath(), true); if (ok) { - _manager.addMessage(_("Copying torrent to {0}", local.getAbsolutePath())); + _manager.addMessage(_t("Copying torrent to {0}", local.getAbsolutePath())); _manager.addTorrent(canonical); } else { - _manager.addMessage(_("Unable to copy the torrent to {0}", local.getAbsolutePath()) + ' ' + _("from {0}", f.getAbsolutePath())); + _manager.addMessage(_t("Unable to copy the torrent to {0}", local.getAbsolutePath()) + ' ' + _t("from {0}", f.getAbsolutePath())); } } } catch (IOException ioe) { @@ -954,11 +954,11 @@ public class I2PSnarkServlet extends BasicServlet { if (newDir.length() > 0) { dir = new SecureFile(newDir); if (!dir.isAbsolute()) { - _manager.addMessage(_("Data directory must be an absolute path") + ": " + dir); + _manager.addMessage(_t("Data directory must be an absolute path") + ": " + dir); return; } if (!dir.isDirectory() && !dir.mkdirs()) { - _manager.addMessage(_("Data directory cannot be created") + ": " + dir); + _manager.addMessage(_t("Data directory cannot be created") + ": " + dir); return; } Collection<Snark> snarks = _manager.getTorrents(); @@ -968,7 +968,7 @@ public class I2PSnarkServlet extends BasicServlet { continue; File sbase = storage.getBase(); if (isParentOf(sbase, dir)) { - _manager.addMessage(_("Cannot add torrent {0} inside another torrent: {1}", + _manager.addMessage(_t("Cannot add torrent {0} inside another torrent: {1}", dir.getAbsolutePath(), sbase)); return; } @@ -983,7 +983,7 @@ public class I2PSnarkServlet extends BasicServlet { } else if (newURL.length() == 40 && newURL.replaceAll("[a-fA-F0-9]", "").length() == 0) { addMagnet(MagnetURI.MAGNET_FULL + newURL, dir); } else { - _manager.addMessage(_("Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"", + _manager.addMessage(_t("Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"", MagnetURI.MAGNET, MagnetURI.MAGGOT)); } } else { @@ -1024,7 +1024,7 @@ public class I2PSnarkServlet extends BasicServlet { // magnet - remove and delete are the same thing // Remove not shown on UI so we shouldn't get here _manager.deleteMagnet(snark); - _manager.addMessage(_("Magnet deleted: {0}", name)); + _manager.addMessage(_t("Magnet deleted: {0}", name)); return; } _manager.stopTorrent(snark, true); @@ -1032,7 +1032,7 @@ public class I2PSnarkServlet extends BasicServlet { // yeah, need to, otherwise it'll get autoadded again (at the moment File f = new File(name); f.delete(); - _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath())); + _manager.addMessage(_t("Torrent file deleted: {0}", f.getAbsolutePath())); break; } } @@ -1051,15 +1051,15 @@ public class I2PSnarkServlet extends BasicServlet { // magnet - remove and delete are the same thing _manager.deleteMagnet(snark); if (snark instanceof FetchAndAdd) - _manager.addMessage(_("Download deleted: {0}", name)); + _manager.addMessage(_t("Download deleted: {0}", name)); else - _manager.addMessage(_("Magnet deleted: {0}", name)); + _manager.addMessage(_t("Magnet deleted: {0}", name)); return; } _manager.stopTorrent(snark, true); File f = new File(name); f.delete(); - _manager.addMessage(_("Torrent file deleted: {0}", f.getAbsolutePath())); + _manager.addMessage(_t("Torrent file deleted: {0}", f.getAbsolutePath())); Storage storage = snark.getStorage(); if (storage == null) break; @@ -1068,18 +1068,18 @@ public class I2PSnarkServlet extends BasicServlet { for (File df : storage.getFiles()) { // should be only one if (df.delete()) - _manager.addMessage(_("Data file deleted: {0}", df.getAbsolutePath())); + _manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath())); else - _manager.addMessage(_("Data file could not be deleted: {0}", df.getAbsolutePath())); + _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath())); } break; } // step 1 delete files for (File df : storage.getFiles()) { if (df.delete()) { - //_manager.addMessage(_("Data file deleted: {0}", df.getAbsolutePath())); + //_manager.addMessage(_t("Data file deleted: {0}", df.getAbsolutePath())); } else { - _manager.addMessage(_("Data file could not be deleted: {0}", df.getAbsolutePath())); + _manager.addMessage(_t("Data file could not be deleted: {0}", df.getAbsolutePath())); } } // step 2 delete dirs bottom-up @@ -1092,17 +1092,17 @@ public class I2PSnarkServlet extends BasicServlet { for (File df : dirs) { if (df.delete()) { ok = true; - //_manager.addMessage(_("Data dir deleted: {0}", df.getAbsolutePath())); + //_manager.addMessage(_t("Data dir deleted: {0}", df.getAbsolutePath())); } else { ok = false; - _manager.addMessage(_("Directory could not be deleted: {0}", df.getAbsolutePath())); + _manager.addMessage(_t("Directory could not be deleted: {0}", df.getAbsolutePath())); if (_log.shouldLog(Log.WARN)) _log.warn("Could not delete dir " + df); } } // step 3 message for base (last one) if (ok) - _manager.addMessage(_("Directory deleted: {0}", storage.getBase())); + _manager.addMessage(_t("Directory deleted: {0}", storage.getBase())); break; } } @@ -1153,18 +1153,18 @@ public class I2PSnarkServlet extends BasicServlet { if (baseFile.exists()) { String torrentName = baseFile.getName(); if (torrentName.toLowerCase(Locale.US).endsWith(".torrent")) { - _manager.addMessage(_("Cannot add a torrent ending in \".torrent\": {0}", baseFile.getAbsolutePath())); + _manager.addMessage(_t("Cannot add a torrent ending in \".torrent\": {0}", baseFile.getAbsolutePath())); return; } Snark snark = _manager.getTorrentByBaseName(torrentName); if (snark != null) { - _manager.addMessage(_("Torrent with this name is already running: {0}", torrentName)); + _manager.addMessage(_t("Torrent with this name is already running: {0}", torrentName)); return; } if (isParentOf(baseFile,_manager.getDataDir()) || isParentOf(baseFile, _manager.util().getContext().getBaseDir()) || isParentOf(baseFile, _manager.util().getContext().getConfigDir())) { - _manager.addMessage(_("Cannot add a torrent including an I2P directory: {0}", baseFile.getAbsolutePath())); + _manager.addMessage(_t("Cannot add a torrent including an I2P directory: {0}", baseFile.getAbsolutePath())); return; } Collection<Snark> snarks = _manager.getTorrents(); @@ -1174,12 +1174,12 @@ public class I2PSnarkServlet extends BasicServlet { continue; File sbase = storage.getBase(); if (isParentOf(sbase, baseFile)) { - _manager.addMessage(_("Cannot add torrent {0} inside another torrent: {1}", + _manager.addMessage(_t("Cannot add torrent {0} inside another torrent: {1}", baseFile.getAbsolutePath(), sbase)); return; } if (isParentOf(baseFile, sbase)) { - _manager.addMessage(_("Cannot add torrent {0} including another torrent: {1}", + _manager.addMessage(_t("Cannot add torrent {0} including another torrent: {1}", baseFile.getAbsolutePath(), sbase)); return; } @@ -1205,7 +1205,7 @@ public class I2PSnarkServlet extends BasicServlet { if (!backupURLs.isEmpty()) { // BEP 12 - Put primary first, then the others, each as the sole entry in their own list if (announceURL == null) { - _manager.addMessage(_("Error - Cannot include alternate trackers without a primary tracker")); + _manager.addMessage(_t("Error - Cannot include alternate trackers without a primary tracker")); return; } backupURLs.add(0, announceURL); @@ -1218,7 +1218,7 @@ public class I2PSnarkServlet extends BasicServlet { hasPublic = true; } if (hasPrivate && hasPublic) { - _manager.addMessage(_("Error - Cannot mix private and public trackers in a torrent")); + _manager.addMessage(_t("Error - Cannot mix private and public trackers in a torrent")); return; } announceList = new ArrayList<List<String>>(backupURLs.size()); @@ -1240,18 +1240,18 @@ public class I2PSnarkServlet extends BasicServlet { boolean ok = _manager.addTorrent(info, s.getBitField(), torrentFile.getAbsolutePath(), baseFile, true); if (!ok) return; - _manager.addMessage(_("Torrent created for \"{0}\"", baseFile.getName()) + ": " + torrentFile.getAbsolutePath()); + _manager.addMessage(_t("Torrent created for \"{0}\"", baseFile.getName()) + ": " + torrentFile.getAbsolutePath()); if (announceURL != null && !_manager.util().getOpenTrackers().contains(announceURL)) - _manager.addMessage(_("Many I2P trackers require you to register new torrents before seeding - please do so before starting \"{0}\"", baseFile.getName())); + _manager.addMessage(_t("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); + _manager.addMessage(_t("Error creating a torrent for \"{0}\"", baseFile.getAbsolutePath()) + ": " + ioe); _log.error("Error creating a torrent", ioe); } } else { - _manager.addMessage(_("Cannot create a torrent for the nonexistent data: {0}", baseFile.getAbsolutePath())); + _manager.addMessage(_t("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(_t("Error creating torrent - you must enter a file or directory")); } } else if ("StopAll".equals(action)) { _manager.stopAllTorrents(false); @@ -1282,7 +1282,7 @@ public class I2PSnarkServlet extends BasicServlet { /** @since 0.9 */ private void processTrackerForm(String action, HttpServletRequest req) { - if (action.equals(_("Delete selected")) || action.equals(_("Save tracker configuration"))) { + if (action.equals(_t("Delete selected")) || action.equals(_t("Save tracker configuration"))) { boolean changed = false; Map<String, Tracker> trackers = _manager.getTrackerMap(); List<String> removed = new ArrayList<String>(); @@ -1299,7 +1299,7 @@ public class I2PSnarkServlet extends BasicServlet { Tracker t; if ((t = trackers.remove(k)) != null) { removed.add(t.announceURL); - _manager.addMessage(_("Removed") + ": " + DataHelper.stripHTML(k)); + _manager.addMessage(_t("Removed") + ": " + DataHelper.stripHTML(k)); changed = true; } } else if (k.startsWith("ttype_")) { @@ -1331,7 +1331,7 @@ public class I2PSnarkServlet extends BasicServlet { if (!priv.equals(oldPriv)) _manager.savePrivateTrackers(priv); - } else if (action.equals(_("Add tracker"))) { + } else if (action.equals(_t("Add tracker"))) { String name = req.getParameter("tname"); String hurl = req.getParameter("thurl"); String aurl = req.getParameter("taurl"); @@ -1354,15 +1354,15 @@ public class I2PSnarkServlet extends BasicServlet { _manager.savePrivateTrackers(newPriv); } } else { - _manager.addMessage(_("Enter valid tracker name and URLs")); + _manager.addMessage(_t("Enter valid tracker name and URLs")); } } else { - _manager.addMessage(_("Enter valid tracker name and URLs")); + _manager.addMessage(_t("Enter valid tracker name and URLs")); } - } else if (action.equals(_("Restore defaults"))) { + } else if (action.equals(_t("Restore defaults"))) { _manager.setDefaultTrackerMap(); _manager.saveOpenTrackers(null); - _manager.addMessage(_("Restored default trackers")); + _manager.addMessage(_t("Restored default trackers")); } else { _manager.addMessage("Unknown POST action: \"" + action + '\"'); } @@ -1470,12 +1470,12 @@ public class I2PSnarkServlet extends BasicServlet { String rowClass = (row % 2 == 0 ? "snarkTorrentEven" : "snarkTorrentOdd"); String statusString; if (snark.isChecking()) { - statusString = toThemeImg("stalled", "", _("Checking")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Checking") + ' ' + + statusString = toThemeImg("stalled", "", _t("Checking")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Checking") + ' ' + (new DecimalFormat("0.00%")).format(snark.getCheckingProgress()); } else if (snark.isAllocating()) { - statusString = toThemeImg("stalled", "", _("Allocating")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Allocating"); + statusString = toThemeImg("stalled", "", _t("Allocating")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Allocating"); } else if (err != null && isRunning && curPeers == 0) { //} else if (err != null && curPeers == 0) { // Also don't show if seeding... but then we won't see the not-registered error @@ -1483,14 +1483,14 @@ public class I2PSnarkServlet extends BasicServlet { // let's only show this if we have no peers, otherwise PEX and DHT should bail us out, user doesn't care //if (isRunning && curPeers > 0 && !showPeers) // statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "trackererror.png\" title=\"" + err + "\"></td>" + - // "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _("Tracker Error") + + // "<td class=\"snarkTorrentStatus " + rowClass + "\">" + _t("Tracker Error") + // ": <a href=\"" + uri + "?p=" + Base64.encode(snark.getInfoHash()) + "\">" + // curPeers + thinsp(noThinsp) + // ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; //else if (isRunning) //if (isRunning) { statusString = toThemeImg("trackererror", "", err) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Tracker Error") + + "<td class=\"snarkTorrentStatus\">" + _t("Tracker Error") + ": " + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); //} else { @@ -1499,11 +1499,11 @@ public class I2PSnarkServlet extends BasicServlet { // else // err = DataHelper.escapeHTML(err); // statusString = toThemeImg("trackererror", "", err) + "</td>" + - // "<td class=\"snarkTorrentStatus\">" + _("Tracker Error"); + // "<td class=\"snarkTorrentStatus\">" + _t("Tracker Error"); //} } else if (snark.isStarting()) { - statusString = toThemeImg("stalled", "", _("Starting")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Starting"); + statusString = toThemeImg("stalled", "", _t("Starting")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Starting"); } else if (remaining == 0 || needed == 0) { // < 0 means no meta size yet // partial complete or seeding if (isRunning) { @@ -1511,11 +1511,11 @@ public class I2PSnarkServlet extends BasicServlet { String txt; if (remaining == 0) { img = "seeding"; - txt = _("Seeding"); + txt = _t("Seeding"); } else { // partial img = "complete"; - txt = _("Complete"); + txt = _t("Complete"); } if (curPeers > 0 && !showPeers) statusString = toThemeImg(img, "", txt) + "</td>" + @@ -1529,42 +1529,42 @@ public class I2PSnarkServlet extends BasicServlet { ": " + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); } else { - statusString = toThemeImg("complete", "", _("Complete")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Complete"); + statusString = toThemeImg("complete", "", _t("Complete")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Complete"); } } else { if (isRunning && curPeers > 0 && downBps > 0 && !showPeers) - statusString = toThemeImg("downloading", "", _("OK")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("OK") + + statusString = toThemeImg("downloading", "", _t("OK")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("OK") + ": <a href=\"" + uri + getQueryString(req, Base64.encode(snark.getInfoHash()), null, null) + "\">" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; else if (isRunning && curPeers > 0 && downBps > 0) - statusString = toThemeImg("downloading", "", _("OK")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("OK") + + statusString = toThemeImg("downloading", "", _t("OK")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("OK") + ": " + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning && curPeers > 0 && !showPeers) - statusString = toThemeImg("stalled", "", _("Stalled")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Stalled") + + statusString = toThemeImg("stalled", "", _t("Stalled")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Stalled") + ": <a href=\"" + uri + getQueryString(req, Base64.encode(snark.getInfoHash()), null, null) + "\">" + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers) + "</a>"; else if (isRunning && curPeers > 0) - statusString = toThemeImg("stalled", "", _("Stalled")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Stalled") + + statusString = toThemeImg("stalled", "", _t("Stalled")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Stalled") + ": " + curPeers + thinsp(noThinsp) + ngettext("1 peer", "{0} peers", knownPeers); else if (isRunning && knownPeers > 0) - statusString = toThemeImg("nopeers", "", _("No Peers")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("No Peers") + + statusString = toThemeImg("nopeers", "", _t("No Peers")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("No Peers") + ": 0" + thinsp(noThinsp) + knownPeers ; else if (isRunning) - statusString = toThemeImg("nopeers", "", _("No Peers")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("No Peers"); + statusString = toThemeImg("nopeers", "", _t("No Peers")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("No Peers"); else - statusString = toThemeImg("stopped", "", _("Stopped")) + "</td>" + - "<td class=\"snarkTorrentStatus\">" + _("Stopped"); + statusString = toThemeImg("stopped", "", _t("Stopped")) + "</td>" + + "<td class=\"snarkTorrentStatus\">" + _t("Stopped"); } out.write("<tr class=\"" + rowClass + "\">"); @@ -1593,7 +1593,7 @@ public class I2PSnarkServlet extends BasicServlet { // gets us to the details page instead of the file. StringBuilder buf = new StringBuilder(128); buf.append("<a href=\"").append(encodedBaseName) - .append("/\" title=\"").append(_("Torrent details")) + .append("/\" title=\"").append(_t("Torrent details")) .append("\">"); out.write(buf.toString()); } @@ -1628,9 +1628,9 @@ public class I2PSnarkServlet extends BasicServlet { buf.append('/'); buf.append("\" title=\""); if (isMultiFile) - buf.append(_("View files")); + buf.append(_t("View files")); else - buf.append(_("Open file")); + buf.append(_t("Open file")); buf.append("\">"); out.write(buf.toString()); } @@ -1682,9 +1682,9 @@ public class I2PSnarkServlet extends BasicServlet { getQueryString(req, "", null, null).replace("?", "&") + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_Stop_" + b64 + "\" value=\"foo\" title=\""); - out.write(_("Stop the torrent")); + out.write(_t("Stop the torrent")); out.write("\" src=\"" + _imgPath + "stop.png\" alt=\""); - out.write(_("Stop")); + out.write(_t("Stop")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -1697,9 +1697,9 @@ public class I2PSnarkServlet extends BasicServlet { getQueryString(req, "", null, null).replace("?", "&") + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_Start_" + b64 + "\" value=\"foo\" title=\""); - out.write(_("Start the torrent")); + out.write(_t("Start the torrent")); out.write("\" src=\"" + _imgPath + "start.png\" alt=\""); - out.write(_("Start")); + out.write(_t("Start")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -1712,16 +1712,16 @@ public class I2PSnarkServlet extends BasicServlet { getQueryString(req, "", null, null).replace("?", "&") + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_Remove_" + b64 + "\" value=\"foo\" title=\""); - out.write(_("Remove the torrent from the active list, deleting the .torrent file")); + out.write(_t("Remove the torrent from the active list, deleting the .torrent file")); out.write("\" onclick=\"if (!confirm('"); // Can't figure out how to escape double quotes inside the onclick string. // Single quotes in translate strings with parameters must be doubled. // Then the remaining single quote must be escaped - out.write(_("Are you sure you want to delete the file \\''{0}\\'' (downloaded data will not be deleted) ?", + out.write(_t("Are you sure you want to delete the file \\''{0}\\'' (downloaded data will not be deleted) ?", escapeJSString(snark.getName()))); out.write("')) { return false; }\""); out.write(" src=\"" + _imgPath + "remove.png\" alt=\""); - out.write(_("Remove")); + out.write(_t("Remove")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -1734,16 +1734,16 @@ public class I2PSnarkServlet extends BasicServlet { getQueryString(req, "", null, null).replace("?", "&") + "\"><img title=\""); else out.write("<input type=\"image\" name=\"action_Delete_" + b64 + "\" value=\"foo\" title=\""); - out.write(_("Delete the .torrent file and the associated data file(s)")); + out.write(_t("Delete the .torrent file and the associated data file(s)")); out.write("\" onclick=\"if (!confirm('"); // Can't figure out how to escape double quotes inside the onclick string. // Single quotes in translate strings with parameters must be doubled. // Then the remaining single quote must be escaped - out.write(_("Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?", + out.write(_t("Are you sure you want to delete the torrent \\''{0}\\'' and all downloaded data?", escapeJSString(fullBasename))); out.write("')) { return false; }\""); out.write(" src=\"" + _imgPath + "delete.png\" alt=\""); - out.write(_("Delete")); + out.write(_t("Delete")); out.write("\">"); if (isDegraded) out.write("</a>"); @@ -1763,7 +1763,7 @@ public class I2PSnarkServlet extends BasicServlet { String ch = pid != null ? pid.toString().substring(0, 4) : "????"; String client; if ("AwMD".equals(ch)) - client = _("I2PSnark"); + client = _t("I2PSnark"); else if ("BFJT".equals(ch)) client = "I2PRufus"; else if ("TTMt".equals(ch)) @@ -1779,7 +1779,7 @@ public class I2PSnarkServlet extends BasicServlet { else if ("LUtU".equals(ch)) client = "KTorrent" + getAzVersion(pid.getID()); else - client = _("Unknown") + " (" + ch + ')'; + client = _t("Unknown") + " (" + ch + ')'; out.write(client + "  <tt>" + peer.toString().substring(5, 9)+ "</tt>"); if (showDebug) out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s"); @@ -1791,7 +1791,7 @@ public class I2PSnarkServlet extends BasicServlet { if (isValid) { pct = (float) (100.0 * peer.completed() / meta.getPieces()); if (pct >= 100.0) - out.write(_("Seed")); + out.write(_t("Seed")); else { String ps = String.valueOf(pct); if (ps.length() > 5) @@ -1814,9 +1814,9 @@ public class I2PSnarkServlet extends BasicServlet { } else { out.write("<span class=\"choked\"><a title=\""); if (!peer.isInteresting()) - out.write(_("Uninteresting (The peer has no pieces we need)")); + out.write(_t("Uninteresting (The peer has no pieces we need)")); else - out.write(_("Choked (The peer is not allowing us to request pieces)")); + out.write(_t("Choked (The peer is not allowing us to request pieces)")); out.write("\">"); out.write(formatSize(peer.getDownloadRate()) + "ps</a></span>"); } @@ -1836,9 +1836,9 @@ public class I2PSnarkServlet extends BasicServlet { } else { out.write("<span class=\"choked\"><a title=\""); if (!peer.isInterested()) - out.write(_("Uninterested (We have no pieces the peer needs)")); + out.write(_t("Uninterested (We have no pieces the peer needs)")); else - out.write(_("Choking (We are not allowing the peer to request pieces)")); + out.write(_t("Choking (We are not allowing the peer to request pieces)")); out.write("\">"); out.write(formatSize(peer.getUploadRate()) + "ps</a></span>"); } @@ -1954,7 +1954,7 @@ public class I2PSnarkServlet extends BasicServlet { StringBuilder buf = new StringBuilder(128); buf.append("<a href=\"").append(baseURL).append("details.php?dllist=1&filelist=1&info_hash=") .append(TrackerClient.urlencode(infohash)) - .append("\" title=\"").append(_("Details at {0} tracker", name)).append("\" target=\"_blank\">"); + .append("\" title=\"").append(_t("Details at {0} tracker", name)).append("\" target=\"_blank\">"); return buf.toString(); } } @@ -1971,7 +1971,7 @@ public class I2PSnarkServlet extends BasicServlet { if (linkUrl != null) { StringBuilder buf = new StringBuilder(128); buf.append(linkUrl); - toThemeImg(buf, "details", _("Info"), ""); + toThemeImg(buf, "details", _t("Info"), ""); buf.append("</a>"); return buf.toString(); } @@ -2044,31 +2044,31 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">"); out.write(toThemeImg("add")); out.write(' '); - out.write(_("Add Torrent")); + out.write(_t("Add Torrent")); out.write("</span><hr>\n<table border=\"0\"><tr><td>"); - out.write(_("From URL")); + out.write(_t("From URL")); out.write(":<td><input type=\"text\" name=\"nofilter_newURL\" size=\"85\" value=\"" + newURL + "\" spellcheck=\"false\""); out.write(" title=\""); - out.write(_("Enter the torrent file download URL (I2P only), magnet link, maggot link, or info hash")); + out.write(_t("Enter the torrent file download URL (I2P only), magnet link, maggot link, or info hash")); out.write("\"> \n"); // not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve) //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>"); out.write("<input type=\"submit\" class=\"add\" value=\""); - out.write(_("Add torrent")); + out.write(_t("Add torrent")); out.write("\" name=\"foo\" ><br>\n" + "<tr><td>"); - out.write(_("Data dir")); + out.write(_t("Data dir")); out.write(":<td><input type=\"text\" name=\"nofilter_newDir\" size=\"85\" value=\"\" spellcheck=\"false\""); out.write(" title=\""); - out.write(_("Enter the directory to save the data in (default {0})", _manager.getDataDir().getAbsolutePath())); + out.write(_t("Enter the directory to save the data in (default {0})", _manager.getDataDir().getAbsolutePath())); out.write("\"></td></tr>\n"); out.write("<tr><td> <td><span class=\"snarkAddInfo\">"); - out.write(_("You can also copy .torrent files to: {0}.", "<code>" + _manager.getDataDir().getAbsolutePath() + "</code>")); + out.write(_t("You can also copy .torrent files to: {0}.", "<code>" + _manager.getDataDir().getAbsolutePath() + "</code>")); out.write("\n"); - out.write(_("Removing a .torrent will cause it to stop.")); + out.write(_t("Removing a .torrent will cause it to stop.")); out.write("<br></span></table>\n"); out.write("</div></form></div>"); } @@ -2081,24 +2081,24 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<span class=\"snarkConfigTitle\">"); out.write(toThemeImg("create")); out.write(' '); - out.write(_("Create Torrent")); + out.write(_t("Create Torrent")); out.write("</span><hr>\n<table border=\"0\"><tr><td>"); //out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n"); - out.write(_("Data to seed")); + out.write(_t("Data to seed")); out.write(":<td>" + "<input type=\"text\" name=\"nofilter_baseFile\" size=\"85\" value=\"" + "\" spellcheck=\"false\" title=\""); - out.write(_("File or directory to seed (full path or within the directory {0} )", + out.write(_t("File or directory to seed (full path or within the directory {0} )", _manager.getDataDir().getAbsolutePath() + File.separatorChar)); out.write("\" ><tr><td>\n"); - out.write(_("Trackers")); + out.write(_t("Trackers")); out.write(":<td><table style=\"width: 30%;\"><tr><td></td><td align=\"center\">"); - out.write(_("Primary")); + out.write(_t("Primary")); out.write("</td><td align=\"center\">"); - out.write(_("Alternates")); + out.write(_t("Alternates")); out.write("</td><td rowspan=\"0\">" + " <input type=\"submit\" class=\"create\" value=\""); - out.write(_("Create torrent")); + out.write(_t("Create torrent")); out.write("\" name=\"foo\" >" + "</td></tr>\n"); for (Tracker t : sortedTrackers) { @@ -2116,16 +2116,16 @@ public class I2PSnarkServlet extends BasicServlet { out.write("\" value=\"foo\"></td></tr>\n"); } out.write("<tr><td><i>"); - out.write(_("none")); + out.write(_t("none")); out.write("</i></td><td align=\"center\"><input type=\"radio\" name=\"announceURL\" value=\"none\""); if (_lastAnnounceURL == null) out.write(" checked"); out.write("></td><td></td></tr></table>\n"); // make the user add a tracker on the config form now - //out.write(_("or")); + //out.write(_t("or")); //out.write(" <input type=\"text\" name=\"announceURLOther\" size=\"57\" value=\"http://\" " + // "title=\""); - //out.write(_("Specify custom tracker announce URL")); + //out.write(_t("Specify custom tracker announce URL")); //out.write("\" > " + out.write("</td></tr>" + "</table>\n" + @@ -2149,32 +2149,32 @@ public class I2PSnarkServlet extends BasicServlet { out.write("<span class=\"snarkConfigTitle\">"); out.write(toThemeImg("config")); out.write(' '); - out.write(_("Configuration")); + out.write(_t("Configuration")); out.write("</span><hr>\n" + "<table border=\"0\"><tr><td>"); - out.write(_("Data directory")); + out.write(_t("Data directory")); out.write(": <td><input name=\"nofilter_dataDir\" size=\"80\" value=\"" + DataHelper.escapeHTML(dataDir) + "\" spellcheck=\"false\"></td>\n" + "<tr><td>"); - out.write(_("Files readable by all")); + out.write(_t("Files readable by all")); out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"filesPublic\" value=\"true\" " + (filesPublic ? "checked " : "") + "title=\""); - out.write(_("If checked, other users may access the downloaded files")); + out.write(_t("If checked, other users may access the downloaded files")); out.write("\" >" + "<tr><td>"); - out.write(_("Auto start torrents")); + out.write(_t("Auto start torrents")); out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" value=\"true\" " + (autoStart ? "checked " : "") + "title=\""); - out.write(_("If checked, automatically start torrents that are added")); + out.write(_t("If checked, automatically start torrents that are added")); out.write("\" >" + "<tr><td>"); - out.write(_("Theme")); + out.write(_t("Theme")); out.write(": <td><select name='theme'>"); String theme = _manager.getTheme(); String[] themes = _manager.getThemes(); @@ -2188,7 +2188,7 @@ public class I2PSnarkServlet extends BasicServlet { out.write("</select>\n" + "<tr><td>"); - out.write(_("Refresh time")); + out.write(_t("Refresh time")); out.write(": <td><select name=\"refreshDelay\">"); int delay = _manager.getRefreshDelaySeconds(); for (int i = 0; i < times.length; i++) { @@ -2201,21 +2201,21 @@ public class I2PSnarkServlet extends BasicServlet { if (times[i] > 0) out.write(DataHelper.formatDuration2(times[i] * 1000)); else - out.write(_("Never")); + out.write(_t("Never")); out.write("</option>\n"); } out.write("</select><br>" + "<tr><td>"); - out.write(_("Startup delay")); + out.write(_t("Startup delay")); out.write(": <td><input name=\"startupDelay\" size=\"4\" class=\"r\" value=\"" + _manager.util().getStartupDelay() + "\"> "); - out.write(_("minutes")); + out.write(_t("minutes")); out.write("<br>\n" + "<tr><td>"); - out.write(_("Page size")); + out.write(_t("Page size")); out.write(": <td><input name=\"pageSize\" size=\"4\" maxlength=\"6\" class=\"r\" value=\"" + _manager.getPageSize() + "\"> "); - out.write(_("torrents")); + out.write(_t("torrents")); out.write("<br>\n"); @@ -2239,39 +2239,39 @@ public class I2PSnarkServlet extends BasicServlet { out.write("</select><br>\n"); */ out.write("<tr><td>"); - out.write(_("Total uploader limit")); + out.write(_t("Total uploader limit")); out.write(": <td><input type=\"text\" name=\"upLimit\" class=\"r\" value=\"" + _manager.util().getMaxUploaders() + "\" size=\"4\" maxlength=\"3\" > "); - out.write(_("peers")); + out.write(_t("peers")); out.write("<br>\n" + "<tr><td>"); - out.write(_("Up bandwidth limit")); + out.write(_t("Up bandwidth limit")); out.write(": <td><input type=\"text\" name=\"upBW\" class=\"r\" value=\"" + _manager.util().getMaxUpBW() + "\" size=\"4\" maxlength=\"4\" > KBps <i>"); - out.write(_("Half available bandwidth recommended.")); + out.write(_t("Half available bandwidth recommended.")); out.write(" [<a href=\"/config.jsp\" target=\"blank\">"); - out.write(_("View or change router bandwidth")); + out.write(_t("View or change router bandwidth")); out.write("</a>]</i><br>\n" + "<tr><td>"); - out.write(_("Use open trackers also")); + out.write(_t("Use open trackers also")); out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" value=\"true\" " + (useOpenTrackers ? "checked " : "") + "title=\""); - out.write(_("If checked, announce torrents to open trackers as well as the tracker listed in the torrent file")); + out.write(_t("If checked, announce torrents to open trackers as well as the tracker listed in the torrent file")); out.write("\" ></td></tr>\n" + "<tr><td>"); - out.write(_("Enable DHT")); + out.write(_t("Enable DHT")); out.write(": <td><input type=\"checkbox\" class=\"optbox\" name=\"useDHT\" value=\"true\" " + (useDHT ? "checked " : "") + "title=\""); - out.write(_("If checked, use DHT")); + out.write(_t("If checked, use DHT")); out.write("\" ></td></tr>\n"); // "<tr><td>"); - //out.write(_("Open tracker announce URLs")); + //out.write(_t("Open tracker announce URLs")); //out.write(": <td><input type=\"text\" name=\"openTrackers\" value=\"" // + openTrackers + "\" size=\"50\" ><br>\n"); @@ -2283,13 +2283,13 @@ public class I2PSnarkServlet extends BasicServlet { Map<String, String> options = new TreeMap<String, String>(_manager.util().getI2CPOptions()); out.write("<tr><td>"); - out.write(_("Inbound Settings")); + out.write(_t("Inbound Settings")); out.write(":<td>"); out.write(renderOptions(1, 10, 3, options.remove("inbound.quantity"), "inbound.quantity", TUNNEL)); out.write("     "); out.write(renderOptions(0, 4, 3, options.remove("inbound.length"), "inbound.length", HOP)); out.write("<tr><td>"); - out.write(_("Outbound Settings")); + out.write(_t("Outbound Settings")); out.write(":<td>"); out.write(renderOptions(1, 10, 3, options.remove("outbound.quantity"), "outbound.quantity", TUNNEL)); out.write("     "); @@ -2297,12 +2297,12 @@ public class I2PSnarkServlet extends BasicServlet { if (!_context.isRouterContext()) { out.write("<tr><td>"); - out.write(_("I2CP host")); + out.write(_t("I2CP host")); out.write(": <td><input type=\"text\" name=\"i2cpHost\" value=\"" + _manager.util().getI2CPHost() + "\" size=\"15\" > " + "<tr><td>"); - out.write(_("I2CP port")); + out.write(_t("I2CP port")); out.write(": <td><input type=\"text\" name=\"i2cpPort\" class=\"r\" value=\"" + + _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" > <br>\n"); } @@ -2317,12 +2317,12 @@ public class I2PSnarkServlet extends BasicServlet { opts.append(key).append('=').append(val).append(' '); } out.write("<tr><td>"); - out.write(_("I2CP options")); + out.write(_t("I2CP options")); out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" spellcheck=\"false\" >" + opts.toString() + "</textarea><br>\n" + "<tr><td colspan=\"2\"> \n" + // spacer "<tr><td> <td><input type=\"submit\" class=\"accept\" value=\""); - out.write(_("Save configuration")); + out.write(_t("Save configuration")); out.write("\" name=\"foo\" >\n" + "<tr><td colspan=\"2\"> \n" + // spacer "</table></div></div></form>"); @@ -2337,22 +2337,22 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("<span class=\"snarkConfigTitle\">"); toThemeImg(buf, "config"); buf.append(' '); - buf.append(_("Trackers")); + buf.append(_t("Trackers")); buf.append("</span><hr>\n" + "<table class=\"trackerconfig\"><tr><th>") - //.append(_("Remove")) + //.append(_t("Remove")) .append("</th><th>") - .append(_("Name")) + .append(_t("Name")) .append("</th><th>") - .append(_("Website URL")) + .append(_t("Website URL")) .append("</th><th>") - .append(_("Standard")) + .append(_t("Standard")) .append("</th><th>") - .append(_("Open")) + .append(_t("Open")) .append("</th><th>") - .append(_("Private")) + .append(_t("Private")) .append("</th><th>") - .append(_("Announce URL")) + .append(_t("Announce URL")) .append("</th></tr>\n"); List<String> openTrackers = _manager.util().getOpenTrackers(); List<String> privateTrackers = _manager.getPrivateTrackers(); @@ -2364,7 +2364,7 @@ public class I2PSnarkServlet extends BasicServlet { boolean isKnownOpen = _manager.util().isKnownOpenTracker(t.announceURL); boolean isOpen = isKnownOpen || openTrackers.contains(t.announceURL); buf.append("<tr><td><input type=\"checkbox\" class=\"optbox\" name=\"delete_") - .append(name).append("\" title=\"").append(_("Delete")).append("\">" + + .append(name).append("\" title=\"").append(_t("Delete")).append("\">" + "</td><td>").append(name) .append("</td><td>").append(urlify(homeURL, 35)) .append("</td><td><input type=\"radio\" class=\"optbox\" value=\"0\" name=\"ttype_") @@ -2396,7 +2396,7 @@ public class I2PSnarkServlet extends BasicServlet { .append("</td></tr>\n"); } buf.append("<tr><td><b>") - .append(_("Add")).append(":</b></td>" + + .append(_t("Add")).append(":</b></td>" + "<td><input type=\"text\" class=\"trackername\" name=\"tname\" spellcheck=\"false\"></td>" + "<td><input type=\"text\" class=\"trackerhome\" name=\"thurl\" spellcheck=\"false\"></td>" + "<td><input type=\"radio\" class=\"optbox\" value=\"0\" name=\"add_tracker_type\" checked=\"checked\"></td>" + @@ -2405,12 +2405,12 @@ public class I2PSnarkServlet extends BasicServlet { "<td><input type=\"text\" class=\"trackerannounce\" name=\"taurl\" spellcheck=\"false\"></td></tr>\n" + "<tr><td colspan=\"7\"> </td></tr>\n" + // spacer "<tr><td colspan=\"2\"></td><td colspan=\"5\">\n" + - "<input type=\"submit\" name=\"taction\" class=\"default\" value=\"").append(_("Add tracker")).append("\">\n" + - "<input type=\"submit\" name=\"taction\" class=\"delete\" value=\"").append(_("Delete selected")).append("\">\n" + - "<input type=\"submit\" name=\"taction\" class=\"add\" value=\"").append(_("Add tracker")).append("\">\n" + - "<input type=\"submit\" name=\"taction\" class=\"accept\" value=\"").append(_("Save tracker configuration")).append("\">\n" + - // "<input type=\"reset\" class=\"cancel\" value=\"").append(_("Cancel")).append("\">\n" + - "<input type=\"submit\" name=\"taction\" class=\"reload\" value=\"").append(_("Restore defaults")).append("\">\n" + + "<input type=\"submit\" name=\"taction\" class=\"default\" value=\"").append(_t("Add tracker")).append("\">\n" + + "<input type=\"submit\" name=\"taction\" class=\"delete\" value=\"").append(_t("Delete selected")).append("\">\n" + + "<input type=\"submit\" name=\"taction\" class=\"add\" value=\"").append(_t("Add tracker")).append("\">\n" + + "<input type=\"submit\" name=\"taction\" class=\"accept\" value=\"").append(_t("Save tracker configuration")).append("\">\n" + + // "<input type=\"reset\" class=\"cancel\" value=\"").append(_t("Cancel")).append("\">\n" + + "<input type=\"submit\" name=\"taction\" class=\"reload\" value=\"").append(_t("Restore defaults")).append("\">\n" + "</td></tr>" + "<tr><td colspan=\"7\"> </td></tr>\n" + // spacer "</table></div></div></form>\n"); @@ -2422,7 +2422,7 @@ public class I2PSnarkServlet extends BasicServlet { "<span class=\"snarkConfigTitle\"><a href=\"configure\">"); out.write(toThemeImg("config")); out.write(' '); - out.write(_("Configuration")); + out.write(_t("Configuration")); out.write("</a></span></span></div>\n"); } @@ -2439,7 +2439,7 @@ public class I2PSnarkServlet extends BasicServlet { String trackerURL = magnet.getTrackerURL(); _manager.addMagnet(name, ih, trackerURL, true, dataDir); } catch (IllegalArgumentException iae) { - _manager.addMessage(_("Invalid magnet URL {0}", url)); + _manager.addMessage(_t("Invalid magnet URL {0}", url)); } } @@ -2474,17 +2474,17 @@ public class I2PSnarkServlet extends BasicServlet { } /** translate */ - private String _(String s) { + private String _t(String s) { return _manager.util().getString(s); } /** translate */ - private String _(String s, Object o) { + private String _t(String s, Object o) { return _manager.util().getString(s, o); } /** translate */ - private String _(String s, Object o, Object o2) { + private String _t(String s, Object o, Object o2) { return _manager.util().getString(s, o, o2); } @@ -2660,7 +2660,7 @@ public class I2PSnarkServlet extends BasicServlet { if (title.endsWith("/")) title = title.substring(0, title.length() - 1); String directory = title; - title = _("Torrent") + ": " + DataHelper.escapeHTML(title); + title = _t("Torrent") + ": " + DataHelper.escapeHTML(title); buf.append(title); buf.append("\n").append(HEADER_A).append(_themePath).append(HEADER_B) .append("\n"); @@ -2674,7 +2674,7 @@ public class I2PSnarkServlet extends BasicServlet { toThemeImg(buf, "arrow_refresh"); buf.append("  "); if (_contextName.equals(DEFAULT_NAME)) - buf.append(_("I2PSnark")); + buf.append(_t("I2PSnark")); else buf.append(_contextName); buf.append("
\n"); @@ -2694,7 +2694,7 @@ public class I2PSnarkServlet extends BasicServlet { // first table - torrent info buf.append("\n"); buf.append("\n"); @@ -2704,7 +2704,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); @@ -2712,7 +2712,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); @@ -2721,7 +2721,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); @@ -2740,7 +2740,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(trackerLink); else toThemeImg(buf, "details"); - buf.append(" ").append(_("Primary Tracker")).append(": "); + buf.append(" ").append(_t("Primary Tracker")).append(": "); buf.append(getShortTrackerLink(announce, snark.getInfoHash())); buf.append(""); } @@ -2749,7 +2749,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } @@ -2788,7 +2788,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } @@ -2799,7 +2799,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } @@ -2809,7 +2809,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } @@ -2818,7 +2818,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); } @@ -2830,7 +2830,7 @@ public class I2PSnarkServlet extends BasicServlet { if (announce != null) buf.append("&tr=").append(announce); buf.append("\">") - .append(toImg("magnet", _("Magnet link"))) + .append(toImg("magnet", _t("Magnet link"))) .append("Magnet:\n"); } else { buf.append("\n"); } // We don't have the hash of the torrent file - //buf.append(""); buf.append("\n"); @@ -2925,22 +2925,22 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("
") - .append(_("Torrent")) + .append(_t("Torrent")) .append(": ") .append(DataHelper.escapeHTML(snark.getBaseName())) .append("
"); toThemeImg(buf, "file"); buf.append(" ") - .append(_("Torrent file")) + .append(_t("Torrent file")) .append(": ") .append(DataHelper.escapeHTML(fullPath)) .append("
"); toThemeImg(buf, "file"); buf.append(" ") - .append(_("Data location")) + .append(_t("Data location")) .append(": ") .append(DataHelper.escapeHTML(snark.getStorage().getBase().getPath())) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Info hash")) + .append(_t("Info hash")) .append(": ") .append(hex.toUpperCase(Locale.US)) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Tracker List")).append(": "); + .append(_t("Tracker List")).append(": "); for (List alist2 : alist) { buf.append('['); boolean more = false; @@ -2774,7 +2774,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Comment")).append(": ") + .append(_t("Comment")).append(": ") .append(DataHelper.stripHTML(com)) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Created")).append(": ") + .append(_t("Created")).append(": ") .append(date) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Created By")).append(": ") + .append(_t("Created By")).append(": ") .append(DataHelper.stripHTML(cby)) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Added")).append(": ") + .append(_t("Added")).append(": ") .append(date) .append("
"); toThemeImg(buf, "details"); buf.append(" ") - .append(_("Completed")).append(": ") + .append(_t("Completed")).append(": ") .append(date) .append("
") - .append(_("Private torrent")) + .append(_t("Private torrent")) .append("
").append(_("Maggot link")).append(": ") + //buf.append("
").append(_t("Maggot link")).append(": ") // .append(MAGGOT).append(hex).append(':').append(hex).append("
"); toThemeImg(buf, "size"); buf.append(" ") - .append(_("Size")) + .append(_t("Size")) .append(": ") .append(formatSize(snark.getTotalLength())); int pieces = snark.getPieces(); @@ -2863,16 +2863,16 @@ public class I2PSnarkServlet extends BasicServlet { toThemeImg(buf, "head_rx"); buf.append(" "); if (completion < 1.0) - buf.append(_("Completion")) + buf.append(_t("Completion")) .append(": ") .append((new DecimalFormat("0.00%")).format(completion)); else - buf.append(_("Complete")).append(""); + buf.append(_t("Complete")).append(""); // up ratio buf.append(" "); toThemeImg(buf, "head_tx"); buf.append(" ") - .append(_("Upload ratio")) + .append(_t("Upload ratio")) .append(": "); long uploaded = snark.getUploaded(); if (uploaded > 0) { @@ -2892,7 +2892,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(" "); toThemeImg(buf, "head_rx"); buf.append(" ") - .append(_("Remaining")) + .append(_t("Remaining")) .append(": ") .append(formatSize(needed)); } @@ -2902,20 +2902,20 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(" "); toThemeImg(buf, "file"); buf.append(" ") - .append(_("Files")) + .append(_t("Files")) .append(": ") .append(fileCount); } buf.append(" "); toThemeImg(buf, "file"); buf.append(" ") - .append(_("Pieces")) + .append(_t("Pieces")) .append(": ") .append(pieces); buf.append(" "); toThemeImg(buf, "file"); buf.append(" ") - .append(_("Piece size")) + .append(_t("Piece size")) .append(": ") .append(formatSize(snark.getPieceLength(0))) .append("
"); toThemeImg(buf, "file"); if (snark.isChecking()) { - buf.append(" ").append(_("Checking")).append("… ") + buf.append(" ").append(_t("Checking")).append("… ") .append((new DecimalFormat("0.00%")).format(snark.getCheckingProgress())) .append("   ") - .append(_("Refresh page for results")).append(""); + .append(_t("Refresh page for results")).append(""); } else if (snark.isStarting()) { - buf.append(" ").append(_("Starting")).append("…"); + buf.append(" ").append(_t("Starting")).append("…"); } else if (snark.isAllocating()) { - buf.append(" ").append(_("Allocating")).append("…"); + buf.append(" ").append(_t("Allocating")).append("…"); } else { boolean isRunning = !snark.isStopped(); buf.append(" \n"); + buf.append(_t("Stop")).append("\" name=\"stop\" class=\"stoptorrent\">\n"); else - buf.append(_("Start")).append("\" name=\"start\" class=\"starttorrent\">\n"); - buf.append("   \n"); + buf.append("   \n"); else @@ -3001,7 +3001,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n"); buf.append("\n") .append("\n\n"); @@ -3101,21 +3101,21 @@ public class I2PSnarkServlet extends BasicServlet { int priority = 0; if (fai.isDirectory) { complete = true; - //status = toImg("tick") + ' ' + _("Directory"); + //status = toImg("tick") + ' ' + _t("Directory"); } else { if (snark == null || snark.getStorage() == null) { // Assume complete, perhaps he removed a completed torrent but kept a bookmark complete = true; - status = toImg("cancel") + ' ' + _("Torrent not found?"); + status = toImg("cancel") + ' ' + _t("Torrent not found?"); } else { long remaining = fai.remaining; if (remaining < 0) { complete = true; - status = toImg("cancel") + ' ' + _("File not found in torrent?"); + status = toImg("cancel") + ' ' + _t("File not found in torrent?"); } else if (remaining == 0 || length <= 0) { complete = true; - status = toImg("tick") + ' ' + _("Complete"); + status = toImg("tick") + ' ' + _t("Complete"); } else { priority = fai.priority; if (priority < 0) @@ -3125,8 +3125,8 @@ public class I2PSnarkServlet extends BasicServlet { else status = toImg("clock_red"); status += " " + - (100 * (length - remaining) / length) + "% " + _("complete") + - " (" + DataHelper.formatSize2(remaining) + "B " + _("remaining") + ")"; + (100 * (length - remaining) / length) + "% " + _t("complete") + + " (" + DataHelper.formatSize2(remaining) + "B " + _t("remaining") + ")"; } } @@ -3148,7 +3148,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\"\""); } else { - buf.append(toImg(icon, _("Open"))).append(""); + buf.append(toImg(icon, _t("Open"))).append(""); } } else { buf.append(toImg(icon)); @@ -3172,17 +3172,17 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\n 0) buf.append("checked=\"checked\""); - buf.append('>').append(_("High")); + buf.append('>').append(_t("High")); buf.append("\n').append(_("Normal")); + buf.append('>').append(_t("Normal")); buf.append("\n').append(_("Skip")); + buf.append('>').append(_t("Skip")); showSaveButton = true; } buf.append(""); @@ -3192,12 +3192,12 @@ public class I2PSnarkServlet extends BasicServlet { if (showSaveButton) { buf.append("\n"); } diff --git a/apps/i2psnark/locale/messages_ar.po b/apps/i2psnark/locale/messages_ar.po index 5410a2daa..502c69b90 100644 --- a/apps/i2psnark/locale/messages_ar.po +++ b/apps/i2psnark/locale/messages_ar.po @@ -826,7 +826,7 @@ msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_cs.po b/apps/i2psnark/locale/messages_cs.po index b107d9e86..c2690f07f 100644 --- a/apps/i2psnark/locale/messages_cs.po +++ b/apps/i2psnark/locale/messages_cs.po @@ -817,7 +817,7 @@ msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_de.po b/apps/i2psnark/locale/messages_de.po index 927df100d..dcdd0cb11 100644 --- a/apps/i2psnark/locale/messages_de.po +++ b/apps/i2psnark/locale/messages_de.po @@ -826,7 +826,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Geben Sie einen gültigen Tracker-Namen und die URLs ein" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_en.po b/apps/i2psnark/locale/messages_en.po index d29a692a6..e34056fed 100644 --- a/apps/i2psnark/locale/messages_en.po +++ b/apps/i2psnark/locale/messages_en.po @@ -808,7 +808,7 @@ msgstr "" msgid "Enter valid tracker name and URLs" msgstr "" -#. "\n" + +#. "\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_es.po b/apps/i2psnark/locale/messages_es.po index b173cff24..c7a293fd0 100644 --- a/apps/i2psnark/locale/messages_es.po +++ b/apps/i2psnark/locale/messages_es.po @@ -824,7 +824,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Introduzca nombre y URLs de tracker (rastreador) válidos" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_fr.po b/apps/i2psnark/locale/messages_fr.po index 9aa06fb15..c8987da9a 100644 --- a/apps/i2psnark/locale/messages_fr.po +++ b/apps/i2psnark/locale/messages_fr.po @@ -821,7 +821,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Entrez nom de tracker valide et URLs" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_hu.po b/apps/i2psnark/locale/messages_hu.po index 102974283..6710e744e 100644 --- a/apps/i2psnark/locale/messages_hu.po +++ b/apps/i2psnark/locale/messages_hu.po @@ -814,7 +814,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Adj meg érvényes követő (tracker) nevet és URL címeket" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_it.po b/apps/i2psnark/locale/messages_it.po index 5ad5f6edc..e0315ca19 100644 --- a/apps/i2psnark/locale/messages_it.po +++ b/apps/i2psnark/locale/messages_it.po @@ -818,7 +818,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Inserisci nome e URL validi per il tracker" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_nb.po b/apps/i2psnark/locale/messages_nb.po index dc7cde85e..43d9111cc 100644 --- a/apps/i2psnark/locale/messages_nb.po +++ b/apps/i2psnark/locale/messages_nb.po @@ -813,7 +813,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Skriv inn valid tracker navn og URLer" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_nl.po b/apps/i2psnark/locale/messages_nl.po index 84b867411..20ff93044 100644 --- a/apps/i2psnark/locale/messages_nl.po +++ b/apps/i2psnark/locale/messages_nl.po @@ -816,7 +816,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Geef een geldige trackernaam en URLs in" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_pl.po b/apps/i2psnark/locale/messages_pl.po index 854c90672..3a6784054 100644 --- a/apps/i2psnark/locale/messages_pl.po +++ b/apps/i2psnark/locale/messages_pl.po @@ -823,7 +823,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Podaj prawidłową nazwę trackera i URL" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_pt.po b/apps/i2psnark/locale/messages_pt.po index 8d356e627..5cd2d6c44 100644 --- a/apps/i2psnark/locale/messages_pt.po +++ b/apps/i2psnark/locale/messages_pt.po @@ -822,7 +822,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Insira um nome válido para o tracker e URLs" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_pt_bR.po b/apps/i2psnark/locale/messages_pt_bR.po index 4b20ea31f..251188047 100644 --- a/apps/i2psnark/locale/messages_pt_bR.po +++ b/apps/i2psnark/locale/messages_pt_bR.po @@ -814,7 +814,7 @@ msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_ro.po b/apps/i2psnark/locale/messages_ro.po index 98d4bb92c..d0575dd0f 100644 --- a/apps/i2psnark/locale/messages_ro.po +++ b/apps/i2psnark/locale/messages_ro.po @@ -817,7 +817,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Introduceți numele tracker valid și URL-uri" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_ru.po b/apps/i2psnark/locale/messages_ru.po index 19652c105..92a831679 100644 --- a/apps/i2psnark/locale/messages_ru.po +++ b/apps/i2psnark/locale/messages_ru.po @@ -829,7 +829,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Введите действительное название и URL трекера" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_sk.po b/apps/i2psnark/locale/messages_sk.po index c4780b725..339f35426 100644 --- a/apps/i2psnark/locale/messages_sk.po +++ b/apps/i2psnark/locale/messages_sk.po @@ -816,7 +816,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Zadajte platný názov a URL stopovača" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_sv.po b/apps/i2psnark/locale/messages_sv.po index 7f653edea..ec566c4eb 100644 --- a/apps/i2psnark/locale/messages_sv.po +++ b/apps/i2psnark/locale/messages_sv.po @@ -822,7 +822,7 @@ msgid "Enter valid tracker name and URLs" msgstr "Ange giltigt namn och adresser för trackern " #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_vi.po b/apps/i2psnark/locale/messages_vi.po index cad895268..d7d0e8067 100644 --- a/apps/i2psnark/locale/messages_vi.po +++ b/apps/i2psnark/locale/messages_vi.po @@ -810,7 +810,7 @@ msgid "Enter valid tracker name and URLs" msgstr "" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2psnark/locale/messages_zh.po b/apps/i2psnark/locale/messages_zh.po index 5017281a9..cb4216a40 100644 --- a/apps/i2psnark/locale/messages_zh.po +++ b/apps/i2psnark/locale/messages_zh.po @@ -814,7 +814,7 @@ msgid "Enter valid tracker name and URLs" msgstr "请输入有效的 Tracker 名称与链接" #. "\n" + +#. value=\"").append(_t("Cancel")).append("\">\n" + #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:1361 #: ../java/src/org/klomp/snark/web/I2PSnarkServlet.java:2410 msgid "Restore defaults" diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh index 8ffdc5a9e..147e32952 100755 --- a/apps/i2ptunnel/java/bundle-messages-proxy.sh +++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh @@ -62,16 +62,16 @@ do 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") + # _t("foo") # _x("foo") - # intl._("foo") + # intl._t("foo") # intl.title("foo") # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. find $JPATHS -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ - --keyword=_ \ + --keyword=_t \ -o ${i}t if [ $? -ne 0 ] then diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh index a8769f0dc..29a0bec93 100755 --- a/apps/i2ptunnel/java/bundle-messages.sh +++ b/apps/i2ptunnel/java/bundle-messages.sh @@ -61,16 +61,16 @@ do 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") + # _t("foo") # _x("foo") - # intl._("foo") + # intl._t("foo") # intl.title("foo") # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. find $JPATHS -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ - --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ + --keyword=_t --keyword=_x --keyword=intl._ --keyword=intl.title \ -o ${i}t if [ $? -ne 0 ] then diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 8645b686f..4183ce399 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -631,8 +631,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn String header = getErrorPage("ahelper-notfound", ERR_AHELPER_NOTFOUND); try { out.write(header.getBytes("UTF-8")); - out.write(("

" + _("This seems to be a bad destination:") + " " + ahelperKey + " " + - _("i2paddresshelper cannot help you with a destination like that!") + + out.write(("

" + _t("This seems to be a bad destination:") + " " + ahelperKey + " " + + _t("i2paddresshelper cannot help you with a destination like that!") + "

").getBytes("UTF-8")); writeFooter(out); reader.drain(); @@ -706,7 +706,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn String conflictURL = conflictURI.toASCIIString(); String header = getErrorPage("ahelper-conflict", ERR_AHELPER_CONFLICT); out.write(header.getBytes("UTF-8")); - out.write(_("To visit the destination in your host database, click here. To visit the conflicting addresshelper destination, click here.", + out.write(_t("To visit the destination in your host database, click here. To visit the conflicting addresshelper destination, click here.", trustedURL, conflictURL).getBytes("UTF-8")); out.write("

".getBytes("UTF-8")); writeFooter(out); @@ -1118,7 +1118,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn header = getErrorPage("dnfb", ERR_DESTINATION_UNKNOWN); } else if(destination.length() == 60 && destination.toLowerCase(Locale.US).endsWith(".b32.i2p")) { header = getErrorPage("nols", ERR_DESTINATION_UNKNOWN); - extraMessage = _("Destination lease set not found"); + extraMessage = _t("Destination lease set not found"); } else { header = getErrorPage("dnfh", ERR_DESTINATION_UNKNOWN); jumpServers = getTunnel().getClientOptions().getProperty(PROP_JUMP_SERVERS); @@ -1270,31 +1270,31 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn Writer out = new BufferedWriter(new OutputStreamWriter(outs, "UTF-8")); String header = getErrorPage("ahelper-new", ERR_AHELPER_NEW); out.write(header); - out.write("
"); - String tx = _("Directory"); + String tx = _t("Directory"); // cycle through sort by name or type String sort; boolean isTypeSort = false; @@ -3021,7 +3021,7 @@ public class I2PSnarkServlet extends BasicServlet { .append(getQueryString(sort)).append("\">"); } toThemeImg(buf, "file", tx, - showSort ? _("Sort by {0}", (isTypeSort ? _("File type") : _("Name"))) + showSort ? _t("Sort by {0}", (isTypeSort ? _t("File type") : _t("Name"))) : tx + ": " + directory); if (showSort) buf.append(""); @@ -3036,9 +3036,9 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); } - tx = _("Size"); + tx = _t("Size"); toThemeImg(buf, "size", tx, - showSort ? _("Sort by {0}", tx) : tx); + showSort ? _t("Sort by {0}", tx) : tx); if (showSort) buf.append(""); buf.append(""); @@ -3048,9 +3048,9 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); } - tx = _("Status"); + tx = _t("Status"); toThemeImg(buf, "status", tx, - showRemainingSort ? _("Sort by {0}", _("Remaining")) : tx); + showRemainingSort ? _t("Sort by {0}", _t("Remaining")) : tx); if (showRemainingSort) buf.append(""); if (showPriority) { @@ -3060,9 +3060,9 @@ public class I2PSnarkServlet extends BasicServlet { buf.append(""); } - tx = _("Priority"); + tx = _t("Priority"); toThemeImg(buf, "priority", tx, - showSort ? _("Sort by {0}", tx) : tx); + showSort ? _t("Sort by {0}", tx) : tx); if (showSort) buf.append(""); } @@ -3072,7 +3072,7 @@ public class I2PSnarkServlet extends BasicServlet { buf.append("\">"); toThemeImg(buf, "up"); buf.append(' ') - .append(_("Up to higher level directory")) + .append(_t("Up to higher level directory")) .append("
 " + "") - .append(toImg("clock_red")).append(_("Set all high")).append("\n" + + .append(toImg("clock_red")).append(_t("Set all high")).append("\n" + "") - .append(toImg("clock")).append(_("Set all normal")).append("\n" + + .append(toImg("clock")).append(_t("Set all normal")).append("\n" + "") - .append(toImg("cancel")).append(_("Skip all")).append("\n" + - "

\n" + + "

\n" + "
"); + buf.append(""); else if (in.getLength() <= 1 || in.getLength() + in.getLengthVariance() <= 1 || out.getLength() <= 1 || out.getLength() + out.getLengthVariance() <= 1) - buf.append(""); + buf.append(""); if (in.getLength() + Math.abs(in.getLengthVariance()) >= WARN_LENGTH || out.getLength() + Math.abs(out.getLengthVariance()) >= WARN_LENGTH) - buf.append(""); + buf.append(""); if (in.getTotalQuantity() >= WARN_QUANTITY || out.getTotalQuantity() >= WARN_QUANTITY) - buf.append(""); + buf.append(""); - buf.append("\n"); + buf.append("\n"); // buf.append("\n"); // tunnel depth int maxLength = advanced ? MAX_ADVANCED_LENGTH : MAX_LENGTH; - buf.append("\n"); + buf.append("\n"); buf.append("\n"); // tunnel depth variance - buf.append("\n"); + buf.append("\n"); buf.append("\n"); + buf.append("\n"); buf.append("\n"); + buf.append("\n"); buf.append("\n" + + buf.append("\n" + "\n" + + buf.append("\n" + "
" + _("Host") + + out.write("\n"); try { String b32 = Base32.encode(SHA256Generator.getInstance().calculateHash(Base64.decode(ahelperKey)).getData()); - out.write("" + + out.write("" + ""); } catch(Exception e) { } - out.write("
" + _t("Host") + "" + destination + "
" + _("Base 32") + "
" + _t("Base 32") + "" + b32 + ".b32.i2p
" + _("Destination") + "" + + out.write("
" + _t("Destination") + "" + "
\n" + "
" + // FIXME if there is a query remaining it is lost "
" + - "" + + "" + "
\n
" + "\n" + "\n" + "\n" + "
\n"); + _t("Save {0} to router address book and continue to website", destination) + "
\n"); if(_context.namingService().getName().equals("BlockfileNamingService")) { // only blockfile supports multiple books - out.write("

\n"); - out.write("\n"); + out.write("

\n"); + out.write("\n"); } // Firefox (and others?) don't send referer to meta refresh target, which is // what the jump servers use, so this isn't that useful. diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java index 5824f1fc3..5e39cf3b8 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java @@ -684,7 +684,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem out.write(""); if (usingWWWProxy) { out.write("

"); - out.write(_("HTTP Outproxy")); + out.write(_t("HTTP Outproxy")); out.write(": " + wwwProxy); } if (extraMessage != null) { @@ -723,7 +723,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem if (first) { first = false; out.write("

"); - out.write(_("Click a link below for an address helper from a jump service")); + out.write(_t("Click a link below for an address helper from a jump service")); out.write("

\n"); } else { out.write("
"); @@ -733,7 +733,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem out.write(uri); out.write("\">"); // Translators: parameter is a host name - out.write(_("{0} jump service", jumphost)); + out.write(_t("{0} jump service", jumphost)); out.write("\n"); } } @@ -778,7 +778,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem * Translate * @since 0.9.14 moved from I2PTunnelHTTPClient */ - protected String _(String key) { + protected String _t(String key) { return Translate.getString(key, _context, BUNDLE_NAME); } @@ -787,7 +787,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem * {0} * @since 0.9.14 moved from I2PTunnelHTTPClient */ - protected String _(String key, Object o) { + protected String _t(String key, Object o) { return Translate.getString(key, o, _context, BUNDLE_NAME); } @@ -796,7 +796,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem * {0} and {1} * @since 0.9.14 moved from I2PTunnelHTTPClient */ - protected String _(String key, Object o, Object o2) { + protected String _t(String key, Object o, Object o2) { return Translate.getString(key, o, o2, _context, BUNDLE_NAME); } } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java index 2d70caed0..15e67de74 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java @@ -166,9 +166,9 @@ public abstract class LocalHTTPServer { nsOptions.setProperty("list", book); if (referer != null && referer.startsWith("http")) { String from = "" + referer + ""; - nsOptions.setProperty("s", _("Added via address helper from {0}", from)); + nsOptions.setProperty("s", _t("Added via address helper from {0}", from)); } else { - nsOptions.setProperty("s", _("Added via address helper")); + nsOptions.setProperty("s", _t("Added via address helper")); } boolean success = ns.put(host, dest, nsOptions); writeRedirectPage(out, success, host, book, url); @@ -185,11 +185,11 @@ public abstract class LocalHTTPServer { private static void writeRedirectPage(OutputStream out, boolean success, String host, String book, String url) throws IOException { String tbook; if ("hosts.txt".equals(book)) - tbook = _("router"); + tbook = _t("router"); else if ("userhosts.txt".equals(book)) - tbook = _("master"); + tbook = _t("master"); else if ("privatehosts.txt".equals(book)) - tbook = _("private"); + tbook = _t("private"); else tbook = book; out.write(("HTTP/1.1 200 OK\r\n"+ @@ -198,22 +198,22 @@ public abstract class LocalHTTPServer { "Proxy-Connection: close\r\n"+ "\r\n"+ ""+ - "" + _("Redirecting to {0}", host) + "\n" + + "" + _t("Redirecting to {0}", host) + "\n" + "\n" + "\n" + "\n" + "\n" + "" + "
\n" + "

" + (success ? - _("Saved {0} to the {1} addressbook, redirecting now.", host, tbook) : - _("Failed to save {0} to the {1} addressbook, redirecting now.", host, tbook)) + + _t("Saved {0} to the {1} addressbook, redirecting now.", host, tbook) : + _t("Failed to save {0} to the {1} addressbook, redirecting now.", host, tbook)) + "

\n

" + - _("Click here if you are not redirected automatically.") + + _t("Click here if you are not redirected automatically.") + "

").getBytes("UTF-8")); I2PTunnelHTTPClient.writeFooter(out); out.flush(); @@ -248,17 +248,17 @@ public abstract class LocalHTTPServer { private static final String BUNDLE_NAME = "net.i2p.i2ptunnel.proxy.messages"; /** lang in routerconsole.lang property, else current locale */ - protected static String _(String key) { + protected static String _t(String key) { return Translate.getString(key, I2PAppContext.getGlobalContext(), BUNDLE_NAME); } /** {0} */ - protected static String _(String key, Object o) { + protected static String _t(String key, Object o) { return Translate.getString(key, o, I2PAppContext.getGlobalContext(), BUNDLE_NAME); } /** {0} and {1} */ - protected static String _(String key, Object o, Object o2) { + protected static String _t(String key, Object o, Object o2) { return Translate.getString(key, o, o2, I2PAppContext.getGlobalContext(), BUNDLE_NAME); } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java index 0cc4e5278..b2b38398e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/GeneralHelper.java @@ -146,11 +146,11 @@ public class GeneralHelper { List rv = tcg.clearAllMessages(); try { tcg.saveConfig(); - rv.add(0, _("Configuration changes saved", context)); + rv.add(0, _t("Configuration changes saved", context)); } catch (IOException ioe) { Log log = context.logManager().getLog(GeneralHelper.class); log.error("Failed to save config file", ioe); - rv.add(0, _("Failed to save configuration", context) + ": " + ioe.toString()); + rv.add(0, _t("Failed to save configuration", context) + ": " + ioe.toString()); } return rv; } @@ -714,7 +714,7 @@ public class GeneralHelper { return def; } - protected static String _(String key, I2PAppContext context) { - return Messages._(key, context); + protected static String _t(String key, I2PAppContext context) { + return Messages._t(key, context); } } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index ebc495098..fb9b137b2 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -358,7 +358,7 @@ public class EditBean extends IndexBean { public String getI2CPHost(int tunnel) { if (_context.isRouterContext()) - return _("internal"); + return _t("internal"); TunnelController tun = getController(tunnel); if (tun != null) return tun.getI2CPHost(); @@ -368,7 +368,7 @@ public class EditBean extends IndexBean { public String getI2CPPort(int tunnel) { if (_context.isRouterContext()) - return _("internal"); + return _t("internal"); TunnelController tun = getController(tunnel); if (tun != null) return tun.getI2CPPort(); @@ -406,11 +406,11 @@ public class EditBean extends IndexBean { if (i <= 3) { buf.append(" ("); if (i == 1) - buf.append(_("lower bandwidth and reliability")); + buf.append(_t("lower bandwidth and reliability")); else if (i == 2) - buf.append(_("standard bandwidth and reliability")); + buf.append(_t("standard bandwidth and reliability")); else if (i == 3) - buf.append(_("higher bandwidth and reliability")); + buf.append(_t("higher bandwidth and reliability")); buf.append(')'); } buf.append("\n"); diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index ccb30ca99..15eb3f29e 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java @@ -84,7 +84,7 @@ public class IndexBean { String error; try { tcg = TunnelControllerGroup.getInstance(); - error = tcg == null ? _("Tunnels are not initialized yet, please reload in two minutes.") + error = tcg == null ? _t("Tunnels are not initialized yet, please reload in two minutes.") : null; } catch (IllegalArgumentException iae) { tcg = null; @@ -157,9 +157,9 @@ public class IndexBean { // If passwords are turned on, all is assumed good if (!_context.getBooleanProperty(PROP_PW_ENABLE) && !haveNonce(_curNonce)) - return _("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.") + return _t("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser."); + _t("If the problem persists, verify that you have cookies enabled in your browser."); if ("Stop all".equals(_action)) return stopAll(); else if ("Start all".equals(_action)) @@ -205,7 +205,7 @@ public class IndexBean { private String reloadConfig() { _group.reloadControllers(); - return _("Configuration reloaded for all tunnels"); + return _t("Configuration reloaded for all tunnels"); } private String start() { @@ -219,7 +219,7 @@ public class IndexBean { try { Thread.sleep(1000); } catch (InterruptedException ie) {} // and give them something to look at in any case // FIXME name will be HTML escaped twice - return _("Starting tunnel") + ' ' + getTunnelName(_tunnel) + "..."; + return _t("Starting tunnel") + ' ' + getTunnelName(_tunnel) + "..."; } private String stop() { @@ -233,7 +233,7 @@ public class IndexBean { try { Thread.sleep(1000); } catch (InterruptedException ie) {} // and give them something to look at in any case // FIXME name will be HTML escaped twice - return _("Stopping tunnel") + ' ' + getTunnelName(_tunnel) + "..."; + return _t("Stopping tunnel") + ' ' + getTunnelName(_tunnel) + "..."; } private String saveChanges() { @@ -322,7 +322,7 @@ public class IndexBean { if (name != null) return DataHelper.escapeHTML(name); else - return _("New Tunnel"); + return _t("New Tunnel"); } /** @@ -342,13 +342,13 @@ public class IndexBean { if (tun != null && tun.getListenPort() != null) { String port = tun.getListenPort(); if (port.length() == 0) - return "" + _("Port not set") + ""; + return "" + _t("Port not set") + ""; int iport = Addresses.getPort(port); if (iport == 0) - return "" + _("Invalid port") + ' ' + port + ""; + return "" + _t("Invalid port") + ' ' + port + ""; if (iport < 1024) return "" + - _("Warning - ports less than 1024 are not recommended") + + _t("Warning - ports less than 1024 are not recommended") + ": " + port + ""; // dup check, O(n**2) List controllers = _group.getControllers(); @@ -357,12 +357,12 @@ public class IndexBean { continue; if (port.equals(controllers.get(i).getListenPort())) return "" + - _("Warning - duplicate port") + + _t("Warning - duplicate port") + ": " + port + ""; } return port; } - return "" + _("Port not set") + ""; + return "" + _t("Port not set") + ""; } public String getTunnelType(int tunnel) { @@ -374,18 +374,18 @@ public class IndexBean { } public String getTypeName(String internalType) { - if (TunnelController.TYPE_STD_CLIENT.equals(internalType)) return _("Standard client"); - else if (TunnelController.TYPE_HTTP_CLIENT.equals(internalType)) return _("HTTP/HTTPS client"); - else if (TunnelController.TYPE_IRC_CLIENT.equals(internalType)) return _("IRC client"); - else if (TunnelController.TYPE_STD_SERVER.equals(internalType)) return _("Standard server"); - else if (TunnelController.TYPE_HTTP_SERVER.equals(internalType)) return _("HTTP server"); - else if (TunnelController.TYPE_SOCKS.equals(internalType)) return _("SOCKS 4/4a/5 proxy"); - else if (TunnelController.TYPE_SOCKS_IRC.equals(internalType)) return _("SOCKS IRC proxy"); - else if (TunnelController.TYPE_CONNECT.equals(internalType)) return _("CONNECT/SSL/HTTPS proxy"); - else if (TunnelController.TYPE_IRC_SERVER.equals(internalType)) return _("IRC server"); - else if (TunnelController.TYPE_STREAMR_CLIENT.equals(internalType)) return _("Streamr client"); - else if (TunnelController.TYPE_STREAMR_SERVER.equals(internalType)) return _("Streamr server"); - else if (TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(internalType)) return _("HTTP bidir"); + if (TunnelController.TYPE_STD_CLIENT.equals(internalType)) return _t("Standard client"); + else if (TunnelController.TYPE_HTTP_CLIENT.equals(internalType)) return _t("HTTP/HTTPS client"); + else if (TunnelController.TYPE_IRC_CLIENT.equals(internalType)) return _t("IRC client"); + else if (TunnelController.TYPE_STD_SERVER.equals(internalType)) return _t("Standard server"); + else if (TunnelController.TYPE_HTTP_SERVER.equals(internalType)) return _t("HTTP server"); + else if (TunnelController.TYPE_SOCKS.equals(internalType)) return _t("SOCKS 4/4a/5 proxy"); + else if (TunnelController.TYPE_SOCKS_IRC.equals(internalType)) return _t("SOCKS IRC proxy"); + else if (TunnelController.TYPE_CONNECT.equals(internalType)) return _t("CONNECT/SSL/HTTPS proxy"); + else if (TunnelController.TYPE_IRC_SERVER.equals(internalType)) return _t("IRC server"); + else if (TunnelController.TYPE_STREAMR_CLIENT.equals(internalType)) return _t("Streamr client"); + else if (TunnelController.TYPE_STREAMR_SERVER.equals(internalType)) return _t("Streamr server"); + else if (TunnelController.TYPE_HTTP_BIDIR_SERVER.equals(internalType)) return _t("HTTP bidir"); else return internalType; } @@ -442,15 +442,15 @@ public class IndexBean { host = tun.getTargetHost(); String port = tun.getTargetPort(); if (host == null || host.length() == 0) - host = "" + _("Host not set") + ""; + host = "" + _t("Host not set") + ""; else if (Addresses.getIP(host) == null) - host = "" + _("Invalid address") + ' ' + host + ""; + host = "" + _t("Invalid address") + ' ' + host + ""; else if (host.indexOf(':') >= 0) host = '[' + host + ']'; if (port == null || port.length() == 0) - port = "" + _("Port not set") + ""; + port = "" + _t("Port not set") + ""; else if (Addresses.getPort(port) == 0) - port = "" + _("Invalid port") + ' ' + port + ""; + port = "" + _t("Invalid port") + ' ' + port + ""; return host + ':' + port; } else return ""; @@ -1074,8 +1074,8 @@ public class IndexBean { } } - protected String _(String key) { - return Messages._(key, _context); + protected String _t(String key) { + return Messages._t(key, _context); } /** translate (ngettext) 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 d4a2fb4bd..89e2bfc43 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/Messages.java @@ -16,11 +16,11 @@ public class Messages { } /** lang in routerconsole.lang property, else current locale */ - public String _(String key) { + public String _t(String key) { return Translate.getString(key, _context, BUNDLE_NAME); } - public static String _(String key, I2PAppContext ctx) { + public static String _t(String key, I2PAppContext ctx) { return Translate.getString(key, ctx, BUNDLE_NAME); } @@ -32,11 +32,11 @@ public class Messages { * 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("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) { + public String _t(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 c0dd04cf4..5fbc62dd4 100644 --- a/apps/i2ptunnel/jsp/editClient.jsp +++ b/apps/i2ptunnel/jsp/editClient.jsp @@ -16,7 +16,7 @@ %> - <%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Client Tunnel")%> + <%=intl._t("Hidden Services Manager")%> - <%=intl._t("Edit Client Tunnel")%> @@ -49,11 +49,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; } if (curTunnel >= 0) { tunnelTypeName = editBean.getTunnelType(curTunnel); tunnelType = editBean.getInternalType(curTunnel); - %>

<%=intl._("Edit proxy settings")%>

<% + %>

<%=intl._t("Edit proxy settings")%>

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); - %>

<%=intl._("New proxy settings")%>

<% + %>

<%=intl._t("New proxy settings")%>

<% } %> @@ -87,17 +87,17 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
- + <%=tunnelTypeName%>
@@ -108,9 +108,9 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<% if ("streamrclient".equals(tunnelType)) { %> - + <% } else { %> - + <% } /* streamrclient */ %>
@@ -119,7 +119,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% String value = editBean.getClientPort(curTunnel); if (value == null || "".equals(value.trim())) { out.write(" ("); - out.write(intl._("required")); + out.write(intl._t("required")); out.write(")"); } %> @@ -134,14 +134,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; } String targetHost = editBean.getTargetHost(curTunnel); if (targetHost == null || "".equals(targetHost.trim())) { out.write(" ("); - out.write(intl._("required")); + out.write(intl._t("required")); out.write(")"); } %> <% } else { %> - <%=intl._("Reachable by")%>(R): + <%=intl._t("Reachable by")%>(R): class="tickbox" />
@@ -176,41 +176,41 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %>
<% if ("httpclient".equals(tunnelType)) { %>
<% } // httpclient %>
class="tickbox" /> - <%=intl._("(Check the Box for 'YES')")%> + <%=intl._t("(Check the Box for 'YES')")%>
<% } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) { %>
- (<%=intl._("name, name:port, or destination")%> + (<%=intl._t("name, name:port, or destination")%> <% if ("streamrclient".equals(tunnelType)) { /* deferred resolution unimplemented in streamr client */ %> - - <%=intl._("b32 not recommended")%> + - <%=intl._t("b32 not recommended")%> <% } %> )
@@ -218,26 +218,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if (!"streamrclient".equals(tunnelType)) { %>
class="tickbox" /> - <%=intl._("(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)")%> + <%=intl._t("(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)")%>
<% } // !streamrclient %>
class="tickbox" /> - <%=intl._("(Check the Box for 'YES')")%> + <%=intl._t("(Check the Box for 'YES')")%>
<% if ("ircclient".equals(tunnelType)) { %>
class="tickbox" /> - <%=intl._("(Check the Box for 'YES')")%> + <%=intl._t("(Check the Box for 'YES')")%>
<% } // ircclient %> @@ -247,8 +247,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
-

<%=intl._("Advanced networking options")%>


- <%=intl._("(NOTE: when this client proxy is configured to share tunnels, then these options are for all the shared proxy clients!)")%> +

<%=intl._t("Advanced networking options")%>


+ <%=intl._t("(NOTE: when this client proxy is configured to share tunnels, then these options are for all the shared proxy clients!)")%>
@@ -256,42 +256,42 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
- +
<% int tunnelBackupQuantity = editBean.getTunnelBackupQuantity(curTunnel, 0); - %> - - - + %> + + + <% if (tunnelBackupQuantity > 3) { - %> + %> <% } %>
@@ -320,20 +320,20 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if (!"streamrclient".equals(tunnelType)) { %>
class="tickbox" /> - (<%=intl._("for request/response connections")%>) + (<%=intl._t("for request/response connections")%>)
@@ -342,17 +342,17 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% } // !streamrclient %>
- +
readonly="readonly" <% } %> />
readonly="readonly" <% } %> />
@@ -364,12 +364,12 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
class="tickbox" />
@@ -381,24 +381,24 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
class="tickbox" />
@@ -409,31 +409,31 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
class="tickbox" />
- + - +
class="tickbox" /><%=intl._("Enable")%><%=intl._t("Enable")%> class="tickbox" /><%=intl._("Disable")%>
<%=intl._t("Disable")%>
@@ -445,16 +445,16 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "socksirctunnel".equals(tunnelType) || "sockstunnel".equals(tunnelType)) { %>
- + class="tickbox" />
- +
<% @@ -462,12 +462,12 @@ input.default { width: 1px; height: 1px; visibility: hidden; } if (destb64.length() > 0) { %>
- + <%=editBean.getDestHashBase32(curTunnel)%>
<% } // if destb64 %> @@ -479,31 +479,31 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if ("httpclient".equals(tunnelType)) { %>
- +
- + class="tickbox" />

- +
- + class="tickbox" />

- +
- + class="tickbox" />

- +
- + class="tickbox" />
@@ -516,8 +516,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; } %>
@@ -558,23 +558,23 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType) || "sockstunnel".equals(tunnelType) || "socksirctunnel".equals(tunnelType)) { %>
- +
class="tickbox" />
@@ -582,23 +582,23 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
- +
class="tickbox" />
@@ -609,7 +609,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; } <% if ("httpclient".equals(tunnelType)) { %>
- +
@@ -621,7 +621,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
@@ -634,9 +634,9 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
- - - + + +
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp index 0d7c05093..4a0a7eabf 100644 --- a/apps/i2ptunnel/jsp/editServer.jsp +++ b/apps/i2ptunnel/jsp/editServer.jsp @@ -16,7 +16,7 @@ %> - <%=intl._("Hidden Services Manager")%> - <%=intl._("Edit Hidden Service")%> + <%=intl._t("Hidden Services Manager")%> - <%=intl._t("Edit Hidden Service")%> @@ -49,11 +49,11 @@ input.default { width: 1px; height: 1px; visibility: hidden; } if (curTunnel >= 0) { tunnelTypeName = editBean.getTunnelType(curTunnel); tunnelType = editBean.getInternalType(curTunnel); - %>

<%=intl._("Edit server settings")%>

<% + %>

<%=intl._t("Edit server settings")%>

<% } else { tunnelTypeName = editBean.getTypeName(request.getParameter("type")); tunnelType = net.i2p.data.DataHelper.stripHTML(request.getParameter("type")); - %>

<%=intl._("New server settings")%>

<% + %>

<%=intl._t("New server settings")%>

<% } %> @@ -87,26 +87,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
- + <%=tunnelTypeName%>
class="tickbox" /> - <%=intl._("(Check the Box for 'YES')")%> + <%=intl._t("(Check the Box for 'YES')")%>
@@ -115,26 +115,26 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<% if ("streamrserver".equals(tunnelType)) { %> - + <% } else { %> - + <% } %>
<% if (!"streamrserver".equals(tunnelType)) { %>
<% } /* !streamrserver */ %>
- +
") - .append(_("Start")).append(" ").append(index).append(""); + .append(_t("Start")).append(" ").append(index).append(""); } if (showStopButton && (!edit)) buf.append(""); + .append(_t("Stop")).append(" ").append(index).append(""); if (isClientChangeEnabled() && showEditButton && (!edit) && !ro) buf.append(""); + .append(_t("Edit")).append(" ").append(index).append(""); if (showUpdateButton && (!edit) && !ro) { buf.append(""); + .append(_t("Check for updates")).append(" ").append(index).append(""); buf.append(""); + .append(_t("Update")).append(" ").append(index).append(""); } if (showDeleteButton && (!edit) && !ro) { buf.append(""); + .append(_t("Delete")).append(" ").append(index).append(""); } buf.append(""); if (edit && !ro) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java index 5e426988e..f26b182a0 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigHomeHandler.java @@ -18,15 +18,15 @@ public class ConfigHomeHandler extends FormHandler { protected void processForm() { if (_action == null) return; String group = getJettyString("group"); - boolean deleting = _action.equals(_("Delete selected")); - boolean adding = _action.equals(_("Add item")); - boolean restoring = _action.equals(_("Restore defaults")); - if (_action.equals(_("Save")) && "0".equals(group)) { + boolean deleting = _action.equals(_t("Delete selected")); + boolean adding = _action.equals(_t("Add item")); + boolean restoring = _action.equals(_t("Restore defaults")); + if (_action.equals(_t("Save")) && "0".equals(group)) { boolean old = _context.getBooleanProperty(HomeHelper.PROP_OLDHOME); boolean nnew = getJettyString("oldHome") != null; if (old != nnew) { _context.router().saveConfig(HomeHelper.PROP_OLDHOME, "" + nnew); - addFormNotice(_("Home page changed")); + addFormNotice(_t("Home page changed")); } } else if (adding || deleting || restoring) { String prop; @@ -48,7 +48,7 @@ public class ConfigHomeHandler extends FormHandler { //_context.router().saveConfig(prop, dflt); // remove config so user will see updates _context.router().saveConfig(prop, null); - addFormNotice(_("Restored default settings")); + addFormNotice(_t("Restored default settings")); return; } String config = _context.getProperty(prop, dflt); @@ -60,12 +60,12 @@ public class ConfigHomeHandler extends FormHandler { if (adding) { String name = getJettyString("nofilter_name"); if (name == null || name.length() <= 0) { - addFormError(_("No name entered")); + addFormError(_t("No name entered")); return; } String url = getJettyString("nofilter_url"); if (url == null || url.length() <= 0) { - addFormError(_("No URL entered")); + addFormError(_t("No URL entered")); return; } // these would get double-escaped so we can't do it this way... @@ -81,7 +81,7 @@ public class ConfigHomeHandler extends FormHandler { else app = new HomeHelper.App(name, "", url, "/themes/console/images/question.png"); apps.add(app); - addFormNotice(_("Added") + ": " + app.name); + addFormNotice(_t("Added") + ": " + app.name); } else { // deleting Set toDelete = new HashSet(); @@ -98,13 +98,13 @@ public class ConfigHomeHandler extends FormHandler { HomeHelper.App app = iter.next(); if (toDelete.contains(app.name)) { iter.remove(); - addFormNotice(_("Removed") + ": " + app.name); + addFormNotice(_t("Removed") + ": " + app.name); } } } HomeHelper.saveApps(_context, prop, apps, !("3".equals(group))); } else { - //addFormError(_("Unsupported")); + //addFormError(_t("Unsupported")); } } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java index 97b8cb3a6..b5930895b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java @@ -15,12 +15,12 @@ public class ConfigKeyringHandler extends FormHandler { @Override protected void processForm() { if (_action == null) return; - boolean adding = _action.equals(_("Add key")); - if (adding || _action.equals(_("Delete key"))) { + boolean adding = _action.equals(_t("Add key")); + if (adding || _action.equals(_t("Delete key"))) { if (_peer == null) - addFormError(_("You must enter a destination")); + addFormError(_t("You must enter a destination")); if (_key == null && adding) - addFormError(_("You must enter a key")); + addFormError(_t("You must enter a key")); if (_peer == null || (_key == null && adding)) return; Hash h = ConvertToHash.getHash(_peer); @@ -31,22 +31,22 @@ public class ConfigKeyringHandler extends FormHandler { } catch (DataFormatException dfe) {} if (h != null && h.getData() != null && sk.getData() != null) { _context.keyRing().put(h, sk); - addFormNotice(_("Key for") + " " + h.toBase64() + " " + _("added to keyring")); + addFormNotice(_t("Key for") + " " + h.toBase64() + " " + _t("added to keyring")); } else { - addFormError(_("Invalid destination or key")); + addFormError(_t("Invalid destination or key")); } } else { // Delete if (h != null && h.getData() != null) { if (_context.keyRing().remove(h) != null) - addFormNotice(_("Key for") + " " + h.toBase64() + " " + _("removed from keyring")); + addFormNotice(_t("Key for") + " " + h.toBase64() + " " + _t("removed from keyring")); else - addFormNotice(_("Key for") + " " + h.toBase64() + " " + _("not found in keyring")); + addFormNotice(_t("Key for") + " " + h.toBase64() + " " + _t("not found in keyring")); } else { - addFormError(_("Invalid destination")); + addFormError(_t("Invalid destination")); } } } else { - //addFormError(_("Unsupported")); + //addFormError(_t("Unsupported")); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java index e98528a96..e902e9c72 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java @@ -79,7 +79,7 @@ public class ConfigLoggingHandler extends FormHandler { props.setProperty(_newLogClass, _newLogLevel); _context.logManager().setLimits(props); shouldSave = true; - addFormNotice(_("Log overrides updated")); + addFormNotice(_t("Log overrides updated")); } catch (IOException ioe) { // shouldn't ever happen (BAIS shouldnt cause an IOE) _context.logManager().getLog(ConfigLoggingHandler.class).error("Error reading from the props?", ioe); @@ -160,7 +160,7 @@ public class ConfigLoggingHandler extends FormHandler { boolean saved = _context.logManager().saveConfig(); if (saved) - addFormNotice(_("Log configuration saved")); + addFormNotice(_t("Log configuration saved")); else addFormError("Error saving the configuration (applied but not saved) - please see the error logs"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java index aa064e627..1a9354a2d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java @@ -42,9 +42,9 @@ public class ConfigLoggingHelper extends HelperBase { buf.append(prefix).append('=').append(level).append('\n'); } buf.append("
\n"); - buf.append("").append(_("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("
"); - buf.append("").append(_("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("
"); - buf.append("").append(_("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("\n"); + buf.append("").append(_t("Add additional logging statements above. Example: net.i2p.router.tunnel=WARN")).append("
"); + buf.append("").append(_t("Or put entries in the logger.config file. Example: logger.record.net.i2p.router.tunnel=WARN")).append("
"); + buf.append("").append(_t("Valid levels are DEBUG, INFO, WARN, ERROR, CRIT")).append("\n"); /**** // this is too big and ugly @@ -78,11 +78,11 @@ public class ConfigLoggingHelper extends HelperBase { buf.append("\n"); + buf.append('>').append(_t(l)).append("\n"); } if (showRemove) - buf.append(""); + buf.append(""); buf.append("\n"); return buf.toString(); } @@ -119,7 +119,7 @@ public class ConfigLoggingHelper extends HelperBase { StringBuilder buf = new StringBuilder(65536); buf.append("
" + _("ANONYMITY WARNING - Settings include 0-hop tunnels.") + "
" + _t("ANONYMITY WARNING - Settings include 0-hop tunnels.") + "
" + _("ANONYMITY WARNING - Settings include 1-hop tunnels.") + "
" + _t("ANONYMITY WARNING - Settings include 1-hop tunnels.") + "
" + _("PERFORMANCE WARNING - Settings include very long tunnels.") + "
" + _t("PERFORMANCE WARNING - Settings include very long tunnels.") + "
" + _("PERFORMANCE WARNING - Settings include high tunnel quantities.") + "
" + _t("PERFORMANCE WARNING - Settings include high tunnel quantities.") + "
\"Inbound\"  " + _("Inbound") + "\"Outbound  " + _("Outbound") + "
\"Inbound\"  " + _t("Inbound") + "\"Outbound  " + _t("Outbound") + "
InboundOutbound
" + _("Length") + ":
" + _t("Length") + ":
" + _("Randomization") + ":
" + _t("Randomization") + ":
" + _("Quantity") + ":
" + _t("Quantity") + ":
" + _("Backup quantity") + ":
" + _t("Backup quantity") + ":
" + _("Inbound options") + ":
" + _t("Inbound options") + ":" + _("Outbound options") + ":
" + _t("Outbound options") + ":" + - _("Refresh the page to view.") + + _t("Refresh the page to view.") + ""); if (oldForceMobileConsole != _forceMobileConsole) - addFormNoticeNoEscape(_("Mobile console option saved.") + + addFormNoticeNoEscape(_t("Mobile console option saved.") + " " + - _("Refresh the page to view.") + + _t("Refresh the page to view.") + ""); } else { - addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs.")); + addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs.")); } } private void addUser() { String name = getJettyString("name"); if (name == null || name.length() <= 0) { - addFormError(_("No user name entered")); + addFormError(_t("No user name entered")); return; } String pw = getJettyString("nofilter_pw"); if (pw == null || pw.length() <= 0) { - addFormError(_("No password entered")); + addFormError(_t("No password entered")); return; } ConsolePasswordManager mgr = new ConsolePasswordManager(_context); @@ -90,10 +90,10 @@ public class ConfigUIHandler extends FormHandler { if (mgr.saveMD5(RouterConsoleRunner.PROP_CONSOLE_PW, RouterConsoleRunner.JETTY_REALM, name, pw)) { if (!_context.getBooleanProperty(RouterConsoleRunner.PROP_PW_ENABLE)) _context.router().saveConfig(RouterConsoleRunner.PROP_PW_ENABLE, "true"); - addFormNotice(_("Added user {0}", name)); - addFormError(_("Restart required to take effect")); + addFormNotice(_t("Added user {0}", name)); + addFormError(_t("Restart required to take effect")); } else { - addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs.")); + addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs.")); } } @@ -108,13 +108,13 @@ public class ConfigUIHandler extends FormHandler { continue; k = k.substring(7); if (mgr.remove(RouterConsoleRunner.PROP_CONSOLE_PW, k)) { - addFormNotice(_("Removed user {0}", k)); + addFormNotice(_t("Removed user {0}", k)); success = true; } else { - addFormError(_("Error saving the configuration (applied but not saved) - please see the error logs.")); + addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs.")); } } if (success) - addFormError(_("Restart required to take effect")); + addFormError(_t("Restart required to take effect")); } } 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 294cc6dc0..1432de98b 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -15,14 +15,14 @@ public class ConfigUIHelper extends HelperBase { buf.append("").append(_(theme)).append("
\n"); + buf.append("value=\"").append(theme).append("\">").append(_t(theme)).append("
\n"); } boolean universalTheming = _context.getBooleanProperty(CSSHelper.PROP_UNIVERSAL_THEMING); buf.append("") - .append(_("Set theme universally across all apps")) + .append(_t("Set theme universally across all apps")) .append("
\n"); return buf.toString(); } @@ -34,7 +34,7 @@ public class ConfigUIHelper extends HelperBase { if (forceMobileConsole) buf.append("checked=\"checked\" "); buf.append("value=\"1\">") - .append(_("Force the mobile console to be used")) + .append(_t("Force the mobile console to be used")) .append("
\n"); return buf.toString(); } @@ -163,13 +163,13 @@ public class ConfigUIHelper extends HelperBase { buf.append(""); if (userpw.isEmpty()) { buf.append(""); } else { buf.append("\n"); for (String name : userpw.keySet()) { buf.append("" + "
"); - buf.append(_("Add a user and password to enable.")); + buf.append(_t("Add a user and password to enable.")); buf.append("
") - .append(_("Remove")) + .append(_t("Remove")) .append("") - .append(_("User Name")) + .append(_t("User Name")) .append(" 
") - .append(_("Add")).append(":" + + .append(_t("Add")).append(":" + "" + ""); - buf.append(_("Password")).append(": " + + buf.append(_t("Password")).append(": " + "
\n"); return buf.toString(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index 7f8c75dfd..744d99683 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -157,14 +157,14 @@ public class ConfigUpdateHandler extends FormHandler { protected void processForm() { if (_action == null) return; - if (_action.equals(_("Check for updates"))) { + if (_action.equals(_t("Check for updates"))) { ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context); if (mgr == null) { addFormError("Update manager not registered, cannot check"); return; } if (mgr.isUpdateInProgress() || mgr.isCheckInProgress()) { - addFormError(_("Update or check already in progress")); + addFormError(_t("Update or check already in progress")); return; } @@ -174,7 +174,7 @@ public class ConfigUpdateHandler extends FormHandler { if (shouldProxy && proxyPort == ConfigUpdateHandler.DEFAULT_PROXY_PORT_INT && proxyHost.equals(ConfigUpdateHandler.DEFAULT_PROXY_HOST) && _context.portMapper().getPort(PortMapper.SVC_HTTP_PROXY) < 0) { - addFormError(_("HTTP client proxy tunnel must be running")); + addFormError(_t("HTTP client proxy tunnel must be running")); return; } @@ -187,19 +187,19 @@ public class ConfigUpdateHandler extends FormHandler { a3 = mgr.checkAvailable(ROUTER_UNSIGNED, 40*1000) != null; if (a1 || a2 || a3) { if ( (_updatePolicy == null) || (!_updatePolicy.equals("notify")) ) - addFormNotice(_("Update available, attempting to download now")); + addFormNotice(_t("Update available, attempting to download now")); else - addFormNotice(_("Update available, click button on left to download")); + addFormNotice(_t("Update available, click button on left to download")); // So that update() will post a status to the summary bar before we reload try { Thread.sleep(1000); } catch (InterruptedException ie) {} } else - addFormNotice(_("No update available")); + addFormNotice(_t("No update available")); return; } - if (!_action.equals(_("Save"))) + if (!_action.equals(_t("Save"))) return; Map changes = new HashMap(); @@ -213,26 +213,26 @@ public class ConfigUpdateHandler extends FormHandler { changes.put(PROP_NEWS_URL, _newsURL); // this invalidates the news changes.put(NewsHelper.PROP_LAST_CHECKED, "0"); - addFormNotice(_("Updating news URL to {0}", _newsURL)); + addFormNotice(_t("Updating news URL to {0}", _newsURL)); } else { addFormError("Changing news URL disabled"); } } } - if (_proxyHost != null && _proxyHost.length() > 0 && !_proxyHost.equals(_("internal"))) { + if (_proxyHost != null && _proxyHost.length() > 0 && !_proxyHost.equals(_t("internal"))) { String oldHost = _context.router().getConfigSetting(PROP_PROXY_HOST); if ( (oldHost == null) || (!_proxyHost.equals(oldHost)) ) { changes.put(PROP_PROXY_HOST, _proxyHost); - addFormNotice(_("Updating proxy host to {0}", _proxyHost)); + addFormNotice(_t("Updating proxy host to {0}", _proxyHost)); } } - if (_proxyPort != null && _proxyPort.length() > 0 && !_proxyPort.equals(_("internal"))) { + if (_proxyPort != null && _proxyPort.length() > 0 && !_proxyPort.equals(_t("internal"))) { String oldPort = _context.router().getConfigSetting(PROP_PROXY_PORT); if ( (oldPort == null) || (!_proxyPort.equals(oldPort)) ) { changes.put(PROP_PROXY_PORT, _proxyPort); - addFormNotice(_("Updating proxy port to {0}", _proxyPort)); + addFormNotice(_t("Updating proxy port to {0}", _proxyPort)); } } @@ -248,15 +248,15 @@ public class ConfigUpdateHandler extends FormHandler { try { oldFreq = Long.parseLong(oldFreqStr); } catch (NumberFormatException nfe) {} if (_refreshFrequency != oldFreq) { changes.put(PROP_REFRESH_FREQUENCY, ""+_refreshFrequency); - addFormNoticeNoEscape(_("Updating refresh frequency to {0}", - _refreshFrequency <= 0 ? _("Never") : DataHelper.formatDuration2(_refreshFrequency))); + addFormNoticeNoEscape(_t("Updating refresh frequency to {0}", + _refreshFrequency <= 0 ? _t("Never") : DataHelper.formatDuration2(_refreshFrequency))); } if ( (_updatePolicy != null) && (_updatePolicy.length() > 0) ) { String oldPolicy = _context.router().getConfigSetting(PROP_UPDATE_POLICY); if ( (oldPolicy == null) || (!_updatePolicy.equals(oldPolicy)) ) { changes.put(PROP_UPDATE_POLICY, _updatePolicy); - addFormNotice(_("Updating update policy to {0}", _updatePolicy)); + addFormNotice(_t("Updating update policy to {0}", _updatePolicy)); } } @@ -265,7 +265,7 @@ public class ConfigUpdateHandler extends FormHandler { String oldURL = _context.router().getConfigSetting(PROP_UPDATE_URL); if ( (oldURL == null) || (!_updateURL.equals(oldURL)) ) { changes.put(PROP_UPDATE_URL, _updateURL); - addFormNotice(_("Updating update URLs.")); + addFormNotice(_t("Updating update URLs.")); } } @@ -277,7 +277,7 @@ public class ConfigUpdateHandler extends FormHandler { // note that keys are not validated here and no console error message will be generated if (isAdvanced()) { changes.put(PROP_TRUSTED_KEYS, _trustedKeys); - addFormNotice(_("Updating trusted keys.")); + addFormNotice(_t("Updating trusted keys.")); } else { addFormError("Changing trusted keys disabled"); } @@ -289,7 +289,7 @@ public class ConfigUpdateHandler extends FormHandler { if ( (oldURL == null) || (!_zipURL.equals(oldURL)) ) { if (isAdvanced()) { changes.put(PROP_ZIP_URL, _zipURL); - addFormNotice(_("Updating unsigned update URL to {0}", _zipURL)); + addFormNotice(_t("Updating unsigned update URL to {0}", _zipURL)); } else { addFormError("Changing unsigned update URL disabled"); } @@ -301,7 +301,7 @@ public class ConfigUpdateHandler extends FormHandler { if ( (oldURL == null) || (!_devSU3URL.equals(oldURL)) ) { if (isAdvanced()) { changes.put(PROP_DEV_SU3_URL, _devSU3URL); - addFormNotice(_("Updating signed development build URL to {0}", _devSU3URL)); + addFormNotice(_t("Updating signed development build URL to {0}", _devSU3URL)); } else { addFormError("Changing signed update URL disabled"); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java index 3df84ceb5..93644982f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java @@ -51,13 +51,13 @@ public class ConfigUpdateHelper extends HelperBase { public String getProxyHost() { if (isInternal()) - return _("internal") + "\" readonly=\"readonly"; + return _t("internal") + "\" readonly=\"readonly"; return _context.getProperty(ConfigUpdateHandler.PROP_PROXY_HOST, ConfigUpdateHandler.DEFAULT_PROXY_HOST); } public String getProxyPort() { if (isInternal()) - return _("internal") + "\" readonly=\"readonly"; + return _t("internal") + "\" readonly=\"readonly"; return Integer.toString(ConfigUpdateHandler.proxyPort(_context)); } @@ -127,9 +127,9 @@ public class ConfigUpdateHelper extends HelperBase { buf.append("\" selected=\"selected"); if (PERIODS[i] == -1) - buf.append("\">").append(_("Never")).append("\n"); + buf.append("\">").append(_t("Never")).append("\n"); else - buf.append("\">").append(_("Every")).append(' ').append(DataHelper.formatDuration2(PERIODS[i])).append("\n"); + buf.append("\">").append(_t("Every")).append(' ').append(DataHelper.formatDuration2(PERIODS[i])).append("\n"); } buf.append("\n"); return buf.toString(); @@ -147,14 +147,14 @@ public class ConfigUpdateHelper extends HelperBase { buf.append(""); + buf.append('>').append(_t("Notify only")).append(""); buf.append(""); + buf.append('>').append(_t("Download and verify only")).append(""); if (_context.hasWrapper()) { buf.append(""); + buf.append('>').append(_t("Download, verify, and restart")).append(""); } buf.append("\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java index 492c006e2..f42e1cd6e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java @@ -66,7 +66,7 @@ public class EventLogHelper extends FormHandler { public void setContextId(String contextId) { super.setContextId(contextId); for (int i = 0; i < _events.length; i += 2) { - _xevents.put(_events[i], _(_events[i + 1])); + _xevents.put(_events[i], _t(_events[i + 1])); } } @@ -99,27 +99,27 @@ public class EventLogHelper extends FormHandler { // So just use the "shared/console nonce". String nonce = CSSHelper.getNonce(); try { - _out.write("

" + _("Display Events") + "

"); + _out.write("

" + _t("Display Events") + "

"); _out.write("
\n" + "\n" + "\n"); - _out.write(_("Events since") + ": "); for (int i = 0; i < _times.length; i++) { writeOption(_times[i]); } _out.write("
"); - _out.write(_("Event type") + ": "); // sorted by translated display string Map events = new TreeMap(Collator.getInstance()); for (int i = 0; i < _events.length; i += 2) { events.put(_xevents.get(_events[i]), _events[i]); } - writeOption(_("All events"), ALL); + writeOption(_t("All events"), ALL); for (Map.Entry e : events.entrySet()) { writeOption(e.getKey(), e.getValue()); } _out.write("" + - "
"); + "
"); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -145,7 +145,7 @@ public class EventLogHelper extends FormHandler { _out.write(" selected=\"selected\""); _out.write(">"); if (age == 0) - _out.write(_("All events")); + _out.write(_t("All events")); else _out.write(DataHelper.formatDuration2(age)); _out.write("\n"); @@ -167,21 +167,21 @@ public class EventLogHelper extends FormHandler { if (events.isEmpty()) { if (isAll) { if (_age == 0) - return _("No events found"); - return _("No events found in previous {0}", DataHelper.formatDuration2(_age)); + return _t("No events found"); + return _t("No events found in previous {0}", DataHelper.formatDuration2(_age)); } if (_age == 0) - return _("No \"{0}\" events found", xev); - return _("No \"{0}\" events found in previous {1}", xev, DataHelper.formatDuration2(_age)); + return _t("No \"{0}\" events found", xev); + return _t("No \"{0}\" events found in previous {1}", xev, DataHelper.formatDuration2(_age)); } StringBuilder buf = new StringBuilder(2048); buf.append("
"); - buf.append(_("Time")); + buf.append(_t("Time")); buf.append(""); if (isAll) { - buf.append(_("Event")); + buf.append(_t("Event")); buf.append(""); - buf.append(_("Details")); + buf.append(_t("Details")); } else { buf.append(xev); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java index a56f8f7ad..1b2dabb3a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java @@ -248,9 +248,9 @@ public abstract class FormHandler { } if (!_nonce.equals(_nonce1) && !_nonce.equals(_nonce2)) { - addFormError(_("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.") + addFormError(_t("Invalid form submission, probably because you used the 'back' or 'reload' button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser.")); + _t("If the problem persists, verify that you have cookies enabled in your browser.")); _valid = false; } } @@ -291,28 +291,28 @@ public abstract class FormHandler { } /** translate a string */ - public String _(String s) { + public String _t(String s) { return Messages.getString(s, _context); } /** * translate a string with a parameter - * This is a lot more expensive than _(s), so use sparingly. + * This is a lot more expensive than _t(s), 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("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) { + public String _t(String s, Object o) { return Messages.getString(s, o, _context); } /** two params @since 0.8.2 */ - public String _(String s, Object o, Object o2) { + public String _t(String s, Object o, Object o2) { return Messages.getString(s, o, o2, _context); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java index eff8dc3e3..ab35a104a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java @@ -159,7 +159,7 @@ public class GraphHelper extends FormHandler { + "&w=" + (3 * _width) + "&h=" + (3 * _height) + "\">"); - String title = _("Combined bandwidth graph"); + String title = _t("Combined bandwidth graph"); _out.write("" + _("All times are UTC.") + "

\n"); + //_out.write("

" + _t("All times are UTC.") + "

\n"); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -220,7 +220,7 @@ public class GraphHelper extends FormHandler { if (_stat.equals("bw.combined")) { period = 60000; name = _stat; - displayName = _("Bandwidth usage"); + displayName = _t("Bandwidth usage"); } else { Set rates = StatSummarizer.instance().parseSpecs(_stat); if (rates.size() != 1) { @@ -233,9 +233,9 @@ public class GraphHelper extends FormHandler { displayName = name; } _out.write("

"); - _out.write(_("{0} for {1}", displayName, DataHelper.formatDuration2(_periodCount * period))); + _out.write(_t("{0} for {1}", displayName, DataHelper.formatDuration2(_periodCount * period))); if (_end > 0) - _out.write(' ' + _("ending {0} ago", DataHelper.formatDuration2(_end * period))); + _out.write(' ' + _t("ending {0} ago", DataHelper.formatDuration2(_end * period))); _out.write("

- "); } if (_width > MIN_X && _height > MIN_Y) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 2 / 3, _height * 2 / 3)); - _out.write(_("Smaller")); + _out.write(_t("Smaller")); _out.write(" - "); } if (_height < MAX_Y) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width, _height * 3 / 2)); - _out.write(_("Taller")); + _out.write(_t("Taller")); _out.write(" - "); } if (_height > MIN_Y) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width, _height * 2 / 3)); - _out.write(_("Shorter")); + _out.write(_t("Shorter")); _out.write(" - "); } if (_width < MAX_X) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 3 / 2, _height)); - _out.write(_("Wider")); + _out.write(_t("Wider")); _out.write(" - "); } if (_width > MIN_X) { _out.write(link(_stat, _showEvents, _periodCount, _end, _width * 2 / 3, _height)); - _out.write(_("Narrower")); + _out.write(_t("Narrower")); _out.write(""); } _out.write("
"); if (_periodCount < MAX_C) { _out.write(link(_stat, _showEvents, _periodCount * 2, _end, _width, _height)); - _out.write(_("Larger interval")); + _out.write(_t("Larger interval")); _out.write(" - "); } if (_periodCount > MIN_C) { _out.write(link(_stat, _showEvents, _periodCount / 2, _end, _width, _height)); - _out.write(_("Smaller interval")); + _out.write(_t("Smaller interval")); _out.write(""); } _out.write("
"); if (_periodCount < MAX_C) { _out.write(link(_stat, _showEvents, _periodCount, _end + _periodCount, _width, _height)); - _out.write(_("Previous interval")); + _out.write(_t("Previous interval")); _out.write(""); } @@ -311,17 +311,17 @@ public class GraphHelper extends FormHandler { if (_periodCount < MAX_C) _out.write(" - "); _out.write(link(_stat, _showEvents, _periodCount, end, _width, _height)); - _out.write(_("Next interval")); + _out.write(_t("Next interval")); _out.write(" "); } _out.write("
"); _out.write(link(_stat, !_showEvents, _periodCount, _end, _width, _height)); if (!_stat.equals("bw.combined")) - _out.write(_showEvents ? _("Plot averages") : _("plot events")); + _out.write(_showEvents ? _t("Plot averages") : _t("plot events")); _out.write(""); - _out.write("

" + _("All times are UTC.") + "

\n"); + _out.write("

" + _t("All times are UTC.") + "

\n"); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -353,17 +353,17 @@ public class GraphHelper extends FormHandler { // So just use the "shared/console nonce". String nonce = CSSHelper.getNonce(); try { - _out.write("

" + _("Configure Graph Display") + " [" + _("Select Stats") + "]

"); + _out.write("

" + _t("Configure Graph Display") + " [" + _t("Select Stats") + "]

"); _out.write("
\n" + "\n" + "\n"); - _out.write(_("Periods") + ":
\n"); - _out.write(_("Plot averages") + ": "); - _out.write(_("or")+ " " +_("plot events") + ":
\n"); - _out.write(_("Image sizes") + ": " + _("width") + ": " + _("pixels") + ", " + _("height") + ": " + _("pixels") + "
\n"); - _out.write(_("Refresh delay") + ":
\n"); + _out.write(_t("Plot averages") + ": "); + _out.write(_t("or")+ " " +_t("plot events") + ":
\n"); + _out.write(_t("Image sizes") + ": " + _t("width") + ": " + _t("pixels") + ", " + _t("height") + ": " + _t("pixels") + "
\n"); + _out.write(_t("Refresh delay") + ":
\n" + - _("Store graph data on disk?") + + _t("Store graph data on disk?") + " " + - "
"); + "
"); } catch (IOException ioe) { ioe.printStackTrace(); } @@ -440,7 +440,7 @@ public class GraphHelper extends FormHandler { changes.put(PROP_EVENTS, "" + _showEvents); changes.put(SummaryListener.PROP_PERSISTENT, "" + _persistent); _context.router().saveConfig(changes, null); - addFormNotice(_("Graph settings saved")); + addFormNotice(_t("Graph settings saved")); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java index ff0dc8059..1c14848dc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java @@ -44,28 +44,28 @@ public abstract class HelperBase { public void storeWriter(Writer out) { _out = out; } /** translate a string */ - public String _(String s) { + public String _t(String s) { return Messages.getString(s, _context); } /** * translate a string with a parameter - * This is a lot more expensive than _(s), so use sparingly. + * This is a lot more expensive than _t(s), 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("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) { + public String _t(String s, Object o) { return Messages.getString(s, o, _context); } /** two params @since 0.7.14 */ - public String _(String s, Object o, Object o2) { + public String _t(String s, Object o, Object o2) { return Messages.getString(s, o, o2, _context); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 8f2b48266..d9a8de301 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -105,9 +105,9 @@ public class HomeHelper extends HelperBase { public String getProxyStatus() { int port = _context.portMapper().getPort(PortMapper.SVC_HTTP_PROXY); if (port <= 0) - return _("The HTTP proxy is not up"); + return _t("The HTTP proxy is not up"); return "\"""; } @@ -168,7 +168,7 @@ public class HomeHelper extends HelperBase { } private String renderApps(Collection apps) { - String website = _("Website"); + String website = _t("Website"); StringBuilder buf = new StringBuilder(1024); buf.append("
"); for (App app : apps) { @@ -205,11 +205,11 @@ public class HomeHelper extends HelperBase { private String renderConfig(Collection apps) { StringBuilder buf = new StringBuilder(1024); buf.append("\n"); for (App app : apps) { buf.append("\n"); } buf.append("" + ""); buf.append("
") - .append(_("Remove")) + .append(_t("Remove")) .append("") - .append(_("Name")) + .append(_t("Name")) .append("") - .append(_("URL")) + .append(_t("URL")) .append("
") - .append(_("Add")).append(":" + + .append(_t("Add")).append(":" + "
\n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java index e6dc09a20..7bc28287f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java @@ -47,29 +47,29 @@ public class JobQueueHelper extends HelperBase { int numRunners = _context.jobQueue().getJobs(readyJobs, timedJobs, activeJobs, justFinishedJobs); StringBuilder buf = new StringBuilder(32*1024); - buf.append("

").append(_("I2P Job Queue")).append("


") - .append(_("Job runners")).append(": ").append(numRunners) + buf.append("

").append(_t("I2P Job Queue")).append("


") + .append(_t("Job runners")).append(": ").append(numRunners) .append("
\n"); long now = _context.clock().now(); - buf.append("
").append(_("Active jobs")).append(": ").append(activeJobs.size()).append("
    \n"); + buf.append("
    ").append(_t("Active jobs")).append(": ").append(activeJobs.size()).append("
      \n"); for (int i = 0; i < activeJobs.size(); i++) { Job j = activeJobs.get(i); - buf.append("
    1. (").append(_("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): "); + buf.append("
    2. (").append(_t("started {0} ago", DataHelper.formatDuration2(now-j.getTiming().getStartAfter()))).append("): "); buf.append(j.toString()).append("
      3. \n"); } buf.append("
    \n"); - buf.append("
    ").append(_("Just finished jobs")).append(": ").append(justFinishedJobs.size()).append("
      \n"); + buf.append("
      ").append(_t("Just finished jobs")).append(": ").append(justFinishedJobs.size()).append("
        \n"); for (int i = 0; i < justFinishedJobs.size(); i++) { Job j = justFinishedJobs.get(i); - buf.append("
      1. (").append(_("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): "); + buf.append("
      2. (").append(_t("finished {0} ago", DataHelper.formatDuration2(now-j.getTiming().getActualEnd()))).append("): "); buf.append(j.toString()).append("
        3. \n"); } buf.append("
      \n"); - buf.append("
      ").append(_("Ready/waiting jobs")).append(": ").append(readyJobs.size()).append("
        \n"); + buf.append("
        ").append(_t("Ready/waiting jobs")).append(": ").append(readyJobs.size()).append("
          \n"); ObjectCounter counter = new ObjectCounter(); for (int i = 0; i < readyJobs.size(); i++) { Job j = readyJobs.get(i); @@ -86,7 +86,7 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
          ").append(_("Scheduled jobs")).append(": ").append(timedJobs.size()).append("
            \n"); + buf.append("
            ").append(_t("Scheduled jobs")).append(": ").append(timedJobs.size()).append("
              \n"); long prev = Long.MIN_VALUE; counter.clear(); for (int i = 0; i < timedJobs.size(); i++) { @@ -96,7 +96,7 @@ public class JobQueueHelper extends HelperBase { continue; long time = j.getTiming().getStartAfter() - now; // translators: {0} is a job name, {1} is a time, e.g. 6 min - buf.append("
            1. ").append(_("{0} will start in {1}", j.getName(), DataHelper.formatDuration2(time))); + buf.append("
            2. ").append(_t("{0} will start in {1}", j.getName(), DataHelper.formatDuration2(time))); // debug, don't bother translating if (time < 0) buf.append(" DELAYED"); @@ -110,7 +110,7 @@ public class JobQueueHelper extends HelperBase { out.write(buf.toString()); buf.setLength(0); - buf.append("
              ").append(_("Total Job Statistics")).append("\n"); + buf.append("
              ").append(_t("Total Job Statistics")).append("\n"); getJobStats(buf); out.write(buf.toString()); } @@ -121,7 +121,7 @@ public class JobQueueHelper extends HelperBase { if (names.size() < 4) return; buf.append("\n" + - "
              ").append(_("Job")).append("").append(_("Queued")).append(""); + "
              ").append(_t("Job")).append("").append(_t("Queued")).append(""); Collections.sort(names, new JobCountComparator(counter)); for (String name : names) { buf.append("
              ").append(name) @@ -138,12 +138,12 @@ public class JobQueueHelper extends HelperBase { */ private void getJobStats(StringBuilder buf) { buf.append("\n" + - "" + - "" + - "" + - "\n"); + "" + + "" + + "" + + "\n"); long totRuns = 0; long totDropped = 0; long totExecTime = 0; @@ -194,7 +194,7 @@ public class JobQueueHelper extends HelperBase { } buf.append(""); - buf.append(""); + buf.append(""); buf.append(""); buf.append(""); buf.append(""); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java index e3845df9d..dbed0c82e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -46,7 +46,7 @@ public class LogsHelper extends HelperBase { */ public String getLogs() { String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); - return "

              " + _("File location") + ": " + _context.logManager().currentFile() + "

              " + str; + return "

              " + _t("File location") + ": " + _context.logManager().currentFile() + "

              " + str; } /** @@ -97,10 +97,10 @@ public class LogsHelper extends HelperBase { str = FileUtil.readTextFile(f.getAbsolutePath(), 250, false); } if (str == null) { - return "

              " + _("File not found") + ": " + f.getAbsolutePath() + "

              "; + return "

              " + _t("File not found") + ": " + f.getAbsolutePath() + "

              "; } else { str = str.replace("&", "&").replace("<", "<").replace(">", ">"); - return "

              " + _("File location") + ": " + f.getAbsolutePath() + "

              " + str + "
              "; + return "

              " + _t("File location") + ": " + f.getAbsolutePath() + "

              " + str + "
              "; } } @@ -115,7 +115,7 @@ public class LogsHelper extends HelperBase { /** formats in reverse order */ private String formatMessages(List msgs) { if (msgs.isEmpty()) - return "

              " + _("No log messages") + "

              "; + return "

              " + _t("No log messages") + "

              "; boolean colorize = _context.getBooleanPropertyDefaultTrue("routerconsole.logs.color"); StringBuilder buf = new StringBuilder(16*1024); buf.append("
                "); @@ -138,13 +138,13 @@ public class LogsHelper extends HelperBase { // Homeland Security Advisory System // http://www.dhs.gov/xinfoshare/programs/Copy_of_press_release_0046.shtm // but pink instead of yellow for WARN - if (msg.contains(_("CRIT"))) + if (msg.contains(_t("CRIT"))) color = "#cc0000"; - else if (msg.contains(_("ERROR"))) + else if (msg.contains(_t("ERROR"))) color = "#ff3300"; - else if (msg.contains(_("WARN"))) + else if (msg.contains(_t("WARN"))) color = "#ff00cc"; - else if (msg.contains(_("INFO"))) + else if (msg.contains(_t("INFO"))) color = "#000099"; else color = "#006600"; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java index c76f260e8..e138c0ffd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/Messages.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/Messages.java @@ -24,7 +24,7 @@ public class Messages extends Translate { * 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. * Use autoboxing to call with ints, longs, floats, etc. */ 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 496f49ac1..808297fb5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java @@ -125,12 +125,12 @@ public class NetDbHelper extends HelperBase { // we are there if (span) buf.append(""); - buf.append(_(titles[i])); + buf.append(_t(titles[i])); } else { // we are not there, make a link if (span) buf.append(""); - buf.append("").append(_(titles[i])).append(""); + buf.append("").append(_t(titles[i])).append(""); } if (span) buf.append(" \n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 89b4a7000..e0340f68a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -102,14 +102,14 @@ public class NetDbRenderer { } } if (notFound) { - buf.append(_("Router")).append(' '); + buf.append(_t("Router")).append(' '); if (routerPrefix != null) buf.append(routerPrefix); else if (version != null) buf.append(version); else if (country != null) buf.append(country); - buf.append(' ').append(_("not found in network database")); + buf.append(' ').append(_t("not found in network database")); } } out.write(buf.toString()); @@ -153,12 +153,12 @@ public class NetDbRenderer { for (LeaseSet ls : leases) { Destination dest = ls.getDestination(); Hash key = dest.calculateHash(); - buf.append("").append(_("LeaseSet")).append(": ").append(key.toBase64()).append("\n"); + buf.append("").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("\n"); if (_context.clientManager().isLocal(dest)) { - buf.append(" (" + _("Local") + " "); + buf.append(" (" + _t("Local") + " "); if (! _context.clientManager().shouldPublishLeaseSet(key)) - buf.append(_("Unpublished") + ' '); - buf.append(_("Destination") + ' '); + buf.append(_t("Unpublished") + ' '); + buf.append(_t("Destination") + ' '); TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(key); if (in != null && in.getDestinationNickname() != null) buf.append(in.getDestinationNickname()); @@ -170,10 +170,10 @@ public class NetDbRenderer { String host = _context.namingService().reverseLookup(dest); if (host == null) { buf.append("").append(_("Add to local addressbook")).append("
                \n"); + .append(dest.toBase64()).append("#add\">").append(_t("Add to local addressbook")).append("
                \n"); } } else { - buf.append(" (").append(_("Destination")).append(' '); + buf.append(" (").append(_t("Destination")).append(' '); String host = _context.namingService().reverseLookup(dest); if (host != null) { buf.append("").append(host).append(")
                \n"); @@ -182,14 +182,14 @@ public class NetDbRenderer { buf.append(dest.toBase64().substring(0, 6)).append(")
                \n" + "").append(b32).append("
                \n" + "").append(_("Add to local addressbook")).append("
                \n"); + .append(dest.toBase64()).append("#add\">").append(_t("Add to local addressbook")).append("
                \n"); } } long exp = ls.getLatestLeaseDate()-now; if (exp > 0) - buf.append(_("Expires in {0}", DataHelper.formatDuration2(exp))); + buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exp))); else - buf.append(_("Expired {0} ago", DataHelper.formatDuration2(0-exp))); + buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exp))); buf.append("
                \n"); if (debug) { buf.append("RAP? " + ls.getReceivedAsPublished()); @@ -208,15 +208,15 @@ public class NetDbRenderer { } for (int i = 0; i < ls.getLeaseCount(); i++) { Lease lease = ls.getLease(i); - buf.append(_("Lease")).append(' ').append(i + 1).append(": ").append(_("Gateway")).append(' '); + buf.append(_t("Lease")).append(' ').append(i + 1).append(": ").append(_t("Gateway")).append(' '); buf.append(_context.commSystem().renderPeerHTML(lease.getGateway())); - buf.append(' ').append(_("Tunnel")).append(' ').append(lease.getTunnelId().getTunnelId()).append(' '); + buf.append(' ').append(_t("Tunnel")).append(' ').append(lease.getTunnelId().getTunnelId()).append(' '); if (debug) { long exl = lease.getEndDate().getTime() - now; if (exl > 0) - buf.append(_("Expires in {0}", DataHelper.formatDuration2(exl))); + buf.append(_t("Expires in {0}", DataHelper.formatDuration2(exl))); else - buf.append(_("Expired {0} ago", DataHelper.formatDuration2(0-exl))); + buf.append(_t("Expired {0} ago", DataHelper.formatDuration2(0-exl))); } buf.append("
                \n"); } @@ -277,7 +277,7 @@ public class NetDbRenderer { */ public void renderStatusHTML(Writer out, int mode) throws IOException { if (!_context.netDb().isInitialized()) { - out.write(_("Not initialized")); + out.write(_t("Not initialized")); out.flush(); return; } @@ -327,14 +327,14 @@ public class NetDbRenderer { // the summary table buf.append("
              ").append(_("Job")).append("").append(_("Runs")).append("").append(_("Dropped")).append("").append(_("Time")).append("").append(_("Avg")).append("") - .append(_("Max")).append("").append(_("Min")).append("").append(_("Pending")).append("").append(_("Avg")).append("") - .append(_("Max")).append("").append(_("Min")).append("
              ").append(_t("Job")).append("").append(_t("Runs")).append("").append(_t("Dropped")).append("").append(_t("Time")).append("").append(_t("Avg")).append("") + .append(_t("Max")).append("").append(_t("Min")).append("").append(_t("Pending")).append("").append(_t("Avg")).append("") + .append(_t("Max")).append("").append(_t("Min")).append("
              ").append(_("Summary")).append("").append(_t("Summary")).append("").append(totRuns).append("").append(totDropped).append("").append(DataHelper.formatDuration2(totExecTime)).append("
              ") - .append(_("Network Database Router Statistics")) + .append(_t("Network Database Router Statistics")) .append("
              "); // versions table List versionList = new ArrayList(versions.objects()); if (!versionList.isEmpty()) { Collections.sort(versionList, Collections.reverseOrder(new VersionComparator())); buf.append("\n"); - buf.append("\n"); + buf.append("\n"); for (String routerVersion : versionList) { int num = versions.count(routerVersion); String ver = DataHelper.stripHTML(routerVersion); @@ -349,11 +349,11 @@ public class NetDbRenderer { // transports table buf.append("
              " + _("Version") + "" + _("Count") + "
              " + _t("Version") + "" + _t("Count") + "
              \n"); - buf.append("\n"); + buf.append("\n"); for (int i = 0; i < TNAMES.length; i++) { int num = transportCount[i]; if (num > 0) { - buf.append("\n"); } } @@ -367,7 +367,7 @@ public class NetDbRenderer { if (!countryList.isEmpty()) { Collections.sort(countryList, new CountryComparator()); buf.append("
              " + _("Transports") + "" + _("Count") + "
              " + _t("Transports") + "" + _t("Count") + "
              ").append(_(TNAMES[i])); + buf.append("
              ").append(_t(TNAMES[i])); buf.append("").append(num).append("
              \n"); - buf.append("\n"); + buf.append("\n"); for (String country : countryList) { int num = countries.count(country); buf.append("\n"); if (full) { - buf.append("
              " + _("Country") + "" + _("Count") + "
              " + _t("Country") + "" + _t("Count") + "
              \"").append(country.toUpperCase(Locale.US)).append("\"");
              "); if (isUs) { - buf.append("" + _("Our info") + ": ").append(hash).append("
              \n"); + buf.append("" + _t("Our info") + ": ").append(hash).append("
              \n"); } else { - buf.append("" + _("Peer info for") + ": ").append(hash).append("\n"); + buf.append("" + _t("Peer info for") + ": ").append(hash).append("\n"); if (!full) { - buf.append("[").append(_("Full entry")).append("]"); + buf.append("[").append(_t("Full entry")).append("]"); } buf.append("
              \n"); } long age = _context.clock().now() - info.getPublished(); if (isUs && _context.router().isHidden()) { - buf.append("").append(_("Hidden")).append(", ").append(_("Updated")).append(": ") - .append(_("{0} ago", DataHelper.formatDuration2(age))).append("
              \n"); + buf.append("").append(_t("Hidden")).append(", ").append(_t("Updated")).append(": ") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
              \n"); } else if (age > 0) { - buf.append("").append(_("Published")).append(": ") - .append(_("{0} ago", DataHelper.formatDuration2(age))).append("
              \n"); + buf.append("").append(_t("Published")).append(": ") + .append(_t("{0} ago", DataHelper.formatDuration2(age))).append("
              \n"); } else { // shouldnt happen - buf.append("" + _("Published") + ": in ").append(DataHelper.formatDuration2(0-age)).append("???
              \n"); + buf.append("" + _t("Published") + ": in ").append(DataHelper.formatDuration2(0-age)).append("???
              \n"); } - buf.append("").append(_("Signing Key")).append(": ") + buf.append("").append(_t("Signing Key")).append(": ") .append(info.getIdentity().getSigningPublicKey().getType().toString()); - buf.append("
              \n" + _("Address(es)") + ": "); + buf.append("
              \n" + _t("Address(es)") + ": "); String country = _context.commSystem().getCountry(info.getIdentity().getHash()); if(country != null) { buf.append("\"").append(country.toUpperCase(Locale.US)).append('\"');").append(DataHelper.stripHTML(style)).append(": "); int cost = addr.getCost(); if (!((style.equals("SSU") && cost == 5) || (style.equals("NTCP") && cost == 10))) - buf.append('[').append(_("cost")).append('=').append("" + cost).append("] "); + buf.append('[').append(_t("cost")).append('=').append("" + cost).append("] "); Map p = addr.getOptionsMap(); for (Map.Entry e : p.entrySet()) { String name = (String) e.getKey(); String val = (String) e.getValue(); - buf.append('[').append(_(DataHelper.stripHTML(name))).append('=').append(DataHelper.stripHTML(val)).append("] "); + buf.append('[').append(_t(DataHelper.stripHTML(name))).append('=').append(DataHelper.stripHTML(val)).append("] "); } } buf.append("
              " + _("Stats") + ":
              "); + buf.append("
              " + _t("Stats") + ":
              "); Map p = info.getOptionsMap(); for (Map.Entry e : p.entrySet()) { String key = (String) e.getKey(); @@ -514,7 +514,7 @@ public class NetDbRenderer { } /** translate a string */ - private String _(String s) { + private String _t(String s) { return Messages.getString(s, _context); } @@ -525,17 +525,17 @@ public class NetDbRenderer { /** * translate a string with a parameter - * This is a lot more expensive than _(s), so use sparingly. + * This is a lot more expensive than _t(s), 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. * Use autoboxing to call with ints, longs, floats, etc. */ - private String _(String s, Object o) { + private String _t(String s, Object o) { return Messages.getString(s, o, _context); } } 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 ef70b170a..2cb7e311f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java @@ -75,7 +75,7 @@ class ProfileOrganizerRenderer { //// if (mode < 2) { - //buf.append("

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

              \n

              "); + //buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); buf.append(ngettext("Showing 1 recent profile.", "Showing {0} recent profiles.", order.size())).append('\n'); if (older > 0) buf.append(ngettext("Hiding 1 older profile.", "Hiding {0} older profiles.", older)).append('\n'); @@ -84,12 +84,12 @@ class ProfileOrganizerRenderer { buf.append("

              "); buf.append(""); buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); buf.append(""); buf.append(""); int prevTier = 1; @@ -127,12 +127,12 @@ class ProfileOrganizerRenderer { buf.append(""); //buf.append("\n"); buf.append(""); // let's not build the whole page in memory (~500 bytes per peer) @@ -193,26 +193,26 @@ class ProfileOrganizerRenderer { //// } else { - //buf.append("

              ").append(_("Floodfill and Integrated Peers")) + //buf.append("

              ").append(_t("Floodfill and Integrated Peers")) // .append(" (").append(integratedPeers.size()).append(")

              \n"); buf.append("
              ").append(_("Peer")).append("").append(_("Groups (Caps)")).append("").append(_("Speed")).append("").append(_("Capacity")).append("").append(_("Integration")).append("").append(_("Status")).append("").append(_t("Peer")).append("").append(_t("Groups (Caps)")).append("").append(_t("Speed")).append("").append(_t("Capacity")).append("").append(_t("Integration")).append("").append(_t("Status")).append(" 
              "); switch (tier) { - case 1: buf.append(_("Fast, High Capacity")); break; - case 2: buf.append(_("High Capacity")); break; - case 3: buf.append(_("Standard")); break; - default: buf.append(_("Failing")); break; + case 1: buf.append(_t("Fast, High Capacity")); break; + case 2: buf.append(_t("High Capacity")); break; + case 3: buf.append(_t("Standard")); break; + default: buf.append(_t("Failing")); break; } - if (isIntegrated) buf.append(", ").append(_("Integrated")); + if (isIntegrated) buf.append(", ").append(_t("Integrated")); RouterInfo info = _context.netDb().lookupRouterInfoLocally(peer); if (info != null) { // prevent HTML injection in the caps and version @@ -163,9 +163,9 @@ class ProfileOrganizerRenderer { } buf.append("").append(num(prof.getIntegrationValue())); buf.append(""); - if (_context.banlist().isBanlisted(peer)) buf.append(_("Banned")); - if (prof.getIsFailing()) buf.append(' ').append(_("Failing")); - if (_context.commSystem().wasUnreachable(peer)) buf.append(' ').append(_("Unreachable")); + if (_context.banlist().isBanlisted(peer)) buf.append(_t("Banned")); + if (prof.getIsFailing()) buf.append(' ').append(_t("Failing")); + if (_context.commSystem().wasUnreachable(peer)) buf.append(' ').append(_t("Unreachable")); RateAverages ra = RateAverages.getTemp(); Rate failed = prof.getTunnelHistory().getFailedRate().getRate(30*60*1000); long fails = failed.computeAverages(ra, false).getTotalEventCount(); @@ -173,13 +173,13 @@ class ProfileOrganizerRenderer { Rate accepted = prof.getTunnelCreateResponseTime().getRate(30*60*1000); long total = fails + accepted.computeAverages(ra, false).getTotalEventCount(); if (total / fails <= 10) // hide if < 10% - buf.append(' ').append(fails).append('/').append(total).append(' ').append(_("Test Fails")); + buf.append(' ').append(fails).append('/').append(total).append(' ').append(_t("Test Fails")); } buf.append(" ").append(_("profile")).append(""); + // .append(peer.toBase64().substring(0,6)).append("\">").append(_t("profile")).append(""); buf.append("").append(_("profile")).append(""); + .append(peer.toBase64()).append("\">").append(_t("profile")).append(""); buf.append(" +-
              "); buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); - buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); + buf.append(""); buf.append(""); RateAverages ra = RateAverages.getTemp(); for (PeerProfile prof : order) { @@ -244,7 +244,7 @@ class ProfileOrganizerRenderer { buf.append(""); } else { for (int i = 0; i < 6; i++) - buf.append("\n"); } @@ -256,20 +256,20 @@ class ProfileOrganizerRenderer { } if (mode < 2) { - buf.append("

              ").append(_("Thresholds")).append("

              "); - buf.append("

              ").append(_("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())) - .append(" (").append(fast).append(' ').append(_("fast peers")).append(")
              "); - buf.append("").append(_("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())) - .append(" (").append(reliable).append(' ').append(_("high capacity peers")).append(")
              "); - buf.append("").append(_("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) - .append(" (").append(integrated).append(' ').append(_(" well integrated peers")).append(")

              "); - buf.append("

              ").append(_("Definitions")).append("

                "); - buf.append("
              • ").append(_("groups")).append(": ").append(_("as determined by the profile organizer")).append("
                • "); - buf.append("
              • ").append(_("caps")).append(": ").append(_("capabilities in the netDb, not used to determine profiles")).append("
                • "); - buf.append("
              • ").append(_("speed")).append(": ").append(_("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")).append("
                • "); - buf.append("
              • ").append(_("capacity")).append(": ").append(_("how many tunnels can we ask them to join in an hour?")).append("
                • "); - buf.append("
              • ").append(_("integration")).append(": ").append(_("how many new peers have they told us about lately?")).append("
                • "); - buf.append("
              • ").append(_("status")).append(": ").append(_("is the peer banned, or unreachable, or failing tunnel tests?")).append("
                • "); + buf.append("

                ").append(_t("Thresholds")).append("

                "); + buf.append("

                ").append(_t("Speed")).append(": ").append(num(_organizer.getSpeedThreshold())) + .append(" (").append(fast).append(' ').append(_t("fast peers")).append(")
                "); + buf.append("").append(_t("Capacity")).append(": ").append(num(_organizer.getCapacityThreshold())) + .append(" (").append(reliable).append(' ').append(_t("high capacity peers")).append(")
                "); + buf.append("").append(_t("Integration")).append(": ").append(num(_organizer.getIntegrationThreshold())) + .append(" (").append(integrated).append(' ').append(_t(" well integrated peers")).append(")

                "); + buf.append("

                ").append(_t("Definitions")).append("

                  "); + buf.append("
                • ").append(_t("groups")).append(": ").append(_t("as determined by the profile organizer")).append("
                  • "); + buf.append("
                • ").append(_t("caps")).append(": ").append(_t("capabilities in the netDb, not used to determine profiles")).append("
                  • "); + buf.append("
                • ").append(_t("speed")).append(": ").append(_t("peak throughput (bytes per second) over a 1 minute period that the peer has sustained in a single tunnel")).append("
                  • "); + buf.append("
                • ").append(_t("capacity")).append(": ").append(_t("how many tunnels can we ask them to join in an hour?")).append("
                  • "); + buf.append("
                • ").append(_t("integration")).append(": ").append(_t("how many new peers have they told us about lately?")).append("
                  • "); + buf.append("
                • ").append(_t("status")).append(": ").append(_t("is the peer banned, or unreachable, or failing tunnel tests?")).append("
                  • "); buf.append("
                "); //// @@ -336,13 +336,13 @@ class ProfileOrganizerRenderer { private String avg (PeerProfile prof, long rate, RateAverages ra) { RateStat rs = prof.getDbResponseTime(); if (rs == null) - return _(NA); + return _t(NA); Rate r = rs.getRate(rate); if (r == null) - return _(NA); + return _t(NA); r.computeAverages(ra, false); if (ra.getTotalEventCount() == 0) - return _(NA); + return _t(NA); return DataHelper.formatDuration2(Math.round(ra.getAverage())); } @@ -363,12 +363,12 @@ class ProfileOrganizerRenderer { /** @since 0.9.21 */ private String formatInterval(long now, long then) { if (then <= 0) - return _(NA); + return _t(NA); return DataHelper.formatDuration2(now - then); } /** translate a string */ - private String _(String s) { + private String _t(String s) { return Messages.getString(s, _context); } 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 6645558d5..3236d1f12 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java @@ -104,12 +104,12 @@ public class ProfilesHelper extends HelperBase { // we are there if (span) buf.append(""); - buf.append(_(titles[i])); + buf.append(_t(titles[i])); } else { // we are not there, make a link if (span) buf.append(""); - buf.append("").append(_(titles[i])).append(""); + buf.append("").append(_t(titles[i])).append(""); } if (span) buf.append(" \n"); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java index 3ee03289b..e04809d6f 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java @@ -71,7 +71,7 @@ public class SearchHelper extends HelperBase { } } StringBuilder buf = new StringBuilder(1024); - buf.append(""); for (String name : _engines.keySet()) { buf.append("\n"); + buf.append(_t(group)).append("\n"); // let's just do the groups //Set stats = (Set)entry.getValue(); //for (Iterator statIter = stats.iterator(); statIter.hasNext(); ) { @@ -54,14 +54,14 @@ public class StatsGenerator { //out.write(buf.toString()); //buf.setLength(0); } - buf.append(" "); + buf.append(" "); buf.append(""); - buf.append(_("Statistics gathered during this router's uptime")).append(" ("); + buf.append(_t("Statistics gathered during this router's uptime")).append(" ("); long uptime = _context.router().getUptime(); buf.append(DataHelper.formatDuration2(uptime)); - buf.append("). ").append( _("The data gathered is quantized over a 1 minute period, so should just be used as an estimate.")); - buf.append(' ').append( _("These statistics are primarily used for development and debugging.")); + buf.append("). ").append( _t("The data gathered is quantized over a 1 minute period, so should just be used as an estimate.")); + buf.append(' ').append( _t("These statistics are primarily used for development and debugging.")); out.write(buf.toString()); buf.setLength(0); @@ -72,7 +72,7 @@ public class StatsGenerator { buf.append("

                "); - buf.append(_(group)); + buf.append(_t(group)); buf.append("

                "); buf.append("
                  "); out.write(buf.toString()); @@ -102,7 +102,7 @@ public class StatsGenerator { buf.append(freq.getDescription()); buf.append("
                  "); if (freq.getEventCount() <= 0) { - buf.append(_("No lifetime events")).append("
                  \n"); + buf.append(_t("No lifetime events")).append("
                  \n"); return; } long uptime = _context.router().getUptime(); @@ -113,15 +113,15 @@ public class StatsGenerator { if (periods[i] > uptime) break; buf.append("
                • "); - renderPeriod(buf, periods[i], _("frequency")); + renderPeriod(buf, periods[i], _t("frequency")); Frequency curFreq = freq.getFrequency(periods[i]); buf.append(DataHelper.formatDuration2(Math.round(curFreq.getAverageInterval()))); buf.append("; "); - buf.append(_("Rolling average events per period")); + buf.append(_t("Rolling average events per period")); buf.append(": "); buf.append(num(curFreq.getAverageEventsPerPeriod())); buf.append("; "); - buf.append(_("Highest events per period")); + buf.append(_t("Highest events per period")); buf.append(": "); buf.append(num(curFreq.getMaxAverageEventsPerPeriod())); buf.append("; "); @@ -132,12 +132,12 @@ public class StatsGenerator { //} //buf.append(" avg interval between updates: (").append(num(curFreq.getAverageInterval())).append("ms, min "); //buf.append(num(curFreq.getMinAverageInterval())).append("ms)"); - buf.append(_("Lifetime average events per period")).append(": "); + buf.append(_t("Lifetime average events per period")).append(": "); buf.append(num(curFreq.getStrictAverageEventsPerPeriod())); buf.append("
                  • \n"); } // Display the strict average - buf.append("
                • ").append(_("Lifetime average frequency")).append(": "); + buf.append("
                • ").append(_t("Lifetime average frequency")).append(": "); buf.append(DataHelper.formatDuration2(freq.getFrequency())); buf.append(" ("); buf.append(ngettext("1 event", "{0} events", (int) freq.getEventCount())); @@ -153,7 +153,7 @@ public class StatsGenerator { buf.append("
                  "); } if (rate.getLifetimeEventCount() <= 0) { - buf.append(_("No lifetime events")).append("
                  \n"); + buf.append(_t("No lifetime events")).append("
                  \n"); return; } long now = _context.clock().now(); @@ -165,12 +165,12 @@ public class StatsGenerator { if (curRate.getLastCoalesceDate() <= curRate.getCreationDate()) break; buf.append("
                • "); - renderPeriod(buf, periods[i], _("rate")); + renderPeriod(buf, periods[i], _t("rate")); if (curRate.getLastEventCount() > 0) { - buf.append(_("Average")).append(": "); + buf.append(_t("Average")).append(": "); buf.append(num(curRate.getAverageValue())); buf.append("; "); - buf.append(_("Highest average")); + buf.append(_t("Highest average")); buf.append(": "); buf.append(num(curRate.getExtremeAverageValue())); buf.append("; "); @@ -199,16 +199,16 @@ public class StatsGenerator { buf.append(ngettext("There was 1 event in this period.", "There were {0} events in this period.", (int)curRate.getLastEventCount())); buf.append(' '); - buf.append(_("The period ended {0} ago.", DataHelper.formatDuration2(now - curRate.getLastCoalesceDate()))); + buf.append(_t("The period ended {0} ago.", DataHelper.formatDuration2(now - curRate.getLastCoalesceDate()))); } else { - buf.append(" ").append(_("No events")).append(" "); + buf.append(" ").append(_t("No events")).append(" "); } long numPeriods = curRate.getLifetimePeriods(); if (numPeriods > 0) { double avgFrequency = curRate.getLifetimeEventCount() / (double)numPeriods; - buf.append(" (").append(_("Average event count")).append(": "); + buf.append(" (").append(_t("Average event count")).append(": "); buf.append(num(avgFrequency)); - buf.append("; ").append(_("Events in peak period")).append(": "); + buf.append("; ").append(_t("Events in peak period")).append(": "); // This isn't really the highest event count, but the event count during the period with the highest total value. buf.append(curRate.getExtremeEventCount()); buf.append(")"); @@ -216,19 +216,19 @@ public class StatsGenerator { if (curRate.getSummaryListener() != null) { buf.append(" ").append(_("Graph Data")).append(" - "); + buf.append("\">").append(_t("Graph Data")).append(" - "); buf.append(" ").append(_("Graph Event Count")).append(""); + buf.append("&showEvents=true\">").append(_t("Graph Event Count")).append(""); // This can really blow up your browser if you click on it //buf.append(" - ").append(_("Export Data as XML")).append(""); + //buf.append("&format=xml\">").append(_t("Export Data as XML")).append(""); } buf.append("
                  • \n"); } // Display the strict average - buf.append("
                • ").append(_("Lifetime average value")).append(": "); + buf.append("
                • ").append(_t("Lifetime average value")).append(": "); buf.append(num(rate.getLifetimeAverageValue())); buf.append(" ("); buf.append(ngettext("1 event", "{0} events", (int) rate.getLifetimeEventCount())); @@ -258,19 +258,19 @@ public class StatsGenerator { */ private class AlphaComparator implements Comparator { public int compare(String lhs, String rhs) { - String lname = _(lhs); - String rname = _(rhs); + String lname = _t(lhs); + String rname = _t(rhs); return Collator.getInstance().compare(lname, rname); } } /** translate a string */ - private String _(String s) { + private String _t(String s) { return Messages.getString(s, _context); } /** translate a string */ - private String _(String s, Object o) { + private String _t(String s, Object o) { return Messages.getString(s, o, _context); } 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 9f79dbfc7..29223c7bf 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -124,9 +124,9 @@ public class SummaryBarRenderer { public String renderHelpAndFAQHTML() { StringBuilder buf = new StringBuilder(512); buf.append("

                  ") - .append(_("Help & FAQ")) + .append(_t("Help & FAQ")) .append("

                  "); return buf.toString(); } @@ -134,23 +134,23 @@ public class SummaryBarRenderer { public String renderI2PServicesHTML() { StringBuilder buf = new StringBuilder(512); buf.append("

                  ") - .append(_("I2P Services")) + .append(_t("I2P Services")) .append("

                  \n" + "
              ").append(_("Peer")).append("").append(_("Caps")).append("").append(_("Integ. Value")).append("").append(_("Last Heard About")).append("").append(_("Last Heard From")).append("").append(_("Last Good Send")).append("").append(_("Last Bad Send")).append("").append(_("10m Resp. Time")).append("").append(_("1h Resp. Time")).append("").append(_("1d Resp. Time")).append("").append(_("Last Good Lookup")).append("").append(_("Last Bad Lookup")).append("").append(_("Last Good Store")).append("").append(_("Last Bad Store")).append("").append(_("1h Fail Rate")).append("").append(_("1d Fail Rate")).append("").append(_t("Peer")).append("").append(_t("Caps")).append("").append(_t("Integ. Value")).append("").append(_t("Last Heard About")).append("").append(_t("Last Heard From")).append("").append(_t("Last Good Send")).append("").append(_t("Last Bad Send")).append("").append(_t("10m Resp. Time")).append("").append(_t("1h Resp. Time")).append("").append(_t("1d Resp. Time")).append("").append(_t("Last Good Lookup")).append("").append(_t("Last Bad Lookup")).append("").append(_t("Last Good Store")).append("").append(_t("Last Bad Store")).append("").append(_t("1h Fail Rate")).append("").append(_t("1d Fail Rate")).append("
              ").append(davg(dbh, 24*60*60*1000l, ra)).append("").append(_(NA)); + buf.append("").append(_t(NA)); } buf.append("
              " + "") - .append(nbsp(_("Email"))) + .append(nbsp(_t("Email"))) .append("\n" + "") - .append(nbsp(_("Torrents"))) + .append(nbsp(_t("Torrents"))) .append("\n" + "") - .append(nbsp(_("Website"))) + .append(nbsp(_t("Website"))) .append("\n") .append(NavHelper.getClientAppLinks(_context)) @@ -172,73 +172,73 @@ public class SummaryBarRenderer { public String renderI2PInternalsHTML() { StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("I2P Internals")) + .append(_t("I2P Internals")) .append("

              \n" + "
              \n" + "") - .append(nbsp(_("Tunnels"))) + .append(nbsp(_t("Tunnels"))) .append("\n" + "") - .append(nbsp(_("Peers"))) + .append(nbsp(_t("Peers"))) .append("\n" + "") - .append(nbsp(_("Profiles"))) + .append(nbsp(_t("Profiles"))) .append("\n" + "") - .append(nbsp(_("NetDB"))) + .append(nbsp(_t("NetDB"))) .append("\n" + "") - .append(nbsp(_("Logs"))) + .append(nbsp(_t("Logs"))) .append("\n"); // "") - // .append(_("Jobs")) + // .append(_t("Jobs")) // .append("\n" + if (!StatSummarizer.isDisabled()) { buf.append("") - .append(nbsp(_("Graphs"))) + .append(nbsp(_t("Graphs"))) .append("\n"); } buf.append("") - .append(nbsp(_("Stats"))) + .append(nbsp(_t("Stats"))) .append("\n" + "") - .append(nbsp(_("Addressbook"))) + .append(nbsp(_t("Addressbook"))) .append("\n" + "") - .append(nbsp(_("Hidden Services Manager"))) + .append(nbsp(_t("Hidden Services Manager"))) .append("\n"); if (_context.getBooleanProperty(HelperBase.PROP_ADVANCED)) @@ -254,44 +254,44 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("General")) + .append(_t("General")) .append("

              \n" + "" + "" + "\n" + "" + "" + "\n" + "" + "" + "
              ") - .append(_("Local Identity")) + .append(_t("Local Identity")) .append(":" + "") - .append(_("show")) + .append(_t("show")) .append("
              ") - .append(_("Version")) + .append(_t("Version")) .append(":") .append(_helper.getVersion()) .append("
              ") - .append(_("Uptime")) + .append(_t("Uptime")) .append(":") .append(_helper.getUptime()) @@ -304,20 +304,20 @@ public class SummaryBarRenderer { StringBuilder buf = new StringBuilder(512); buf.append("" + "" + "" + "\n" + "" + "" + ""); if (sessionObject.folder.getPages() > 1 && i > 30) { @@ -2270,27 +2270,27 @@ public class WebMail extends HttpServlet out.println("\n"); } out.println( "
              ") - .append(_("Version")) + .append(_t("Version")) .append(":") .append(_helper.getVersion()) .append("
              ") - .append(_("Uptime")) + .append(_t("Uptime")) .append(":") .append(_helper.getUptime()) @@ -329,9 +329,9 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("Network")) + .append(_t("Network")) .append(": ") .append(_helper.getReachability()) .append("

              \n"); @@ -340,9 +340,9 @@ public class SummaryBarRenderer { if ("ru".equals(Messages.getLanguage(_context))) buf.append("-ru"); buf.append("\" target=\"_top\" title=\"") - .append(_("See more information on the wiki")) + .append(_t("See more information on the wiki")) .append("\">") - .append(_("Warning: ECDSA is not available. Update your Java or OS")) + .append(_t("Warning: ECDSA is not available. Update your Java or OS")) .append("\n"); } return buf.toString(); @@ -354,9 +354,9 @@ public class SummaryBarRenderer { if ("".equals(updateStatus)) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("I2P Update")) + .append(_t("I2P Update")) .append("

              \n"); buf.append(updateStatus); return buf.toString(); @@ -373,18 +373,18 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("Peers")) + .append(_t("Peers")) .append("

              \n" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + @@ -443,9 +443,9 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("Bandwidth in/out")) + .append(_t("Bandwidth in/out")) .append("

              " + "
              ") - .append(_("Active")) + .append(_t("Active")) .append(":"); int active = _helper.getActivePeers(); buf.append(active) @@ -393,37 +393,37 @@ public class SummaryBarRenderer { .append("
              ") - .append(_("Fast")) + .append(_t("Fast")) .append(":") .append(_helper.getFastPeers()) .append("
              ") - .append(_("High capacity")) + .append(_t("High capacity")) .append(":") .append(_helper.getHighCapacityPeers()) .append("
              ") - .append(_("Integrated")) + .append(_t("Integrated")) .append(":") .append(_helper.getWellIntegratedPeers()) .append("
              ") - .append(_("Known")) + .append(_t("Known")) .append(":") .append(_helper.getAllPeers()) .append("
              \n" + @@ -465,14 +465,14 @@ public class SummaryBarRenderer { if (_context.router().getUptime() > 2*60*1000) { buf.append("\n"); } buf.append("\n
              ") - .append(_("Total")) + .append(_t("Total")) .append(":") .append(_helper.getLifetimeKBps()) .append("Bps
              ") - .append(_("Used")) + .append(_t("Used")) .append(":") .append(_helper.getInboundTransferred()) .append(SummaryHelper.THINSP) @@ -487,44 +487,44 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("Tunnels")) + .append(_t("Tunnels")) .append("

              " + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + "" + "\n" + @@ -537,46 +537,46 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(512); buf.append("

              ") - .append(_("Congestion")) + .append(_t("Congestion")) .append("

              " + "
              ") - .append(_("Exploratory")) + .append(_t("Exploratory")) .append(":") .append(_helper.getInboundTunnels() + _helper.getOutboundTunnels()) .append("
              ") - .append(_("Client")) + .append(_t("Client")) .append(":") .append(_helper.getInboundClientTunnels() + _helper.getOutboundClientTunnels()) .append("
              ") - .append(_("Participating")) + .append(_t("Participating")) .append(":") .append(_helper.getParticipatingTunnels()) .append("
              ") - .append(_("Share ratio")) + .append(_t("Share ratio")) .append(":") .append(_helper.getShareRatio()) .append("
              \n" + "" + "\n" + "" + "\n"); if (!_context.getBooleanPropertyDefaultTrue("router.disableTunnelTesting")) { buf.append("" + "\n"); } buf.append("" + "\n" + @@ -589,7 +589,7 @@ public class SummaryBarRenderer { if (_helper == null) return ""; StringBuilder buf = new StringBuilder(50); buf.append("

              ") - .append(_(_helper.getTunnelStatus())) + .append(_t(_helper.getTunnelStatus())) .append("

              \n"); return buf.toString(); } @@ -612,7 +612,7 @@ public class SummaryBarRenderer { // Set up title and pre-headings stuff. //buf.append("

              ") buf.append("

              ") - .append(_("News & Updates")) + .append(_t("News & Updates")) .append("

              \n"); // Get news content. List entries = Collections.emptyList(); @@ -647,11 +647,11 @@ public class SummaryBarRenderer { } buf.append("\n"); //buf.append("") - // .append(_("Show all news")) + // .append(_t("Show all news")) // .append("\n"); } else { buf.append("
              ") - .append(_("none")) + .append(_t("none")) .append("
              "); } // Add post-headings stuff. @@ -661,7 +661,7 @@ public class SummaryBarRenderer { } /** translate a string */ - private String _(String s) { + private String _t(String s) { return Messages.getString(s, _context); } 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 1cd207e45..88a0e43d9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -114,7 +114,7 @@ public class SummaryHelper extends HelperBase { long diff = Math.abs(ms); if (diff < 3000) return ""; - return " (" + DataHelper.formatDuration2(diff) + " " + _("skew") + ")"; + return " (" + DataHelper.formatDuration2(diff) + " " + _t("skew") + ")"; } **/ @@ -140,19 +140,19 @@ public class SummaryHelper extends HelperBase { return "VM Comm System"; 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 + return _t("ERR-Client Manager I2CP Error - check logs"); // not a router problem but the user should know // 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 (Math.abs(skew) > 30*1000) - return _("ERR-Clock Skew of {0}", DataHelper.formatDuration2(Math.abs(skew))); + return _t("ERR-Clock Skew of {0}", DataHelper.formatDuration2(Math.abs(skew))); if (_context.router().isHidden()) - return _("Hidden"); + return _t("Hidden"); RouterInfo routerInfo = _context.router().getRouterInfo(); if (routerInfo == null) - return _("Testing"); + return _t("Testing"); Status status = _context.commSystem().getStatus(); switch (status) { @@ -164,37 +164,37 @@ public class SummaryHelper extends HelperBase { case IPV4_SNAT_IPV6_OK: RouterAddress ra = routerInfo.getTargetAddress("NTCP"); if (ra == null) - return _(status.toStatusString()); + return _t(status.toStatusString()); byte[] ip = ra.getIP(); if (ip == null) - return _("ERR-Unresolved TCP Address"); + return _t("ERR-Unresolved TCP Address"); // TODO set IPv6 arg based on configuration? if (TransportUtil.isPubliclyRoutable(ip, true)) - return _(status.toStatusString()); - return _("ERR-Private TCP Address"); + return _t(status.toStatusString()); + return _t("ERR-Private TCP Address"); case IPV4_SNAT_IPV6_UNKNOWN: case DIFFERENT: - return _("ERR-SymmetricNAT"); + return _t("ERR-SymmetricNAT"); case REJECT_UNSOLICITED: case IPV4_DISABLED_IPV6_FIREWALLED: if (routerInfo.getTargetAddress("NTCP") != null) - return _("WARN-Firewalled with Inbound TCP Enabled"); + return _t("WARN-Firewalled with Inbound TCP Enabled"); // fall through... case IPV4_FIREWALLED_IPV6_OK: case IPV4_FIREWALLED_IPV6_UNKNOWN: if (((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) - return _("WARN-Firewalled and Floodfill"); + return _t("WARN-Firewalled and Floodfill"); //if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0) - // return _("WARN-Firewalled and Fast"); - return _(status.toStatusString()); + // return _t("WARN-Firewalled and Fast"); + return _t(status.toStatusString()); case DISCONNECTED: - return _("Disconnected - check network cable"); + return _t("Disconnected - check network cable"); case HOSED: - return _("ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"); + return _t("ERR-UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart"); case UNKNOWN: case IPV4_UNKNOWN_IPV6_FIREWALLED: @@ -203,14 +203,14 @@ public class SummaryHelper extends HelperBase { ra = routerInfo.getTargetAddress("SSU"); if (ra == null && _context.router().getUptime() > 5*60*1000) { if (getActivePeers() <= 0) - return _("ERR-No Active Peers, Check Network Connection and Firewall"); + return _t("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"); + return _t("ERR-UDP Disabled and Inbound TCP host/port not set"); else - return _("WARN-Firewalled with UDP Disabled"); + return _t("WARN-Firewalled with UDP Disabled"); } - return _(status.toStatusString()); + return _t(status.toStatusString()); } } @@ -434,8 +434,8 @@ public class SummaryHelper extends HelperBase { StringBuilder buf = new StringBuilder(512); buf.append("

              ").append(_("Local Tunnels")) + .append(_t("Add/remove/edit & control your client and server tunnels")) + .append("\">").append(_t("Local Tunnels")) .append("

              "); if (!clients.isEmpty()) { Collections.sort(clients, new AlphaComparator()); @@ -447,11 +447,11 @@ public class SummaryHelper extends HelperBase { buf.append("

              \n"); + buf.append("\n"); } else { // green light - buf.append("\n"); + buf.append("\n"); } } else { // yellow light - buf.append("\n"); + buf.append("\n"); } } buf.append("
              ") - .append(_("Job lag")) + .append(_t("Job lag")) .append(":") .append(_helper.getJobLag()) .append("
              ") - .append(_("Message delay")) + .append(_t("Message delay")) .append(":") .append(_helper.getMessageDelay()) .append("
              ") - .append(_("Tunnel lag")) + .append(_t("Tunnel lag")) .append(":") .append(_helper.getTunnelLag()) .append("
              ") - .append(_("Backlog")) + .append(_t("Backlog")) .append(":") .append(_helper.getInboundBacklog()) .append("
              \"Server\""); + buf.append("server.png\" alt=\"Server\" title=\"").append(_t("Hidden Service")).append("\">"); else - buf.append("client.png\" alt=\"Client\" title=\"").append(_("Client")).append("\">"); + buf.append("client.png\" alt=\"Client\" title=\"").append(_t("Client")).append("\">"); buf.append(""); + buf.append("\" target=\"_top\" title=\"").append(_t("Show tunnels")).append("\">"); if (name.length() <= 20) buf.append(DataHelper.escapeHTML(name)); else @@ -462,20 +462,20 @@ public class SummaryHelper extends HelperBase { long timeToExpire = ls.getEarliestLeaseDate() - _context.clock().now(); if (timeToExpire < 0) { // red or yellow light - buf.append("\"").append(_("Rebuilding")).append("…\"
              \"").append(_t("Rebuilding")).append("…\"
              \"Ready\"
              \"Ready\"
              \"").append(_("Building")).append("…\"
              \"").append(_t("Building")).append("…\"
              "); } else { - buf.append("
              ").append(_("none")).append("
              "); + buf.append("
              ").append(_t("none")).append("
              "); } buf.append("\n"); return buf.toString(); @@ -486,7 +486,7 @@ public class SummaryHelper extends HelperBase { * Inner class, can't be Serializable */ private class AlphaComparator implements Comparator { - private final String xsc = _("shared clients"); + private final String xsc = _t("shared clients"); public int compare(Destination lhs, Destination rhs) { String lname = getName(lhs); @@ -511,9 +511,9 @@ public class SummaryHelper extends HelperBase { if (name == null) name = d.calculateHash().toBase64().substring(0,6); else - name = _(name); + name = _t(name); } else { - name = _(name); + name = _t(name); } return name; } @@ -712,12 +712,12 @@ public class SummaryHelper extends HelperBase { buf.append("
              "); else needSpace = true; - buf.append("

              ").append(_("Update downloaded")).append("
              "); + buf.append("

              ").append(_t("Update downloaded")).append("
              "); if (_context.hasWrapper()) - buf.append(_("Click Restart to install")); + buf.append(_t("Click Restart to install")); else - buf.append(_("Click Shutdown and restart to install")); - buf.append(' ').append(_("Version {0}", DataHelper.escapeHTML(dver))); + buf.append(_t("Click Shutdown and restart to install")); + buf.append(' ').append(_t("Version {0}", DataHelper.escapeHTML(dver))); buf.append("

              "); } boolean avail = updateAvailable(); @@ -731,8 +731,8 @@ public class SummaryHelper extends HelperBase { buf.append("
              "); else needSpace = true; - buf.append("

              ").append(_("Update available")).append(":
              "); - buf.append(_("Version {0}", getUpdateVersion())).append("
              "); + buf.append("

              ").append(_t("Update available")).append(":
              "); + buf.append(_t("Version {0}", getUpdateVersion())).append("
              "); buf.append(constraint).append("

              "); avail = false; } @@ -755,7 +755,7 @@ public class SummaryHelper extends HelperBase { if (avail) { buf.append("
              \n"); } if (devSU3Avail) { @@ -763,7 +763,7 @@ public class SummaryHelper extends HelperBase { // Note to translators: parameter is a router version, e.g. "0.9.19-16" //
              is optional, to help the browser make the lines even in the button // If the translation is shorter than the English, you should probably not include
              - .append(_("Download Signed
              Development Update
              {0}", getDevSU3UpdateVersion())) + .append(_t("Download Signed
              Development Update
              {0}", getDevSU3UpdateVersion())) .append("
              \n"); } if (unsignedAvail) { @@ -771,7 +771,7 @@ public class SummaryHelper extends HelperBase { // Note to translators: parameter is a date and time, e.g. "02-Mar 20:34 UTC" //
              is optional, to help the browser make the lines even in the button // If the translation is shorter than the English, you should probably not include
              - .append(_("Download Unsigned
              Update {0}", getUnsignedUpdateVersion())) + .append(_t("Download Unsigned
              Update {0}", getUnsignedUpdateVersion())) .append("
              \n"); } buf.append("\n"); @@ -795,9 +795,9 @@ public class SummaryHelper extends HelperBase { StringBuilder buf = new StringBuilder(256); if (showFirewallWarning()) { buf.append("

              ") - .append(_("Check network connection and NAT/firewall")) + .append(_t("Check network connection and NAT/firewall")) .append("

              "); } @@ -816,7 +816,7 @@ public class SummaryHelper extends HelperBase { String uri = getRequestURI(); buf.append("

              \n"); buf.append("\n"); - buf.append("

              \n"); + buf.append("

              \n"); } } // If a new reseed ain't running, and the last reseed had errors, show error message @@ -901,18 +901,18 @@ public class SummaryHelper extends HelperBase { StringBuilder buf = new StringBuilder(2048); buf.append("\n"); for (String section : sections) { int i = sections.indexOf(section); buf.append("\n"); } buf.append("" + "") .append("
              ") - .append(_("Remove")) + .append(_t("Remove")) .append("") - .append(_("Name")) + .append(_t("Name")) .append("") - .append(_("Order")) + .append(_t("Order")) .append("
              ") - .append(_(sectionNames.get(section))) + .append(_t(sectionNames.get(section))) .append("\"")"); buf.append(""); } buf.append(""); @@ -945,34 +945,34 @@ public class SummaryHelper extends HelperBase { buf.append(""); buf.append(""); } buf.append("
              " + "") - .append(_("Add")).append(": " + + .append(_t("Add")).append(": " + "" + "
              \n"); return buf.toString(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java index 06d6e9af5..d97d185a8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java @@ -139,9 +139,9 @@ class SummaryRenderer { else p = DataHelper.formatDuration2(period).replace(" ", " "); if (showEvents) - title = name + ' ' + _("events in {0}", p); + title = name + ' ' + _t("events in {0}", p); else - title = name + ' ' + _("averaged for {0}", p); + title = name + ' ' + _t("averaged for {0}", p); def.setTitle(title); } String path = _listener.getData().getPath(); @@ -151,7 +151,7 @@ class SummaryRenderer { if (showEvents) { // include the average event count on the plot plotName = dsNames[1]; - descr = _("Events per period"); + descr = _t("Events per period"); } else { // include the average value plotName = dsNames[0]; @@ -159,12 +159,12 @@ class SummaryRenderer { // (there are over 500 of them) // but the descriptions for the default graphs are tagged in // Strings.java - descr = _(_listener.getRate().getRateStat().getDescription()); + descr = _t(_listener.getRate().getRateStat().getDescription()); } //long started = ((RouterContext)_context).router().getWhenStarted(); //if (started > start && started < end) - // def.vrule(started / 1000, RESTART_BAR_COLOR, _("Restart"), 4.0f); + // def.vrule(started / 1000, RESTART_BAR_COLOR, _t("Restart"), 4.0f); def.datasource(plotName, path, plotName, SummaryListener.CF, _listener.getBackendName()); if (descr.length() > 0) { @@ -173,22 +173,22 @@ class SummaryRenderer { def.area(plotName, Color.BLUE); } if (!hideLegend) { - def.gprint(plotName, SummaryListener.CF, _("avg") + ": %.2f %s"); - def.gprint(plotName, "MAX", ' ' + _("max") + ": %.2f %S"); - def.gprint(plotName, "LAST", ' ' + _("now") + ": %.2f %S\\r"); + def.gprint(plotName, SummaryListener.CF, _t("avg") + ": %.2f %s"); + def.gprint(plotName, "MAX", ' ' + _t("max") + ": %.2f %S"); + def.gprint(plotName, "LAST", ' ' + _t("now") + ": %.2f %S\\r"); } String plotName2 = null; if (lsnr2 != null) { String dsNames2[] = lsnr2.getData().getDsNames(); plotName2 = dsNames2[0]; String path2 = lsnr2.getData().getPath(); - String descr2 = _(lsnr2.getRate().getRateStat().getDescription()); + String descr2 = _t(lsnr2.getRate().getRateStat().getDescription()); def.datasource(plotName2, path2, plotName2, SummaryListener.CF, lsnr2.getBackendName()); def.line(plotName2, Color.RED, descr2 + "\\r", 3); if (!hideLegend) { - def.gprint(plotName2, SummaryListener.CF, _("avg") + ": %.2f %s"); - def.gprint(plotName2, "MAX", ' ' + _("max") + ": %.2f %S"); - def.gprint(plotName2, "LAST", ' ' + _("now") + ": %.2f %S\\r"); + def.gprint(plotName2, SummaryListener.CF, _t("avg") + ": %.2f %s"); + def.gprint(plotName2, "MAX", ' ' + _t("max") + ": %.2f %S"); + def.gprint(plotName2, "LAST", ' ' + _t("now") + ": %.2f %S\\r"); } } if (!hideLegend) { @@ -198,7 +198,7 @@ class SummaryRenderer { for (Map.Entry event : events.entrySet()) { long started = event.getKey().longValue(); if (started > start && started < end) { - String legend = _("Restart") + ' ' + sdf.format(new Date(started)) + " UTC " + event.getValue() + "\\r"; + String legend = _t("Restart") + ' ' + sdf.format(new Date(started)) + " UTC " + event.getValue() + "\\r"; def.vrule(started / 1000, RESTART_BAR_COLOR, legend, 4.0f); } } @@ -271,7 +271,7 @@ class SummaryRenderer { private static final boolean IS_WIN = SystemVersion.isWindows(); /** translate a string */ - private String _(String s) { + private String _t(String s) { // the RRD font doesn't have zh chars, at least on my system // Works on 1.5.9 except on windows if (IS_WIN && "zh".equals(Messages.getLanguage(_context))) @@ -282,7 +282,7 @@ class SummaryRenderer { /** * translate a string with a parameter */ - private String _(String s, String o) { + private String _t(String s, String o) { // the RRD font doesn't have zh chars, at least on my system // Works on 1.5.9 except on windows if (IS_WIN && "zh".equals(Messages.getLanguage(_context))) 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 9fff49d1e..3784e4a30 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java @@ -33,7 +33,7 @@ public class TunnelRenderer { } public void renderStatusHTML(Writer out) throws IOException { - out.write("

              " + _("Exploratory tunnels") + " (" + _("configure") + ")

              \n"); + out.write("

              " + _t("Exploratory tunnels") + " (" + _t("configure") + ")

              \n"); renderPool(out, _context.tunnelManager().getInboundExploratoryPool(), _context.tunnelManager().getOutboundExploratoryPool()); List destinations = null; @@ -57,20 +57,20 @@ public class TunnelRenderer { if (name == null) name = client.toBase64().substring(0,4); out.write("

              " + _("Client tunnels for") + ' ' + DataHelper.escapeHTML(_(name))); + + "\" >" + _t("Client tunnels for") + ' ' + DataHelper.escapeHTML(_t(name))); if (isLocal) - out.write(" (" + _("configure") + ")

              \n"); + out.write(" (" + _t("configure") + ")

              \n"); else - out.write(" (" + _("dead") + ")

              \n"); + out.write(" (" + _t("dead") + ")\n"); renderPool(out, in, outPool); } List participating = _context.tunnelDispatcher().listParticipatingTunnels(); Collections.sort(participating, new TunnelComparator()); - out.write("

              " + _("Participating tunnels") + "

              \n"); - out.write("" - + "\n"); + out.write("

              " + _t("Participating tunnels") + "

              " + _("Receive on") + "" + _("From") + "" - + _("Send on") + "" + _("To") + "" + _("Expiration") + "" + _("Usage") + "" + _("Rate") + "" + _("Role") + "
              \n"); + out.write("" + + "\n"); long processed = 0; RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount"); if (rs != null) @@ -108,7 +108,7 @@ public class TunnelRenderer { if (timeLeft > 0) out.write(""); else - out.write(""); + out.write(""); out.write(""); int lifetime = (int) ((_context.clock().now() - cfg.getCreation()) / 1000); if (lifetime <= 0) @@ -118,18 +118,18 @@ public class TunnelRenderer { int bps = 1024 * cfg.getProcessedMessagesCount() / lifetime; out.write(""); if (cfg.getSendTo() == null) - out.write(""); + out.write(""); else if (cfg.getReceiveFrom() == null) - out.write(""); + out.write(""); else - out.write(""); + out.write(""); out.write("\n"); } out.write("
              " + _t("Receive on") + "" + _t("From") + "" + + _t("Send on") + "" + _t("To") + "" + _t("Expiration") + "" + _t("Usage") + "" + _t("Rate") + "" + _t("Role") + "
              " + DataHelper.formatDuration2(timeLeft) + "(" + _("grace period") + ")(" + _t("grace period") + ")" + cfg.getProcessedMessagesCount() + " KB" + bps + " Bps" + _("Outbound Endpoint") + "" + _t("Outbound Endpoint") + "" + _("Inbound Gateway") + "" + _t("Inbound Gateway") + "" + _("Participant") + "" + _t("Participant") + "
              \n"); if (displayed > DISPLAY_LIMIT) - out.write("
              " + _("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT) + "
              \n"); - out.write("
              " + _("Inactive participating tunnels") + ": " + inactive + "
              \n"); - out.write("
              " + _("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B
              \n"); + out.write("
              " + _t("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT) + "
              \n"); + out.write("
              " + _t("Inactive participating tunnels") + ": " + inactive + "
              \n"); + out.write("
              " + _t("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B
              \n"); //renderPeers(out); out.write(""); } @@ -159,16 +159,16 @@ public class TunnelRenderer { if (info.getLength() > maxLength) maxLength = info.getLength(); } - out.write(""); + out.write("
              " + _("In/Out") + "" + _("Expiry") + "" + _("Usage") + "" + _("Gateway") + "
              "); if (maxLength > 3) { out.write(""); + out.write("\">" + _t("Participants") + ""); } else if (maxLength == 3) { - out.write(""); + out.write(""); } if (maxLength > 1) { - out.write(""); + out.write(""); } out.write("\n"); for (int i = 0; i < tunnels.size(); i++) { @@ -208,22 +208,22 @@ public class TunnelRenderer { if (in != null) { List pending = in.listPending(); if (!pending.isEmpty()) { - out.write("
              " + _("Build in progress") + ": " + pending.size() + " " + _("inbound") + "
              \n"); + out.write("
              " + _t("Build in progress") + ": " + pending.size() + " " + _t("inbound") + "
              \n"); live += pending.size(); } } if (outPool != null) { List pending = outPool.listPending(); if (!pending.isEmpty()) { - out.write("
              " + _("Build in progress") + ": " + pending.size() + " " + _("outbound") + "
              \n"); + out.write("
              " + _t("Build in progress") + ": " + pending.size() + " " + _t("outbound") + "
              \n"); live += pending.size(); } } if (live <= 0) - out.write("
              " + _("No tunnels; waiting for the grace period to end.") + "
              \n"); - out.write("
              " + _("Lifetime bandwidth usage") + ": " + - DataHelper.formatSize2(processedIn*1024) + "B " + _("in") + ", " + - DataHelper.formatSize2(processedOut*1024) + "B " + _("out") + "
              "); + out.write("
              " + _t("No tunnels; waiting for the grace period to end.") + "
              \n"); + out.write("
              " + _t("Lifetime bandwidth usage") + ": " + + DataHelper.formatSize2(processedIn*1024) + "B " + _t("in") + ", " + + DataHelper.formatSize2(processedOut*1024) + "B " + _t("out") + "
              "); } /**** @@ -241,8 +241,8 @@ public class TunnelRenderer { List peerList = new ArrayList(peers); Collections.sort(peerList, new CountryComparator(this._context.commSystem())); - out.write("

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

              \n"); - out.write("
              " + _t("In/Out") + "" + _t("Expiry") + "" + _t("Usage") + "" + _t("Gateway") + "" + _("Participants") + "" + _("Participant") + "" + _t("Participant") + "" + _("Endpoint") + "" + _t("Endpoint") + "
              \n"); + out.write("

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

              \n"); + out.write("
              " + _("Peer") + "" + _("Our Tunnels") + "" + _("% of total") + "" + _("Participating Tunnels") + "" + _("% of total") + "
              \n"); for (Hash h : peerList) { out.write("
              " + _t("Peer") + "" + _t("Our Tunnels") + "" + _t("% of total") + "" + _t("Participating Tunnels") + "" + _t("% of total") + "
              "); out.write(netDbLink(h)); @@ -260,7 +260,7 @@ public class TunnelRenderer { out.write('0'); out.write('\n'); } - out.write("
              " + _("Totals") + " " + tunnelCount); + out.write("
              " + _t("Totals") + " " + tunnelCount); out.write("   " + partCount); out.write("  
              \n"); } @@ -343,12 +343,12 @@ public class TunnelRenderer { } /** translate a string */ - private String _(String s) { + private String _t(String s) { return Messages.getString(s, _context); } /** translate a string */ - public String _(String s, Object o) { + public String _t(String s, Object o) { return Messages.getString(s, o, _context); } } diff --git a/apps/routerconsole/java/strings/Strings.java b/apps/routerconsole/java/strings/Strings.java index 462938017..8254d657b 100644 --- a/apps/routerconsole/java/strings/Strings.java +++ b/apps/routerconsole/java/strings/Strings.java @@ -9,76 +9,76 @@ package dummy; class Dummy { void dummy { // wars for ConfigClientsHelper - _("addressbook"); - _("i2psnark"); - _("i2ptunnel"); - _("susimail"); - _("susidns"); - _("routerconsole"); + _t("addressbook"); + _t("i2psnark"); + _t("i2ptunnel"); + _t("susimail"); + _t("susidns"); + _t("routerconsole"); // clients, taken from clients.config, for ConfigClientsHelper // note that if the wording changes in clients.config, we have to // keep the old string here as well for existing installs - _("Web console"); - _("SAM application bridge"); - _("Application tunnels"); - _("My eepsite web server"); - _("I2P webserver (eepsite)"); - _("Browser launch at startup"); - _("BOB application bridge"); - _("I2P Router Console"); - _("Open Router Console in web browser at startup"); + _t("Web console"); + _t("SAM application bridge"); + _t("Application tunnels"); + _t("My eepsite web server"); + _t("I2P webserver (eepsite)"); + _t("Browser launch at startup"); + _t("BOB application bridge"); + _t("I2P Router Console"); + _t("Open Router Console in web browser at startup"); // tunnel nicknames, taken from i2ptunnel.config so they will display // nicely under 'local destinations' in the summary bar // note that if the wording changes in i2ptunnel.config, we have to // keep the old string here as well for existing installs - _("shared clients"); - _("shared clients (DSA)"); - _("IRC proxy"); - _("eepsite"); - _("I2P webserver"); - _("HTTP Proxy"); + _t("shared clients"); + _t("shared clients (DSA)"); + _t("IRC proxy"); + _t("eepsite"); + _t("I2P webserver"); + _t("HTTP Proxy"); // older names for pre-0.7.4 installs - _("eepProxy"); - _("ircProxy"); + _t("eepProxy"); + _t("ircProxy"); // hardcoded in i2psnark - _("I2PSnark"); + _t("I2PSnark"); // hardcoded in iMule? - _("iMule"); + _t("iMule"); // standard themes for ConfigUIHelper - _("classic"); - _("dark"); - _("light"); - _("midnight"); + _t("classic"); + _t("dark"); + _t("light"); + _t("midnight"); // stat groups for stats.jsp - _("Bandwidth"); - _("BandwidthLimiter"); - _("ClientMessages"); - _("Encryption"); - _("i2cp"); - _("I2PTunnel"); - _("InNetPool"); - _("JobQueue"); - _("NetworkDatabase"); - _("ntcp"); - _("Peers"); - _("Router"); - _("Stream"); - _("Throttle"); - _("Transport"); - _("Tunnels"); - _("udp"); + _t("Bandwidth"); + _t("BandwidthLimiter"); + _t("ClientMessages"); + _t("Encryption"); + _t("i2cp"); + _t("I2PTunnel"); + _t("InNetPool"); + _t("JobQueue"); + _t("NetworkDatabase"); + _t("ntcp"); + _t("Peers"); + _t("Router"); + _t("Stream"); + _t("Throttle"); + _t("Transport"); + _t("Tunnels"); + _t("udp"); // parameters in transport addresses (netdb.jsp) // may or may not be worth translating - _("host"); - _("key"); - _("port"); + _t("host"); + _t("key"); + _t("port"); // capabilities - _("caps"); + _t("caps"); } } diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 538fb8a5f..5e9c0de92 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -14,7 +14,7 @@ " /> -

              <%=intl._("I2P Bandwidth Configuration")%>

              +

              <%=intl._t("I2P Bandwidth Configuration")%>

              <%@include file="confignav.jsi" %> @@ -25,12 +25,12 @@ -

              <%=intl._("Bandwidth limiter")%>

              +

              <%=intl._t("Bandwidth limiter")%>

              - <%=intl._("I2P will work best if you configure your rates to match the speed of your internet connection.")%> + <%=intl._t("I2P will work best if you configure your rates to match the speed of your internet connection.")%>

              <% /******** *********/ %> - +
              " > - <%=intl._("KBps In")%> + <%=intl._t("KBps In")%> ()
              <%=intl._("Share")%> <%=intl._t("Share")%> ()

              <% int share = nethelper.getShareBandwidth(); if (share < 12) { out.print(""); - out.print(intl._("NOTE")); + out.print(intl._t("NOTE")); out.print(": "); - out.print(intl._("You have configured I2P to share only {0} KBps.", share)); + out.print(intl._t("You have configured I2P to share only {0} KBps.", share)); out.print("\n"); - out.print(intl._("I2P requires at least 12KBps to enable sharing. ")); - out.print(intl._("Please enable sharing (participating in tunnels) by configuring more bandwidth. ")); - out.print(intl._("It improves your anonymity by creating cover traffic, and helps the network.")); + out.print(intl._t("I2P requires at least 12KBps to enable sharing. ")); + out.print(intl._t("Please enable sharing (participating in tunnels) by configuring more bandwidth. ")); + out.print(intl._t("It improves your anonymity by creating cover traffic, and helps the network.")); } else { - out.print(intl._("You have configured I2P to share {0} KBps.", share)); + out.print(intl._t("You have configured I2P to share {0} KBps.", share)); out.print("\n"); - out.print(intl._("The higher the share bandwidth the more you improve your anonymity and help the network.")); + out.print(intl._t("The higher the share bandwidth the more you improve your anonymity and help the network.")); } %>

              -

              <%=intl._("Advanced network configuration page")%>

              +

              <%=intl._t("Advanced network configuration page")%>

              -" > -" > +" > +" >
              diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index 961ac83fa..3ba2deed1 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -15,7 +15,7 @@ " /> -

              <%=intl._("I2P Advanced Configuration")%>

              +

              <%=intl._t("I2P Advanced Configuration")%>

              <%@include file="confignav.jsi" %> @@ -24,14 +24,14 @@ <%@include file="formhandler.jsi" %>
              -

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

              -

              <%=intl._("Floodill participation helps the network, but may use more of your computer's resources.")%> +

              <%=intl._t("Floodfill Configuration")%>

              +

              <%=intl._t("Floodill participation helps the network, but may use more of your computer's resources.")%>

              <% if (advancedhelper.isFloodfill()) { -%><%=intl._("This router is currently a floodfill participant.")%><% +%><%=intl._t("This router is currently a floodfill participant.")%><% } else { -%><%=intl._("This router is not currently a floodfill participant.")%><% +%><%=intl._t("This router is not currently a floodfill participant.")%><% } %>

              @@ -39,15 +39,15 @@ > -<%=intl._("Automatic")%>
              +<%=intl._t("Automatic")%>
              > -<%=intl._("Force On")%>
              +<%=intl._t("Force On")%>
              > -<%=intl._("Disable")%>
              +<%=intl._t("Disable")%>
              -" > +" >
              -

              <%=intl._("Advanced I2P Configuration")%>

              +

              <%=intl._t("Advanced I2P Configuration")%>

              <% if (advancedhelper.isAdvanced()) { %>
              @@ -56,11 +56,11 @@
              <% if (advancedhelper.isAdvanced()) { %>
              - " > - " > -
              <%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%> + " > + " > +
              <%=intl._t("NOTE")%>: <%=intl._t("Some changes may require a restart to take effect.")%>
              <% } else { %> -<%=intl._("To make changes, edit the file {0}.", "" + advancedhelper.getConfigFileName() + "")%> +<%=intl._t("To make changes, edit the file {0}.", "" + advancedhelper.getConfigFileName() + "")%> <% } // isAdvanced %>
              diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 65f67daf5..cbb9710d4 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -20,43 +20,43 @@ input.default { width: 1px; height: 1px; visibility: hidden; } " /> " /> -

              <%=intl._("I2P Client Configuration")%>

              +

              <%=intl._t("I2P Client Configuration")%>

              <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %>
              -

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

              - <%=intl._("The Java clients listed below are started by the router and run in the same JVM.")%>
              - <%=intl._("Be careful changing any settings here. The 'router console' and 'application tunnels' are required for most uses of I2P. Only advanced users should change these.")%> +

              <%=intl._t("Client Configuration")%>

              + <%=intl._t("The Java clients listed below are started by the router and run in the same JVM.")%>
              + <%=intl._t("Be careful changing any settings here. The 'router console' and 'application tunnels' are required for most uses of I2P. Only advanced users should change these.")%>

              -

              <%=intl._("To change other client options, edit the file")%> +

              <%=intl._t("To change other client options, edit the file")%> <%=net.i2p.router.startup.ClientAppConfig.configFile(net.i2p.I2PAppContext.getGlobalContext()).getAbsolutePath()%>. - <%=intl._("All changes require restart to take effect.")%> + <%=intl._t("All changes require restart to take effect.")%>

              - " /> + " /> <% if (clientshelper.isClientChangeEnabled() && request.getParameter("edit") == null) { %> - " /> + " /> <% } %> - " /> + " />
              -

              <%=intl._("Advanced Client Interface Configuration")%>

              +

              <%=intl._t("Advanced Client Interface Configuration")%>

              -<%=intl._("External I2CP (I2P Client Protocol) Interface Configuration")%>
              +<%=intl._t("External I2CP (I2P Client Protocol) Interface Configuration")%>
              > -<%=intl._("Enabled without SSL")%>
              +<%=intl._t("Enabled without SSL")%>
              > -<%=intl._("Enabled with SSL required")%>
              +<%=intl._t("Enabled with SSL required")%>
              > -<%=intl._("Disabled - Clients outside this Java process may not connect")%>
              -<%=intl._("I2CP Interface")%>: +<%=intl._t("Disabled - Clients outside this Java process may not connect")%>
              +<%=intl._t("I2CP Interface")%>:
              -<%=intl._("I2CP Port")%>: +<%=intl._t("I2CP Port")%>: " >
              -<%=intl._("Authorization")%>
              +<%=intl._t("Authorization")%>
              > -<%=intl._("Require username and password")%>
              -<%=intl._("Username")%>: +<%=intl._t("Require username and password")%>
              +<%=intl._t("Username")%>:
              -<%=intl._("Password")%>: +<%=intl._t("Password")%>:
              -

              <%=intl._("The default settings will work for most people.")%> -<%=intl._("Any changes made here must also be configured in the external client.")%> -<%=intl._("Many clients do not support SSL or authorization.")%> -<%=intl._("All changes require restart to take effect.")%> +

              <%=intl._t("The default settings will work for most people.")%> +<%=intl._t("Any changes made here must also be configured in the external client.")%> +<%=intl._t("Many clients do not support SSL or authorization.")%> +<%=intl._t("All changes require restart to take effect.")%>

              -" /> -" /> -" /> +" /> +" /> +" />
              -

              <%=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._t("WebApp Configuration")%>

              + <%=intl._t("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.")%> + <%=intl._t("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.")%>

              -

              <%=intl._("All changes require restart to take effect.")%> +

              <%=intl._t("All changes require restart to take effect.")%>

              - " /> - " /> + " /> + " />
              <% if (clientshelper.showPlugins()) { if (clientshelper.isPluginUpdateEnabled()) { %> -

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

              - <%=intl._("The plugins listed below are started by the webConsole client.")%> +

              <%=intl._t("Plugin Configuration")%>

              + <%=intl._t("The plugins listed below are started by the webConsole client.")%>

              - " /> - " /> + " /> + " />
              <% } // pluginUpdateEnabled if (clientshelper.isPluginInstallEnabled()) { %> -

              <%=intl._("Plugin Installation from URL")%>

              - <%=intl._("Look for available plugins on {0}.", "plugins.i2p")%> - <%=intl._("To install a plugin, enter the download URL:")%> +

              <%=intl._t("Plugin Installation from URL")%>

              + <%=intl._t("Look for available plugins on {0}.", "plugins.i2p")%> + <%=intl._t("To install a plugin, enter the download URL:")%>

              @@ -133,31 +133,31 @@ input.default { width: 1px; height: 1px; visibility: hidden; }

              - " /> - " /> - " /> + " /> + " /> + " />
              -

              <%=intl._("Plugin Installation from File")%>

              +

              <%=intl._t("Plugin Installation from File")%>

              -

              <%=intl._("Install plugin from file.")%> -
              <%=intl._("Select xpi2p or su3 file")%> : +

              <%=intl._t("Install plugin from file.")%> +
              <%=intl._t("Select xpi2p or su3 file")%> :

              -" /> +" />
              <% } // pluginInstallEnabled if (clientshelper.isPluginUpdateEnabled()) { %> -

              <%=intl._("Update All Plugins")%>

              +

              <%=intl._t("Update All Plugins")%>

              - " /> + " />
              <% } // pluginUpdateEnabled diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp index bf1f59d45..56be7b8bd 100644 --- a/apps/routerconsole/jsp/confighome.jsp +++ b/apps/routerconsole/jsp/confighome.jsp @@ -17,7 +17,7 @@ input.default { <%@include file="summary.jsi" %> -

              <%=intl._("I2P Home Page Configuration")%>

              +

              <%=intl._t("I2P Home Page Configuration")%>

              <%@include file="confignav.jsi" %> @@ -26,60 +26,60 @@ input.default { " /> -

              <%=intl._("Default Home Page")%>

              +

              <%=intl._t("Default Home Page")%>

              > - <%=intl._("Use old home page")%> - " > + <%=intl._t("Use old home page")%> + " >
              <% if (homehelper.shouldShowSearch()) { %> -

              <%=intl._("Search Engines")%>

              +

              <%=intl._t("Search Engines")%>

              - " > - " > - " > - " > - " > + " > + " > + " > + " > + " >
              <% } // shouldShowSearch() %> -

              <%=intl._("Hidden Services of Interest")%>

              +

              <%=intl._t("Hidden Services of Interest")%>

              - " > - " > - " > - " > - " > + " > + " > + " > + " > + " >
              -

              <%=intl._("Applications and Configuration")%>

              +

              <%=intl._t("Applications and Configuration")%>

              - " > - " > - " > - " > - " > + " > + " > + " > + " > + " >
              diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index b2f5ef657..3653a9479 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -10,7 +10,7 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Keyring Configuration")%>

              +

              <%=intl._t("I2P Keyring Configuration")%>

              <%@include file="confignav.jsi" %> @@ -18,29 +18,29 @@ <%@include file="formhandler.jsi" %> " /> -

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

              - <%=intl._("The router keyring is used to decrypt encrypted leaseSets.")%> - <%=intl._("The keyring may contain keys for local or remote encrypted destinations.")%>

              +

              <%=intl._t("Keyring")%>

              + <%=intl._t("The router keyring is used to decrypt encrypted leaseSets.")%> + <%=intl._t("The keyring may contain keys for local or remote encrypted destinations.")%>

              -

              <%=intl._("Manual Keyring Addition")%>

              - <%=intl._("Enter keys for encrypted remote destinations here.")%> - <%=intl._("Keys for local destinations must be entered on the")%> <%=intl._("I2PTunnel page")%>. +

              <%=intl._t("Manual Keyring Addition")%>

              + <%=intl._t("Enter keys for encrypted remote destinations here.")%> + <%=intl._t("Keys for local destinations must be entered on the")%> <%=intl._t("I2PTunnel page")%>.

              - + - +
              <%=intl._("Dest. name, hash, or full key")%>:<%=intl._t("Dest. name, hash, or full key")%>:
              <%=intl._("Encryption Key")%>:<%=intl._t("Encryption Key")%>:
              -" > -" > -" > +" > +" > +" >
              diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 9e3be5cc7..84f10ac80 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -13,7 +13,7 @@ " /> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Logging Configuration")%>

              +

              <%=intl._t("I2P Logging Configuration")%>

              <%@include file="confignav.jsi" %> @@ -23,31 +23,31 @@
              -

              <%=intl._("Configure I2P Logging Options")%>

              +

              <%=intl._t("Configure I2P Logging Options")%>

              - - - + + + - + - + - - + - + - +
              <%=intl._("Log file")%>:" value="" > -
              <%=intl._("(the symbol '@' will be replaced during log rotation)")%>
              <%=intl._("Log record format")%>:
              <%=intl._t("Log file")%>:" value="" > +
              <%=intl._t("(the symbol '@' will be replaced during log rotation)")%>
              <%=intl._t("Log record format")%>: " > -
              <%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> +
              <%=intl._t("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%>
              <%=intl._("Log date format")%>:
              <%=intl._t("Log date format")%>: " > -
              <%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> +
              <%=intl._t("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%>
              <%=intl._("Max log file size")%>:
              <%=intl._t("Max log file size")%>: " >
              <%=intl._("Default log level")%>:
              <%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> +
              <%=intl._t("Default log level")%>:
              <%=intl._t("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%>
              <%=intl._("Log level overrides")%>:
              <%=intl._t("Log level overrides")%>:
              <%=intl._("New override")%>:
              <%=intl._t("New override")%>:
              - " > - " > + " > + " >
              diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index 27fdfef7e..7b81518e3 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -13,7 +13,7 @@ " /> -

              <%=intl._("I2P Network Configuration")%>

              +

              <%=intl._t("I2P Network Configuration")%>

              <%@include file="confignav.jsi" %> @@ -23,55 +23,55 @@
              -

              <%=intl._("IP and Transport Configuration")%>

              +

              <%=intl._t("IP and Transport Configuration")%>

              - <%=intl._("The default settings will work for most people.")%> - <%=intl._("There is help below.")%> -

              <%=intl._("UPnP Configuration")%>:
              + <%=intl._t("The default settings will work for most people.")%> + <%=intl._t("There is help below.")%> +

              <%=intl._t("UPnP Configuration")%>:
              > - <%=intl._("Enable UPnP to open firewall ports")%> - <%=intl._("UPnP status")%> -

              <%=intl._("IP Configuration")%>:
              - <%=intl._("Externally reachable hostname or IP address")%>:
              + <%=intl._t("Enable UPnP to open firewall ports")%> - <%=intl._t("UPnP status")%> +

              <%=intl._t("IP Configuration")%>:
              + <%=intl._t("Externally reachable hostname or IP address")%>:
              > - <%=intl._("Use all auto-detect methods")%>
              + <%=intl._t("Use all auto-detect methods")%>
              > - <%=intl._("Disable UPnP IP address detection")%>
              + <%=intl._t("Disable UPnP IP address detection")%>
              > - <%=intl._("Ignore local interface IP address")%>
              + <%=intl._t("Ignore local interface IP address")%>
              > - <%=intl._("Use SSU IP address detection only")%>
              + <%=intl._t("Use SSU IP address detection only")%>
              > - <%=intl._("Hidden mode - do not publish IP")%> <%=intl._("(prevents participating traffic)")%>
              + <%=intl._t("Hidden mode - do not publish IP")%> <%=intl._t("(prevents participating traffic)")%>
              > - <%=intl._("Specify hostname or IP")%>:
              + <%=intl._t("Specify hostname or IP")%>:
              <%=nethelper.getAddressSelector() %>

              - <%=intl._("Action when IP changes")%>:
              + <%=intl._t("Action when IP changes")%>:
              > - <%=intl._("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%> - (<%=intl._("Experimental")%>) + <%=intl._t("Laptop mode - Change router identity and UDP port when IP changes for enhanced anonymity")%> + (<%=intl._t("Experimental")%>)

              - <%=intl._("IPv4 Configuration")%>:
              + <%=intl._t("IPv4 Configuration")%>:
              > - <%=intl._("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%> + <%=intl._t("Disable inbound (Firewalled by Carrier-grade NAT or DS-Lite)")%>

              - <%=intl._("IPv6 Configuration")%>:
              + <%=intl._t("IPv6 Configuration")%>:
              > - <%=intl._("Disable IPv6")%>
              + <%=intl._t("Disable IPv6")%>
              > - <%=intl._("Enable IPv6")%>
              + <%=intl._t("Enable IPv6")%>
              > - <%=intl._("Prefer IPv4 over IPv6")%>
              + <%=intl._t("Prefer IPv4 over IPv6")%>
              > - <%=intl._("Prefer IPv6 over IPv4")%>
              + <%=intl._t("Prefer IPv6 over IPv4")%>
              > - <%=intl._("Use IPv6 only (disable IPv4)")%> - (<%=intl._("Experimental")%>)
              -

              <%=intl._("UDP Configuration:")%>
              - <%=intl._("UDP port:")%> + <%=intl._t("Use IPv6 only (disable IPv4)")%> + (<%=intl._t("Experimental")%>)
              +

              <%=intl._t("UDP Configuration:")%>
              + <%=intl._t("UDP port:")%> " >
              > - <%=intl._("Completely disable")%> <%=intl._("(select only if behind a firewall that blocks outbound UDP)")%>
              + <%=intl._t("Completely disable")%> <%=intl._t("(select only if behind a firewall that blocks outbound UDP)")%>
              <% /******** *********/ %>

              - <%=intl._("TCP Configuration")%>:
              - <%=intl._("Externally reachable hostname or IP address")%>:
              + <%=intl._t("TCP Configuration")%>:
              + <%=intl._t("Externally reachable hostname or IP address")%>:
              > - <%=intl._("Use auto-detected IP address")%> - (<%=intl._("currently")%> ) - <%=intl._("if we are not firewalled")%>
              + <%=intl._t("Use auto-detected IP address")%> + (<%=intl._t("currently")%> ) + <%=intl._t("if we are not firewalled")%>
              > - <%=intl._("Always use auto-detected IP address (Not firewalled)")%>
              + <%=intl._t("Always use auto-detected IP address (Not firewalled)")%>
              > - <%=intl._("Specify hostname or IP")%>: + <%=intl._t("Specify hostname or IP")%>: " >
              > - <%=intl._("Disable inbound (Firewalled)")%>
              + <%=intl._t("Disable inbound (Firewalled)")%>
              > - <%=intl._("Completely disable")%> <%=intl._("(select only if behind a firewall that throttles or blocks outbound TCP)")%>
              + <%=intl._t("Completely disable")%> <%=intl._t("(select only if behind a firewall that throttles or blocks outbound TCP)")%>

              - <%=intl._("Externally reachable TCP port")%>:
              + <%=intl._t("Externally reachable TCP port")%>:
              > - <%=intl._("Use the same port configured for UDP")%> - (<%=intl._("currently")%> )
              + <%=intl._t("Use the same port configured for UDP")%> + (<%=intl._t("currently")%> )
              > - <%=intl._("Specify Port")%>: + <%=intl._t("Specify Port")%>: " >
              -

              <%=intl._("Notes")%>: <%=intl._("a) Do not reveal your port numbers to anyone! b) Changing these settings will restart your router.")%>

              +

              <%=intl._t("Notes")%>: <%=intl._t("a) Do not reveal your port numbers to anyone! b) Changing these settings will restart your router.")%>

              -" > -" > -

              <%=intl._("Configuration Help")%>:

              - <%=intl._("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.")%> +" > +" > +

              <%=intl._t("Configuration Help")%>:

              + <%=intl._t("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.")%>

              - <%=intl._("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%> - <%=intl._("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%> - <%=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._t("If you can, please poke a hole in your firewall to allow unsolicited UDP and TCP packets to reach you.")%> + <%=intl._t("If you can't, I2P supports UPnP (Universal Plug and Play) and UDP hole punching with \"SSU introductions\" to relay traffic.")%> + <%=intl._t("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._t("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")%>: + <%=intl._t("UPnP is used to communicate with Internet Gateway Devices (IGDs) to detect the external IP address and forward ports.")%> + <%=intl._t("UPnP support is beta, and may not work for any number of reasons")%>:

                -
              • <%=intl._("No UPnP-compatible device present")%> -
              • <%=intl._("UPnP disabled on the device")%> -
              • <%=intl._("Software firewall interference with UPnP")%> -
              • <%=intl._("Bugs in the device's UPnP implementation")%> -
              • <%=intl._("Multiple firewall/routers in the internet connection path")%> -
              • <%=intl._("UPnP device change, reset, or address change")%> +
              • <%=intl._t("No UPnP-compatible device present")%> +
              • <%=intl._t("UPnP disabled on the device")%> +
              • <%=intl._t("Software firewall interference with UPnP")%> +
              • <%=intl._t("Bugs in the device's UPnP implementation")%> +
              • <%=intl._t("Multiple firewall/routers in the internet connection path")%> +
              • <%=intl._t("UPnP device change, reset, or address change")%>
              -

              <%=intl._("Review the UPnP status here.")%> -<%=intl._("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%>

              -

              <%=intl._("Hostnames entered above will be published in the network database.")%> - <%=intl._("They are not private.")%> - <%=intl._("Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.")%> - <%=intl._("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%> - <%=intl._("When in doubt, leave the settings at the defaults.")%> +

              <%=intl._t("Review the UPnP status here.")%> +<%=intl._t("UPnP may be enabled or disabled above, but a change requires a router restart to take effect.")%>

              +

              <%=intl._t("Hostnames entered above will be published in the network database.")%> + <%=intl._t("They are not private.")%> + <%=intl._t("Also, do not enter a private IP address like 127.0.0.1 or 192.168.1.1.")%> + <%=intl._t("If you specify the wrong IP address or hostname, or do not properly configure your NAT or firewall, your network performance will degrade substantially.")%> + <%=intl._t("When in doubt, leave the settings at the defaults.")%>

              -

              <%=intl._("Reachability Help")%>:

              - <%=intl._("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.")%> - <%=intl._("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.")%> - <%=intl._("If there is an error, the logs may also help diagnose the problem.")%> +

              <%=intl._t("Reachability Help")%>:

              + <%=intl._t("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.")%> + <%=intl._t("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.")%> + <%=intl._t("If there is an error, the logs may also help diagnose the problem.")%>

                -
              • <%=intl._("OK")%> - - <%=intl._("Your UDP port does not appear to be firewalled.")%> -
              • <%=intl._("Firewalled")%> - - <%=intl._("Your UDP port appears to be firewalled.")%> - <%=intl._("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%> - <%=intl._("However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port.")%> - <%=intl._("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%> - <%=intl._("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%> - <%=intl._("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.")%> - <%=intl._("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.")%> -
              • <%=intl._("Testing")%> - - <%=intl._("The router is currently testing whether your UDP port is firewalled.")%> -
              • <%=intl._("Hidden")%> - - <%=intl._("The router is not configured to publish its address, therefore it does not expect incoming connections.")%> - <%=intl._("Hidden mode is automatically enabled for added protection in certain countries.")%> -
              • <%=intl._("WARN - Firewalled and Fast")%> - - <%=intl._("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%> - <%=intl._("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.")%> -
              • <%=intl._("WARN - Firewalled and Floodfill")%> - - <%=intl._("You have configured I2P to be a floodfill router, but you are firewalled.")%> - <%=intl._("For best participation as a floodfill router, you should open your firewall.")%> -
              • <%=intl._("WARN - Firewalled with Inbound TCP Enabled")%> - - <%=intl._("You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.")%> - <%=intl._("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.")%> - <%=intl._("Please open your firewall or disable inbound TCP above.")%> -
              • <%=intl._("WARN - Firewalled with UDP Disabled")%> - - <%=intl._("You have configured inbound TCP, however you have disabled UDP.")%> - <%=intl._("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%> - <%=intl._("Please open your firewall or enable UDP.")%> -
              • <%=intl._("ERR - Clock Skew")%> - - <%=intl._("Your system's clock is skewed, which will make it difficult to participate in the network.")%> - <%=intl._("Correct your clock setting if this error persists.")%> -
              • <%=intl._("ERR - Private TCP Address")%> - - <%=intl._("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%> - <%=intl._("Correct the address or disable inbound TCP above.")%> -
              • <%=intl._("ERR - SymmetricNAT")%> - - <%=intl._("I2P detected that you are firewalled by a Symmetric NAT.")%> - <%=intl._("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.")%> -
              • <%=intl._("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%> - - <%=intl._("I2P was unable to bind to the configured port noted on the advanced network configuration page .")%> - <%=intl._("Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port.")%> - <%=intl._("This may be a transient error, if the other program is no longer using the port.")%> - <%=intl._("However, a restart is always required after this error.")%> -
              • <%=intl._("ERR - UDP Disabled and Inbound TCP host/port not set")%> - - <%=intl._("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%> - <%=intl._("Therefore your router cannot accept inbound connections.")%> - <%=intl._("Please configure a TCP host and port above or enable UDP.")%> -
              • <%=intl._("ERR - Client Manager I2CP Error - check logs")%> - - <%=intl._("This is usually due to a port 7654 conflict. Check the logs to verify.")%> - <%=intl._("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%> +
              • <%=intl._t("OK")%> - + <%=intl._t("Your UDP port does not appear to be firewalled.")%> +
              • <%=intl._t("Firewalled")%> - + <%=intl._t("Your UDP port appears to be firewalled.")%> + <%=intl._t("As the firewall detection methods are not 100% reliable, this may occasionally be displayed in error.")%> + <%=intl._t("However, if it appears consistently, you should check whether both your external and internal firewalls are open for your port.")%> + <%=intl._t("I2P will work fine when firewalled, there is no reason for concern. When firewalled, the router uses \"introducers\" to relay inbound connections.")%> + <%=intl._t("However, you will get more participating traffic and help the network more if you can open your firewall(s).")%> + <%=intl._t("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.")%> + <%=intl._t("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.")%> +
              • <%=intl._t("Testing")%> - + <%=intl._t("The router is currently testing whether your UDP port is firewalled.")%> +
              • <%=intl._t("Hidden")%> - + <%=intl._t("The router is not configured to publish its address, therefore it does not expect incoming connections.")%> + <%=intl._t("Hidden mode is automatically enabled for added protection in certain countries.")%> +
              • <%=intl._t("WARN - Firewalled and Fast")%> - + <%=intl._t("You have configured I2P to share more than 128KBps of bandwidth, but you are firewalled.")%> + <%=intl._t("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.")%> +
              • <%=intl._t("WARN - Firewalled and Floodfill")%> - + <%=intl._t("You have configured I2P to be a floodfill router, but you are firewalled.")%> + <%=intl._t("For best participation as a floodfill router, you should open your firewall.")%> +
              • <%=intl._t("WARN - Firewalled with Inbound TCP Enabled")%> - + <%=intl._t("You have configured inbound TCP, however your UDP port is firewalled, and therefore it is likely that your TCP port is firewalled as well.")%> + <%=intl._t("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.")%> + <%=intl._t("Please open your firewall or disable inbound TCP above.")%> +
              • <%=intl._t("WARN - Firewalled with UDP Disabled")%> - + <%=intl._t("You have configured inbound TCP, however you have disabled UDP.")%> + <%=intl._t("You appear to be firewalled on TCP, therefore your router cannot accept inbound connections.")%> + <%=intl._t("Please open your firewall or enable UDP.")%> +
              • <%=intl._t("ERR - Clock Skew")%> - + <%=intl._t("Your system's clock is skewed, which will make it difficult to participate in the network.")%> + <%=intl._t("Correct your clock setting if this error persists.")%> +
              • <%=intl._t("ERR - Private TCP Address")%> - + <%=intl._t("You must never advertise an unroutable IP address such as 127.0.0.1 or 192.168.1.1 as your external address.")%> + <%=intl._t("Correct the address or disable inbound TCP above.")%> +
              • <%=intl._t("ERR - SymmetricNAT")%> - + <%=intl._t("I2P detected that you are firewalled by a Symmetric NAT.")%> + <%=intl._t("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.")%> +
              • <%=intl._t("ERR - UDP Port In Use - Set i2np.udp.internalPort=xxxx in advanced config and restart")%> - + <%=intl._t("I2P was unable to bind to the configured port noted on the advanced network configuration page .")%> + <%=intl._t("Check to see if another program is using the configured port. If so, stop that program or configure I2P to use a different port.")%> + <%=intl._t("This may be a transient error, if the other program is no longer using the port.")%> + <%=intl._t("However, a restart is always required after this error.")%> +
              • <%=intl._t("ERR - UDP Disabled and Inbound TCP host/port not set")%> - + <%=intl._t("You have not configured inbound TCP with a hostname and port above, however you have disabled UDP.")%> + <%=intl._t("Therefore your router cannot accept inbound connections.")%> + <%=intl._t("Please configure a TCP host and port above or enable UDP.")%> +
              • <%=intl._t("ERR - Client Manager I2CP Error - check logs")%> - + <%=intl._t("This is usually due to a port 7654 conflict. Check the logs to verify.")%> + <%=intl._t("Do you have another I2P instance running? Stop the conflicting program and restart I2P.")%>
              <% /******** <% } %>
              -

              <%=intl._("Adjust Profile Bonuses")%>

              -

              <%=intl._("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")%> <%=intl._("profiles page")%>.

              +

              <%=intl._t("Adjust Profile Bonuses")%>

              +

              <%=intl._t("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")%> <%=intl._t("profiles page")%>.

              <% long speed = 0; long capacity = 0; if (! "".equals(peer)) { // get existing bonus values? } %> -

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

              <%=intl._t("Speed")%>: - <%=intl._("Capacity")%>: + <%=intl._t("Capacity")%>: - " />

              + " />

              -

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

              +

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

              " /> <% profilesHelper.storeWriter(out); %> -

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

              +

              <%=intl._t("Banned IPs")%>

              diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index de2351e9e..ebc94b9c9 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -13,107 +13,107 @@ " /> -

              <%=intl._("I2P Reseeding Configuration")%>

              +

              <%=intl._t("I2P Reseeding Configuration")%>

              <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -

              <%=intl._("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%> -<%=intl._("If reseeding has failed, you should first check your network connection.")%> -<%=intl._("See {0} for instructions on reseeding manually.", "" + intl._("the FAQ") + "")%> +

              <%=intl._t("Reseeding is the bootstrapping process used to find other routers when you first install I2P, or when your router has too few router references remaining.")%> +<%=intl._t("If reseeding has failed, you should first check your network connection.")%> +<%=intl._t("See {0} for instructions on reseeding manually.", "" + intl._t("the FAQ") + "")%>

              -

              <%=intl._("Manual Reseed from URL")%>

              -

              <%=intl._("Enter zip or su3 URL")%> : +

              <%=intl._t("Manual Reseed from URL")%>

              +

              <%=intl._t("Enter zip or su3 URL")%> : -
              <%=intl._("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> -<%=intl._("The zip format is unsigned; use a zip file only from a source that you trust.")%> +
              <%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> +<%=intl._t("The zip format is unsigned; use a zip file only from a source that you trust.")%>

              -" /> +" />
              -

              <%=intl._("Manual Reseed from File")%>

              -

              <%=intl._("Select zip or su3 file")%> : +

              <%=intl._t("Manual Reseed from File")%>

              +

              <%=intl._t("Select zip or su3 file")%> : -
              <%=intl._("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> -<%=intl._("The zip format is unsigned; use a zip file only from a source that you trust.")%> +
              <%=intl._t("The su3 format is preferred, as it will be verified as signed by a trusted source.")%> +<%=intl._t("The zip format is unsigned; use a zip file only from a source that you trust.")%>

              -" /> +" />
              -

              <%=intl._("Create Reseed File")%>

              -

              <%=intl._("Create a new reseed zip file you may share for others to reseed manually.")%> -<%=intl._("This file will never contain your own router's identity or IP.")%> +

              <%=intl._t("Create Reseed File")%>

              +

              <%=intl._t("Create a new reseed zip file you may share for others to reseed manually.")%> +<%=intl._t("This file will never contain your own router's identity or IP.")%>

              -" /> +" />
              -

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

              -

              <%=intl._("The default settings will work for most people.")%> -<%=intl._("Change these only if HTTPS is blocked by a restrictive firewall and reseed has failed.")%> +

              <%=intl._t("Reseeding Configuration")%>

              +

              <%=intl._t("The default settings will work for most people.")%> +<%=intl._t("Change these only if HTTPS is blocked by a restrictive firewall and reseed has failed.")%>

              - + - +<%=intl._t("Use non-SSL only")%> + - + - + - + - + - + - +
              <%=intl._("Reseed URL Selection")%>:
              <%=intl._t("Reseed URL Selection")%>: > -<%=intl._("Try SSL first then non-SSL")%>
              +<%=intl._t("Try SSL first then non-SSL")%>
              > -<%=intl._("Use SSL only")%>
              +<%=intl._t("Use SSL only")%>
              > -<%=intl._("Use non-SSL only")%>
              <%=intl._("Reseed URLs")%>:
              <%=intl._t("Reseed URLs")%>: -
              " />
              +
              " />
              <%=intl._("Enable HTTP Proxy?")%>
              <%=intl._t("Enable HTTP Proxy?")%> >
              <%=intl._("HTTP Proxy Host")%>:
              <%=intl._t("HTTP Proxy Host")%>: " >
              <%=intl._("HTTP Proxy Port")%>:
              <%=intl._t("HTTP Proxy Port")%>: " >
              <%=intl._("Use HTTP Proxy Authorization?")%>
              <%=intl._t("Use HTTP Proxy Authorization?")%> >
              <%=intl._("HTTP Proxy Username")%>:
              <%=intl._t("HTTP Proxy Username")%>: " >
              <%=intl._("HTTP Proxy Password")%>:
              <%=intl._t("HTTP Proxy Password")%>: " >
              -" /> -" /> -" /> +" /> +" /> +" />
              diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index f12c9b95c..987aefdeb 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -10,7 +10,7 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Service Configuration")%>

              +

              <%=intl._t("I2P Service Configuration")%>

              <%@include file="confignav.jsi" %> @@ -19,63 +19,63 @@
              -

              <%=intl._("Shutdown the router")%>

              -

              <%=intl._("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%> - <%=intl._("If you need to kill the router immediately, that option is available as well.")%>

              +

              <%=intl._t("Shutdown the router")%>

              +

              <%=intl._t("Graceful shutdown lets the router satisfy the agreements it has already made before shutting down, but may take a few minutes.")%> + <%=intl._t("If you need to kill the router immediately, that option is available as well.")%>

              - " > - " > + " > + " > <% if (formhandler.shouldShowCancelGraceful()) { %> - " > + " > <% } %>
              <% if (System.getProperty("wrapper.version") != null) { %> -

              <%=intl._("If you want the router to restart itself after shutting down, you can choose one of the following.")%> - <%=intl._("This is useful in some situations - for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on.")%> - <%=intl._("A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately.")%> - <%=intl._("After tearing down the router, it will wait 1 minute before starting back up again.")%>

              +

              <%=intl._t("If you want the router to restart itself after shutting down, you can choose one of the following.")%> + <%=intl._t("This is useful in some situations - for example, if you changed some settings that client applications only read at startup, such as the routerconsole password or the interface it listens on.")%> + <%=intl._t("A graceful restart will take a few minutes (but your peers will appreciate your patience), while a hard restart does so immediately.")%> + <%=intl._t("After tearing down the router, it will wait 1 minute before starting back up again.")%>

              - " > - " > + " > + " > <% } %>
              <% if ( (System.getProperty("os.name") != null) && (System.getProperty("os.name").startsWith("Win")) ) { %> -

              <%=intl._("Systray integration")%>

              -

              <%=intl._("On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status")%> - <%=intl._("(later on, I2P client applications will be able to integrate their own functionality into the system tray as well).")%> - <%=intl._("If you are on windows, you can either enable or disable that icon here.")%>

              +

              <%=intl._t("Systray integration")%>

              +

              <%=intl._t("On the windows platform, there is a small application to sit in the system tray, allowing you to view the router's status")%> + <%=intl._t("(later on, I2P client applications will be able to integrate their own functionality into the system tray as well).")%> + <%=intl._t("If you are on windows, you can either enable or disable that icon here.")%>

              - " > - " > + " > + " >
              -

              <%=intl._("Run on startup")%>

              -

              <%=intl._("You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly.")%> - <%=intl._("If you prefer the command line, you can also run the ")%> install_i2p_service_winnt.bat (<%=intl._("or")%> +

              <%=intl._t("Run on startup")%>

              +

              <%=intl._t("You can control whether I2P is run on startup or not by selecting one of the following options - I2P will install (or remove) a service accordingly.")%> + <%=intl._t("If you prefer the command line, you can also run the ")%> install_i2p_service_winnt.bat (<%=intl._t("or")%> uninstall_i2p_service_winnt.bat).

              - " > -" >
              -

              <%=intl._("Note")%>: <%=intl._("If you are running I2P as service right now, removing it will shut down your router immediately.")%> - <%=intl._("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%>

              + " > +" >
              +

              <%=intl._t("Note")%>: <%=intl._t("If you are running I2P as service right now, removing it will shut down your router immediately.")%> + <%=intl._t("You may want to consider shutting down gracefully, as above, then running uninstall_i2p_service_winnt.bat.")%>

              <% } %> -

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

              -

              <%=intl._("View the job queue")%> +

              <%=intl._t("Debugging")%>

              +

              <%=intl._t("View the job queue")%> <% if (System.getProperty("wrapper.version") != null) { %> -

              <%=intl._("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

              +

              <%=intl._t("At times, it may be helpful to debug I2P by getting a thread dump. To do so, please select the following option and review the thread dumped to wrapper.log.")%>

              <% } %>
              - " > + " > <% if (System.getProperty("wrapper.version") != null) { %> - " > + " > <% } %>
              -

              <%=intl._("Launch browser on router startup?")%>

              -

              <%=intl._("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> +

              <%=intl._t("Launch browser on router startup?")%>

              +

              <%=intl._t("I2P's main configuration interface is this web console, so for your convenience I2P can launch a web browser on startup pointing at")%> http://127.0.0.1:7657/ .

              - " > - " > + " > + " >
              diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp index 129feaa10..63c3ed18c 100644 --- a/apps/routerconsole/jsp/configsidebar.jsp +++ b/apps/routerconsole/jsp/configsidebar.jsp @@ -17,7 +17,7 @@ input.default { <%@include file="summary.jsi" %> -

              <%=intl._("I2P Summary Bar Configuration")%>

              +

              <%=intl._t("I2P Summary Bar Configuration")%>

              <%@include file="confignav.jsi" %> @@ -29,23 +29,23 @@ input.default { " /> -

              <%=intl._("Refresh Interval")%>

              +

              <%=intl._t("Refresh Interval")%>

              " > - <%=intl._("seconds")%> - " > + <%=intl._t("seconds")%> + " >
              -

              <%=intl._("Customize Summary Bar")%>

              +

              <%=intl._t("Customize Summary Bar")%>

              - " > - " > + " > + " >
              diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 4100a4b1e..802d615e5 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -61,7 +61,7 @@ function toggleAll(category) <%@include file="summary.jsi" %> -

              <%=intl._("I2P Stats Configuration")%>

              +

              <%=intl._t("I2P Stats Configuration")%>

              <%@include file="confignav.jsi" %> @@ -73,44 +73,44 @@ function toggleAll(category)
              -

              <%=intl._("Configure I2P Stat Collection")%>

              -

              <%=intl._("Enable full stats?")%> +

              <%=intl._t("Configure I2P Stat Collection")%>

              +

              <%=intl._t("Enable full stats?")%> checked="checked" <% } %> > - (<%=intl._("change requires restart to take effect")%>)
              + (<%=intl._t("change requires restart to take effect")%>)
              <% // stats.log for devs only and grows without bounds, not recommended boolean shouldShowLog = statshelper.shouldShowLog(); if (shouldShowLog) { -%><%=intl._("Stat file")%>:
              +%><%=intl._t("Stat file")%>:
              Warning - Log with care, stat file grows without limit.
              <% } // shouldShowLog -%><%=intl._("Filter")%>: (<%=intl._("toggle all")%>)

              +%><%=intl._t("Filter")%>: (<%=intl._t("toggle all")%>)

              <% while (statshelper.hasMoreStats()) { while (statshelper.groupRequired()) { %> <% if (shouldShowLog) { -%> +%> <% } // shouldShowLog -%> +%> <% } // end iterating over required groups for the current stat %> @@ -139,14 +139,14 @@ Warning - Log with care, stat file grows without limit.
              %> - <% } // shouldShowLog %>
              > - <%=intl._(statshelper.getCurrentGroupName())%> - (<%=intl._("toggle all")%>) + <%=intl._t(statshelper.getCurrentGroupName())%> + (<%=intl._t("toggle all")%>)
              <%=intl._("Log")%><%=intl._t("Log")%><%=intl._("Graph")%><%=intl._t("Graph")%>
              <%=intl._("Advanced filter")%>: + <%=intl._t("Advanced filter")%>:
              -" > -" > +" > +" >
              diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index de82f0027..09a2ceee9 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -13,28 +13,28 @@ " /> -

              <%=intl._("I2P Tunnel Configuration")%>

              +

              <%=intl._t("I2P Tunnel Configuration")%>

              <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %>

              - <%=intl._("NOTE")%>: - <%=intl._("The default settings work for most people.")%> - <%=intl._("There is a fundamental tradeoff between anonymity and performance.")%> - <%=intl._("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.")%> - <%=intl._("High CPU and/or high outbound bandwidth usage may result.")%> - <%=intl._("Change these settings with care, and adjust them if you have problems.")%> + <%=intl._t("NOTE")%>: + <%=intl._t("The default settings work for most people.")%> + <%=intl._t("There is a fundamental tradeoff between anonymity and performance.")%> + <%=intl._t("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.")%> + <%=intl._t("High CPU and/or high outbound bandwidth usage may result.")%> + <%=intl._t("Change these settings with care, and adjust them if you have problems.")%>

              - <%=intl._("Note")%>: <%=intl._("Exploratory tunnel setting changes are stored in the router.config file.")%> - <%=intl._("Client tunnel changes are temporary and are not saved.")%> -<%=intl._("To make permanent client tunnel changes see the")%> <%=intl._("i2ptunnel page")%>. + <%=intl._t("Note")%>: <%=intl._t("Exploratory tunnel setting changes are stored in the router.config file.")%> + <%=intl._t("Client tunnel changes are temporary and are not saved.")%> +<%=intl._t("To make permanent client tunnel changes see the")%> <%=intl._t("i2ptunnel page")%>.
              -" > -" > +" > +" >
              diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 7635ab1e3..73d0ec565 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -22,14 +22,14 @@ input.default { " /> -

              <%=uihelper._("I2P UI Configuration")%>

              +

              <%=uihelper._t("I2P UI Configuration")%>

              <%@include file="confignav.jsi" %> <%@include file="formhandler.jsi" %> -

              <%=uihelper._("Router Console Theme")%>

              +

              <%=uihelper._t("Router Console Theme")%>

              @@ -40,28 +40,28 @@ input.default { %> <% } else { %> -<%=uihelper._("Theme selection disabled for Internet Explorer, sorry.")%> +<%=uihelper._t("Theme selection disabled for Internet Explorer, sorry.")%>
              -<%=uihelper._("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.")%> +<%=uihelper._t("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.")%> <% } %> -

              <%=uihelper._("Router Console Language")%>

              +

              <%=uihelper._t("Router Console Language")%>

              -

              <%=uihelper._("Please contribute to the router console translation project! Contact the developers in #i2p-dev on IRC to help.")%> +

              <%=uihelper._t("Please contribute to the router console translation project! Contact the developers in #i2p-dev on IRC to help.")%>

              -" > -" > +" > +" >
              -

              <%=uihelper._("Router Console Password")%>

              +

              <%=uihelper._t("Router Console Password")%>

              - " > - " > - " > - " > + " > + " > + " > + " >
              diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index 1171fbcab..e1e073404 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -11,7 +11,7 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Update Configuration")%>

              +

              <%=intl._t("I2P Update Configuration")%>

              <%@include file="confignav.jsi" %> @@ -27,57 +27,57 @@ <% /* set hidden default */ %> <% if (updatehelper.canInstall()) { %> -

              <%=intl._("Check for I2P and news updates")%>

              +

              <%=intl._t("Check for I2P and news updates")%>

              - + <% } else { %> -

              <%=intl._("Check for news updates")%>

              +

              <%=intl._t("Check for news updates")%>

              <%=intl._("News & I2P Updates")%>:
              <%=intl._t("News & I2P Updates")%>:
              - + <% } // if canInstall %> - - + - <% if (updatehelper.canInstall()) { %> - + <% } // if canInstall %> - + - + <% if (updatehelper.isAdvanced()) { %> - + - + <% } // if isAdvanced %> <% if (updatehelper.canInstall()) { %> <% if (updatehelper.isAdvanced()) { %> - + - + - + - + - + - + <% } // if isAdvanced %> <% } else { %> - + <% } // if canInstall %>
              <%=intl._("News Updates")%>:
              <%=intl._t("News Updates")%>: <% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <%=intl._("Update In Progress")%>
              <% } else { %> " /> +               		<% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %> <%=intl._t("Update In Progress")%>
              <% } else { %> " /> <% } %>

              <%=intl._("News URL")%>:
              <%=intl._t("News URL")%>: readonly="readonly"<% } %> value="">
              <%=intl._("Refresh frequency")%>: +
              <%=intl._t("Refresh frequency")%>:
              <%=formhandler._("Update policy")%>:
              <%=formhandler._t("Update policy")%>:
              <%=intl._("Fetch news through the eepProxy?")%>
              <%=intl._t("Fetch news through the eepProxy?")%>
              <%=intl._("Update through the eepProxy?")%>
              <%=intl._t("Update through the eepProxy?")%>
              <%=intl._("eepProxy host")%>:
              <%=intl._t("eepProxy host")%>: " />
              <%=intl._("eepProxy port")%>:
              <%=intl._t("eepProxy port")%>: " />
              <%=intl._("Update URLs")%>:
              <%=intl._t("Update URLs")%>:
              <%=intl._("Trusted keys")%>:
              <%=intl._t("Trusted keys")%>:
              <%=intl._("Update with signed development builds?")%>
              <%=intl._t("Update with signed development builds?")%>
              <%=intl._("Signed Build URL")%>:
              <%=intl._t("Signed Build URL")%>: ">
              <%=intl._("Update with unsigned development builds?")%>
              <%=intl._t("Update with unsigned development builds?")%>
              <%=intl._("Unsigned Build URL")%>:
              <%=intl._t("Unsigned Build URL")%>: ">
              <%=intl._("Updates will be dispatched via your package manager.")%>
              <%=intl._t("Updates will be dispatched via your package manager.")%>
              - " > - " > + " > + " >
              diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp index ffed509dd..1cff1e369 100644 --- a/apps/routerconsole/jsp/console.jsp +++ b/apps/routerconsole/jsp/console.jsp @@ -15,7 +15,7 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Router Console")%>

              +

              <%=intl._t("I2P Router Console")%>

              <% if (newshelper.shouldShowNews()) { @@ -61,7 +61,7 @@ Tiếng Việt
              -

              <%=intl._("Welcome to I2P")%>

              +

              <%=intl._t("Welcome to I2P")%>

              <% java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getBaseDir(), "docs/readme.html"); %> diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp index 8080c115b..23a353416 100644 --- a/apps/routerconsole/jsp/dns.jsp +++ b/apps/routerconsole/jsp/dns.jsp @@ -30,11 +30,11 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Addressbook")%> ">images/newtab.png" />

              +

              <%=intl._t("I2P Addressbook")%> ">images/newtab.png" />

              <% diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp index 5dfba993e..663b61431 100644 --- a/apps/routerconsole/jsp/error.jsp +++ b/apps/routerconsole/jsp/error.jsp @@ -25,6 +25,6 @@ <%@include file="summary.jsi" %>

              <%=ERROR_CODE%> <%=ERROR_MESSAGE%>

              -<%=intl._("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%>
              -<%=intl._("Error 404")%>: <%=ERROR_URI%> <%=intl._("not found")%>. +<%=intl._t("Sorry! You appear to be requesting a non-existent Router Console page or resource.")%>
              +<%=intl._t("Error 404")%>: <%=ERROR_URI%> <%=intl._t("not found")%>.
              diff --git a/apps/routerconsole/jsp/error500.jsp b/apps/routerconsole/jsp/error500.jsp index 223b4d5de..c56b1f7ea 100644 --- a/apps/routerconsole/jsp/error500.jsp +++ b/apps/routerconsole/jsp/error500.jsp @@ -22,26 +22,26 @@
              -"><%=intl._(" border="0">
              -<%=intl._("Configuration")%> <%=intl._("Help")%> +"><%=intl._t(" border="0">
              +<%=intl._t("Configuration")%> <%=intl._t("Help")%>

              <%=ERROR_CODE%> <%=ERROR_MESSAGE%>

              -<%=intl._("Sorry! There has been an internal error.")%> +<%=intl._t("Sorry! There has been an internal error.")%>

              <% /* note to translators - both parameters are URLs */ -%><%=intl._("Please report bugs on {0} or {1}.", +%><%=intl._t("Please report bugs on {0} or {1}.", "trac.i2p2.i2p", "trac.i2p2.de")%> -

              <%=intl._("Please include this information in bug reports")%>: +

              <%=intl._t("Please include this information in bug reports")%>:

              -

              <%=intl._("Error Details")%>

              +

              <%=intl._t("Error Details")%>

              -<%=intl._("Error {0}", ERROR_CODE)%>: <%=ERROR_URI%> <%=ERROR_MESSAGE%> +<%=intl._t("Error {0}", ERROR_CODE)%>: <%=ERROR_URI%> <%=ERROR_MESSAGE%>

              <% if (ERROR_THROWABLE != null) { @@ -56,7 +56,7 @@ } %>

              -

              <%=intl._("I2P Version and Running Environment")%>

              +

              <%=intl._t("I2P Version and Running Environment")%>

              I2P version: <%=net.i2p.router.RouterVersion.FULL_VERSION%>
              Java version: <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)
              @@ -71,5 +71,5 @@ Jbigi: <%=net.i2p.util.NativeBigInteger.loadStatus()%>
              Encoding: <%=System.getProperty("file.encoding")%>
              Charset: <%=java.nio.charset.Charset.defaultCharset().name()%>

              -

              <%=intl._("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>

              +

              <%=intl._t("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>

              diff --git a/apps/routerconsole/jsp/events.jsp b/apps/routerconsole/jsp/events.jsp index b67aa5dd5..29838e7a7 100644 --- a/apps/routerconsole/jsp/events.jsp +++ b/apps/routerconsole/jsp/events.jsp @@ -18,7 +18,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Event Log")%>

              +

              <%=intl._t("I2P Event Log")%>

              diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp index 92c6f508f..1d5c5bf1f 100644 --- a/apps/routerconsole/jsp/graph.jsp +++ b/apps/routerconsole/jsp/graph.jsp @@ -16,7 +16,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Performance Graphs")%>

              +

              <%=intl._t("I2P Performance Graphs")%>

              diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index 8d4aff752..6cde50131 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -23,7 +23,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Performance Graphs")%>

              +

              <%=intl._t("I2P Performance Graphs")%>

              diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index 8553e56e6..ec00c6b08 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -23,12 +23,12 @@
              <% if (!intl.allowIFrame(request.getHeader("User-Agent"))) { %> - <%=intl._("Summary Bar")%> + <%=intl._t("Summary Bar")%> <% } %> @@ -39,7 +39,7 @@
              -

              <%=intl._("I2P Router Console")%>

              +

              <%=intl._t("I2P Router Console")%>

              <% if (newshelper.shouldShowNews()) { @@ -57,7 +57,7 @@ " /> <% if (homehelper.shouldShowWelcome()) { %> -
              "> +
              ">
              English عربية @@ -87,7 +87,7 @@ Українська Tiếng Việt
              -

              <%=intl._("Welcome to I2P")%>

              +

              <%=intl._t("Welcome to I2P")%>

              <% } // shouldShowWelcome %> @@ -100,7 +100,7 @@ - - - + + + - + @@ -172,8 +172,8 @@ ${book.loadBookMessages}

              -" > -" > +" > +" >

              @@ -188,14 +188,14 @@ ${book.loadBookMessages} -" /> +" />

              <% /* book.notEmpty */ %>
              -

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

              +

              <%=intl._t("This address book is empty.")%>

               @@ -204,16 +204,16 @@ ${book.loadBookMessages}
              -

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

              +

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

              - + " /> @@ -112,11 +112,11 @@ } // shouldShowSearch() %>
              -

              <%=intl._("Hidden Services of Interest")%>

              +

              <%=intl._t("Hidden Services of Interest")%>


              -

              <%=intl._("Applications and Configuration")%>

              +

              <%=intl._t("Applications and Configuration")%>


               
              diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp index 45ff895a6..a4a5ff6b7 100644 --- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp +++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp @@ -52,11 +52,11 @@ <%@include file="summary.jsi" %> -

              <%=intl._("Hidden Services Manager")%> ">images/newtab.png" />

              +

              <%=intl._t("Hidden Services Manager")%> ">images/newtab.png" />

              <% diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp index b9b8d21bf..c77ba192e 100644 --- a/apps/routerconsole/jsp/jobs.jsp +++ b/apps/routerconsole/jsp/jobs.jsp @@ -9,7 +9,7 @@ <%@include file="summaryajax.jsi" %> -<%@include file="summary.jsi" %>

              <%=intl._("I2P Router Job Queue")%>

              +<%@include file="summary.jsi" %>

              <%=intl._t("I2P Router Job Queue")%>

              " /> diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 99d518cbb..8840545f2 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -9,18 +9,18 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Router Logs")%>

              +

              <%=intl._t("I2P Router Logs")%>

              -

              <%=intl._("I2P Version and Running Environment")%>

              +

              <%=intl._t("I2P Version and Running Environment")%>

              <% /* note to translators - both parameters are URLs */ -%><%=intl._("Please report bugs on {0} or {1}.", +%><%=intl._t("Please report bugs on {0} or {1}.", "trac.i2p2.i2p", "trac.i2p2.de")%> -

              <%=intl._("Please include this information in bug reports")%>: +

              <%=intl._t("Please include this information in bug reports")%>:

              I2P version: <%=net.i2p.router.RouterVersion.FULL_VERSION%>
              Java version: <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)
              @@ -36,13 +36,13 @@ Encoding: <%=System.getProperty("file.encoding")%>
              Charset: <%=java.nio.charset.Charset.defaultCharset().name()%>

              -

              <%=intl._("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>

              -

              <%=intl._("Critical Logs")%>

              +

              <%=intl._t("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%>

              +

              <%=intl._t("Critical Logs")%>

              -

              <%=intl._("Router Logs")%> (<%=intl._("configure")%>)

              +

              <%=intl._t("Router Logs")%> (<%=intl._t("configure")%>)

              -

              <%=intl._("Event Logs")%>

              - <%=intl._("View event logs")%> -

              <%=intl._("Service (Wrapper) Logs")%>

              +

              <%=intl._t("Event Logs")%>

              + <%=intl._t("View event logs")%> +

              <%=intl._t("Service (Wrapper) Logs")%>

              diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index 15231ec85..1b9be5d03 100644 --- a/apps/routerconsole/jsp/netdb.jsp +++ b/apps/routerconsole/jsp/netdb.jsp @@ -10,7 +10,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Network Database")%>

              +

              <%=intl._t("I2P Network Database")%>

              diff --git a/apps/routerconsole/jsp/news.jsp b/apps/routerconsole/jsp/news.jsp index 422c8b48f..f85836a40 100644 --- a/apps/routerconsole/jsp/news.jsp +++ b/apps/routerconsole/jsp/news.jsp @@ -9,7 +9,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("Latest News")%>

              +

              <%=intl._t("Latest News")%>

              " /> diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp index c94866ce3..8d3e22768 100644 --- a/apps/routerconsole/jsp/nowebapp.jsp +++ b/apps/routerconsole/jsp/nowebapp.jsp @@ -11,8 +11,8 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

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

              +

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

              -<%=intl._("The requested web application is not running.")%> -<%=intl._("Please visit the {0}config clients page{1} to start it.", "", "")%> +<%=intl._t("The requested web application is not running.")%> +<%=intl._t("Please visit the {0}config clients page{1} to start it.", "", "")%>
              diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp index 0fd2fa9cb..70cb9d93e 100644 --- a/apps/routerconsole/jsp/peers.jsp +++ b/apps/routerconsole/jsp/peers.jsp @@ -10,7 +10,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Network Peers")%>

              +

              <%=intl._t("I2P Network Peers")%>

              " /> diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index 725be7a43..c2ffaba3e 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -10,7 +10,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("I2P Network Peer Profiles")%>

              +

              <%=intl._t("I2P Network Peer Profiles")%>

              " /> diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp index cf87ed383..ac53608e2 100644 --- a/apps/routerconsole/jsp/stats.jsp +++ b/apps/routerconsole/jsp/stats.jsp @@ -14,7 +14,7 @@ " /> <% oldhelper.storeWriter(out); %> " /> -

              <%=intl._("I2P Router Statistics")%>

              +

              <%=intl._t("I2P Router Statistics")%>

              diff --git a/apps/routerconsole/jsp/summary.jsi b/apps/routerconsole/jsp/summary.jsi index d9f62f247..9768d9585 100644 --- a/apps/routerconsole/jsp/summary.jsi +++ b/apps/routerconsole/jsp/summary.jsi @@ -42,7 +42,7 @@ } else { // Text browsers don't render the two divs side-by-side, so just provide a link out.print(""); - out.print(intl._("Summary Bar")); + out.print(intl._t("Summary Bar")); out.print(""); } @@ -55,11 +55,11 @@ out.print("
              \n"); } else { diff --git a/apps/routerconsole/jsp/summaryajax.jsi b/apps/routerconsole/jsp/summaryajax.jsi index ebd1020c7..13abfce24 100644 --- a/apps/routerconsole/jsp/summaryajax.jsi +++ b/apps/routerconsole/jsp/summaryajax.jsi @@ -1,5 +1,5 @@ diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index cb27feab2..3107bb96a 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -68,10 +68,10 @@ out.print("
              \n
              \n"); if (intl.getDisableRefresh()) { out.print(""); - out.print(intl._("Refresh (s)")); + out.print(intl._t("Refresh (s)")); out.print(": \n"); out.print("
              \n"); } diff --git a/apps/routerconsole/jsp/summarynoframe.jsi b/apps/routerconsole/jsp/summarynoframe.jsi index 6fae7c901..69ac9afd0 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsi +++ b/apps/routerconsole/jsp/summarynoframe.jsi @@ -8,7 +8,7 @@ %>
              diff --git a/apps/routerconsole/jsp/torrents.jsp b/apps/routerconsole/jsp/torrents.jsp index 7f4e8fd53..7ac23775c 100644 --- a/apps/routerconsole/jsp/torrents.jsp +++ b/apps/routerconsole/jsp/torrents.jsp @@ -30,11 +30,11 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Torrent Downloader")%> ">images/newtab.png" />

              +

              <%=intl._t("I2P Torrent Downloader")%> ">images/newtab.png" />

              <% diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp index 02b6e471e..41f25df0f 100644 --- a/apps/routerconsole/jsp/tunnels.jsp +++ b/apps/routerconsole/jsp/tunnels.jsp @@ -9,7 +9,7 @@ <%@include file="summaryajax.jsi" %> -<%@include file="summary.jsi" %>

              <%=intl._("I2P Tunnel Summary")%>

              +<%@include file="summary.jsi" %>

              <%=intl._t("I2P Tunnel Summary")%>

              " /> diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp index c353bbaf6..693d00350 100644 --- a/apps/routerconsole/jsp/viewprofile.jsp +++ b/apps/routerconsole/jsp/viewprofile.jsp @@ -10,7 +10,7 @@ <%@include file="summaryajax.jsi" %> <%@include file="summary.jsi" %> -

              <%=intl._("Peer Profile")%>

              +

              <%=intl._t("Peer Profile")%>

              <% String peerB64 = request.getParameter("peer"); @@ -24,7 +24,7 @@ " /> <% stathelper.storeWriter(out); %> -

              <%=intl._("Profile for peer {0}", peerB64)%>

              +

              <%=intl._t("Profile for peer {0}", peerB64)%>
              diff --git a/apps/routerconsole/jsp/webmail.jsp b/apps/routerconsole/jsp/webmail.jsp index f287996c5..ad7abe05e 100644 --- a/apps/routerconsole/jsp/webmail.jsp +++ b/apps/routerconsole/jsp/webmail.jsp @@ -30,11 +30,11 @@ <%@include file="summary.jsi" %> -

              <%=intl._("I2P Webmail")%> ">images/newtab.png" />

              +

              <%=intl._t("I2P Webmail")%> ">images/newtab.png" />

              <% diff --git a/apps/routerconsole/locale/messages_ar.po b/apps/routerconsole/locale/messages_ar.po index 408645877..8ff6cae97 100644 --- a/apps/routerconsole/locale/messages_ar.po +++ b/apps/routerconsole/locale/messages_ar.po @@ -574,7 +574,7 @@ msgstr "عتبة بداية بطيئة" msgid "The round trip time in milliseconds" msgstr "الوقت الذهاب وإياب في جزء ثانية" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3629,7 +3629,7 @@ msgstr[5] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_cs.po b/apps/routerconsole/locale/messages_cs.po index 761950db6..936a8da83 100644 --- a/apps/routerconsole/locale/messages_cs.po +++ b/apps/routerconsole/locale/messages_cs.po @@ -545,7 +545,7 @@ msgstr "Pomalý start prahu." msgid "The round trip time in milliseconds" msgstr "Round trip time v milisekundách" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3582,7 +3582,7 @@ msgstr[2] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_da.po b/apps/routerconsole/locale/messages_da.po index 033b936fe..35a47e205 100644 --- a/apps/routerconsole/locale/messages_da.po +++ b/apps/routerconsole/locale/messages_da.po @@ -537,7 +537,7 @@ msgstr "Den langsomme starttilstand" msgid "The round trip time in milliseconds" msgstr "Fra start til slut i millisekunder" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3568,7 +3568,7 @@ msgstr[1] "{0} plugins opdateret" msgid "Plugin update check complete" msgstr "Plugin opdatering tjek komplet" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_de.po b/apps/routerconsole/locale/messages_de.po index a046a3201..993d8c9ec 100644 --- a/apps/routerconsole/locale/messages_de.po +++ b/apps/routerconsole/locale/messages_de.po @@ -552,7 +552,7 @@ msgstr "Grenzwert zum verzögertem Starten" msgid "The round trip time in milliseconds" msgstr "Rundenzeit zum Server und zurück in Millisekunden" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3583,7 +3583,7 @@ msgstr[1] "{0} Zusatzprogramme aktualisiert" msgid "Plugin update check complete" msgstr "Überprüfung auf Aktualisierungen der Zusatzprogramme abgeschlossen" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_el.po b/apps/routerconsole/locale/messages_el.po index 48966945f..a437273bc 100644 --- a/apps/routerconsole/locale/messages_el.po +++ b/apps/routerconsole/locale/messages_el.po @@ -540,7 +540,7 @@ msgstr "Το κατώφλι αργής εκκίνησης" msgid "The round trip time in milliseconds" msgstr "" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3571,7 +3571,7 @@ msgstr[1] "{0} πρόσθετα ενημερώθηκαν" msgid "Plugin update check complete" msgstr "Ολοκλήρωση ελέγχου για ενημερώσεις πρόσθετων" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_en.po b/apps/routerconsole/locale/messages_en.po index 8751c55b0..c6299df22 100644 --- a/apps/routerconsole/locale/messages_en.po +++ b/apps/routerconsole/locale/messages_en.po @@ -525,7 +525,7 @@ msgstr "" msgid "The round trip time in milliseconds" msgstr "" -#. "").append(_("Dev")).append(": ").append(_("The standard deviation of the round trip time in milliseconds")).append("
              \n" + +#. "").append(_t("Dev")).append(": ").append(_t("The standard deviation of the round trip time in milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 msgid "The retransmit timeout in milliseconds" msgstr "" @@ -3547,7 +3547,7 @@ msgstr[1] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_es.po b/apps/routerconsole/locale/messages_es.po index ce6316f26..c5be1e480 100644 --- a/apps/routerconsole/locale/messages_es.po +++ b/apps/routerconsole/locale/messages_es.po @@ -549,7 +549,7 @@ msgstr "El umbral del algoritmo de comienzo lento" msgid "The round trip time in milliseconds" msgstr "El periodo de ida y vuelta en milisegundos" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3580,7 +3580,7 @@ msgstr[1] "{0} complementos actualizados" msgid "Plugin update check complete" msgstr "Búsqueda de actualizaciones de complementos finalizada" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_et.po b/apps/routerconsole/locale/messages_et.po index b74f6802d..a0f34f2b0 100644 --- a/apps/routerconsole/locale/messages_et.po +++ b/apps/routerconsole/locale/messages_et.po @@ -536,7 +536,7 @@ msgstr "Aeglase käivitumise lävi" msgid "The round trip time in milliseconds" msgstr "Saatmise-kinnituse aeg millisekundites" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3567,7 +3567,7 @@ msgstr[1] "" msgid "Plugin update check complete" msgstr "Plugina uuenduse kontroll sooritatud" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_fi.po b/apps/routerconsole/locale/messages_fi.po index 631881ab3..8690dc890 100644 --- a/apps/routerconsole/locale/messages_fi.po +++ b/apps/routerconsole/locale/messages_fi.po @@ -540,7 +540,7 @@ msgstr "" msgid "The round trip time in milliseconds" msgstr "Edestakaisen matkan aika millisekunneissa" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3571,7 +3571,7 @@ msgstr[1] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_fr.po b/apps/routerconsole/locale/messages_fr.po index 3d75da8df..72a77b54a 100644 --- a/apps/routerconsole/locale/messages_fr.po +++ b/apps/routerconsole/locale/messages_fr.po @@ -550,7 +550,7 @@ msgstr "Seuil de démarrage lent" msgid "The round trip time in milliseconds" msgstr "Aller-retour en ms" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3581,7 +3581,7 @@ msgstr[1] "{0} plugins mis à jour" msgid "Plugin update check complete" msgstr "Verification de mise à jour de plugin accomplie" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_hu.po b/apps/routerconsole/locale/messages_hu.po index 61097fd5e..fee1b5b08 100644 --- a/apps/routerconsole/locale/messages_hu.po +++ b/apps/routerconsole/locale/messages_hu.po @@ -537,7 +537,7 @@ msgstr "A lassú indítás határérték" msgid "The round trip time in milliseconds" msgstr "A körbejárási idő ezredmásodpercben." -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3568,7 +3568,7 @@ msgstr[1] "{0} kiegészítő lett frissítve" msgid "Plugin update check complete" msgstr "Kiegészítők frissítéseinek ellenőrzése elkészült" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_it.po b/apps/routerconsole/locale/messages_it.po index 4643d2b4c..931aa5c65 100644 --- a/apps/routerconsole/locale/messages_it.po +++ b/apps/routerconsole/locale/messages_it.po @@ -551,7 +551,7 @@ msgstr "La soglia di avvio lento" msgid "The round trip time in milliseconds" msgstr "Tempo di ciclo in millisecondi" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3582,7 +3582,7 @@ msgstr[1] "{0} plugin aggiornati" msgid "Plugin update check complete" msgstr "Controllo nuovi aggiornamenti plugin completato" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_ja.po b/apps/routerconsole/locale/messages_ja.po index 0031b451d..dd3e9b634 100644 --- a/apps/routerconsole/locale/messages_ja.po +++ b/apps/routerconsole/locale/messages_ja.po @@ -534,7 +534,7 @@ msgstr "スロースタートしきい値" msgid "The round trip time in milliseconds" msgstr "ミリ秒単位往復時間" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3559,7 +3559,7 @@ msgstr[0] "{0} 個のプラグインをアップデートしました" msgid "Plugin update check complete" msgstr "プラグインのアップデート確認完了" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_nb.po b/apps/routerconsole/locale/messages_nb.po index d0dae71ae..6eb9abad3 100644 --- a/apps/routerconsole/locale/messages_nb.po +++ b/apps/routerconsole/locale/messages_nb.po @@ -539,7 +539,7 @@ msgstr "" msgid "The round trip time in milliseconds" msgstr "Rundtur i millisekunder" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3570,7 +3570,7 @@ msgstr[1] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_nl.po b/apps/routerconsole/locale/messages_nl.po index 3ae1204af..f77331c85 100644 --- a/apps/routerconsole/locale/messages_nl.po +++ b/apps/routerconsole/locale/messages_nl.po @@ -549,7 +549,7 @@ msgstr "De vertraagde-start drempel" msgid "The round trip time in milliseconds" msgstr "De rondgangstijd in milliseconden" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3580,7 +3580,7 @@ msgstr[1] "{0} plugins geupdate" msgid "Plugin update check complete" msgstr "Plugin update check voltooid" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_pl.po b/apps/routerconsole/locale/messages_pl.po index df958ab9a..edc8c6421 100644 --- a/apps/routerconsole/locale/messages_pl.po +++ b/apps/routerconsole/locale/messages_pl.po @@ -556,7 +556,7 @@ msgstr "Próg powolnego startu" msgid "The round trip time in milliseconds" msgstr "Czas podróży w obie strony w milisekundach" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3593,7 +3593,7 @@ msgstr[2] "{0} wtyczek zaktualizowanych" msgid "Plugin update check complete" msgstr "Sprawdzanie dostępności aktualizacji dla wtyczek zakończone" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_pt.po b/apps/routerconsole/locale/messages_pt.po index 578d5d32b..4348fff98 100644 --- a/apps/routerconsole/locale/messages_pt.po +++ b/apps/routerconsole/locale/messages_pt.po @@ -559,7 +559,7 @@ msgstr "O limitador de inicio lento " msgid "The round trip time in milliseconds" msgstr "O tempo de ida e volta em milisegundos" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3590,7 +3590,7 @@ msgstr[1] "{0} extensões atualizadas" msgid "Plugin update check complete" msgstr "Verificação de atualização para extensões completada" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_pt_BR.po b/apps/routerconsole/locale/messages_pt_BR.po index 2e17539c7..cc050e7c3 100644 --- a/apps/routerconsole/locale/messages_pt_BR.po +++ b/apps/routerconsole/locale/messages_pt_BR.po @@ -539,7 +539,7 @@ msgstr "" msgid "The round trip time in milliseconds" msgstr "" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3570,7 +3570,7 @@ msgstr[1] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_ro.po b/apps/routerconsole/locale/messages_ro.po index 785559c3b..37f8dae46 100644 --- a/apps/routerconsole/locale/messages_ro.po +++ b/apps/routerconsole/locale/messages_ro.po @@ -550,7 +550,7 @@ msgstr "Start lent" msgid "The round trip time in milliseconds" msgstr "Timpul de călătorie dus-întors în milisecunde" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3587,7 +3587,7 @@ msgstr[2] "{0} plug-inuri actualizate" msgid "Plugin update check complete" msgstr "Verificarea actualizarii plugin-urilor s-a terminat" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_ru.po b/apps/routerconsole/locale/messages_ru.po index 1ec786502..dd6f3a303 100644 --- a/apps/routerconsole/locale/messages_ru.po +++ b/apps/routerconsole/locale/messages_ru.po @@ -581,7 +581,7 @@ msgstr "Slow Start Threshold. Порог медленного старт msgid "The round trip time in milliseconds" msgstr "Round-Trip Time. Время между отправкой запроса и получением ответа (в миллисекундах)" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3624,7 +3624,7 @@ msgstr[3] "{0} модулей обновлено" msgid "Plugin update check complete" msgstr "Проверка обновления модуля завершена" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_sv.po b/apps/routerconsole/locale/messages_sv.po index 1133087fc..e8bdf6f49 100644 --- a/apps/routerconsole/locale/messages_sv.po +++ b/apps/routerconsole/locale/messages_sv.po @@ -546,7 +546,7 @@ msgstr "Den tröskel för långsam start" msgid "The round trip time in milliseconds" msgstr "Tur och returtid i millisekunder" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3577,7 +3577,7 @@ msgstr[1] "{0} insticksprogram uppdaterade" msgid "Plugin update check complete" msgstr "Sökning efter uppdateringar för insticksprogram slutförd" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_tr.po b/apps/routerconsole/locale/messages_tr.po index b20614289..0c8ab171d 100644 --- a/apps/routerconsole/locale/messages_tr.po +++ b/apps/routerconsole/locale/messages_tr.po @@ -532,7 +532,7 @@ msgstr "Yavaş başlangıç eşiği" msgid "The round trip time in milliseconds" msgstr "Milisaniye cinsinden gidiş-dönüş süresi" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3557,7 +3557,7 @@ msgstr[0] "{0} uygulama eki güncellendi" msgid "Plugin update check complete" msgstr "Uygulama eki güncelleme denetimi tamamlandı" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_uk.po b/apps/routerconsole/locale/messages_uk.po index 1232b560b..6784e6bcf 100644 --- a/apps/routerconsole/locale/messages_uk.po +++ b/apps/routerconsole/locale/messages_uk.po @@ -559,7 +559,7 @@ msgstr "Поріг повільного старту" msgid "The round trip time in milliseconds" msgstr "Час між відправленням запиту й одержанням відповіді у мілісекундах" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3596,7 +3596,7 @@ msgstr[2] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_vi.po b/apps/routerconsole/locale/messages_vi.po index cc53c69c4..887594a8c 100644 --- a/apps/routerconsole/locale/messages_vi.po +++ b/apps/routerconsole/locale/messages_vi.po @@ -530,7 +530,7 @@ msgstr "Ngưỡng giới hạn chậm" msgid "The round trip time in milliseconds" msgstr "Thời gian chu trình vòng tính bằng phần nghìn giây" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3555,7 +3555,7 @@ msgstr[0] "" msgid "Plugin update check complete" msgstr "" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/routerconsole/locale/messages_zh.po b/apps/routerconsole/locale/messages_zh.po index 6176116fc..c875ae4a5 100644 --- a/apps/routerconsole/locale/messages_zh.po +++ b/apps/routerconsole/locale/messages_zh.po @@ -538,7 +538,7 @@ msgstr "慢启动门槛" msgid "The round trip time in milliseconds" msgstr "往返时间（毫秒）" -#. "").append(_("Dev")).append(": ").append(_("The +#. "").append(_t("Dev")).append(": ").append(_t("The #. standard deviation of the round trip time in #. milliseconds")).append("
              \n" + #: ../../../router/java/src/net/i2p/router/transport/TransportManager.java:746 @@ -3563,7 +3563,7 @@ msgstr[0] "{0} 个插件已更新" msgid "Plugin update check complete" msgstr "插件的更新检查已完成" -#. buf.append("

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

              \n

              "); +#. buf.append("

              ").append(_t("Peer Profiles")).append("

              \n

              "); #: ../java/src/net/i2p/router/web/ProfileOrganizerRenderer.java:79 #, java-format msgid "Showing 1 recent profile." diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh index 02b13080b..6ae1e111f 100755 --- a/apps/susidns/src/bundle-messages.sh +++ b/apps/susidns/src/bundle-messages.sh @@ -63,15 +63,15 @@ do 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") + # _t("foo") # _x("foo") - # intl._("foo") + # intl._t("foo") # In a jsp, you must use a helper or handler that has the context set. # To start a new translation, copy the header from an old translation to the new .po file, # then ant distclean updater. find $JPATHS -name *.java > $TMPFILE xgettext -f $TMPFILE -F -L java --from-code=UTF-8 --add-comments\ - --keyword=_ --keyword=_x --keyword=intl._ --keyword=intl.title \ + --keyword=_t --keyword=_x --keyword=intl._ --keyword=intl.title \ -o ${i}t if [ $? -ne 0 ] then diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java index 70b29e72f..9cd3821df 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressBean.java @@ -128,7 +128,7 @@ public class AddressBean c >= 0x5b && c <= 0x60 || c >= 0x7b && c <= 0x7f) { String bad = "\"" + c + "\" (0x" + Integer.toHexString(c) + ')'; - throw new IllegalArgumentException(_("Host name \"{0}\" contains illegal character {1}", + throw new IllegalArgumentException(_t("Host name \"{0}\" contains illegal character {1}", host, bad)); } if (c == DOT2) @@ -141,21 +141,21 @@ public class AddressBean needsIDN = true; } if (host.startsWith("-")) - throw new IllegalArgumentException(_("Host name cannot start with \"{0}\"", "-")); + throw new IllegalArgumentException(_t("Host name cannot start with \"{0}\"", "-")); if (host.startsWith(".")) - throw new IllegalArgumentException(_("Host name cannot start with \"{0}\"", ".")); + throw new IllegalArgumentException(_t("Host name cannot start with \"{0}\"", ".")); if (host.endsWith("-")) - throw new IllegalArgumentException(_("Host name cannot end with \"{0}\"", "-")); + throw new IllegalArgumentException(_t("Host name cannot end with \"{0}\"", "-")); if (host.endsWith(".")) - throw new IllegalArgumentException(_("Host name cannot end with \"{0}\"", ".")); + throw new IllegalArgumentException(_t("Host name cannot end with \"{0}\"", ".")); if (needsIDN) { if (host.startsWith("xn--")) - throw new IllegalArgumentException(_("Host name cannot start with \"{0}\"", "xn--")); + throw new IllegalArgumentException(_t("Host name cannot start with \"{0}\"", "xn--")); if (host.contains(".xn--")) - throw new IllegalArgumentException(_("Host name cannot contain \"{0}\"", ".xn--")); + throw new IllegalArgumentException(_t("Host name cannot contain \"{0}\"", ".xn--")); if (haveIDN) return IDN.toASCII(host, IDN.ALLOW_UNASSIGNED); - throw new IllegalArgumentException(_("Host name \"{0}\" requires conversion to ASCII but the conversion library is unavailable in this JVM", host)); + throw new IllegalArgumentException(_t("Host name \"{0}\" requires conversion to ASCII but the conversion library is unavailable in this JVM", host)); } return host; } @@ -216,7 +216,7 @@ public class AddressBean // (4 / 3) * (pubkey length + signing key length) String cert = destination.substring(512); if (cert.equals("AAAA")) - return _("None"); + return _t("None"); byte[] enc = Base64.decode(cert); if (enc == null) // shouldn't happen @@ -224,15 +224,15 @@ public class AddressBean int type = enc[0] & 0xff; switch (type) { case Certificate.CERTIFICATE_TYPE_HASHCASH: - return _("Hashcash"); + return _t("Hashcash"); case Certificate.CERTIFICATE_TYPE_HIDDEN: - return _("Hidden"); + return _t("Hidden"); case Certificate.CERTIFICATE_TYPE_SIGNED: - return _("Signed"); + return _t("Signed"); case Certificate.CERTIFICATE_TYPE_KEY: - return _("Key"); + return _t("Key"); default: - return _("Type {0}", type); + return _t("Type {0}", type); } } @@ -244,20 +244,20 @@ public class AddressBean // (4 / 3) * (pubkey length + signing key length) String cert = destination.substring(512); if (cert.equals("AAAA")) - return _("DSA 1024 bit"); + return _t("DSA 1024 bit"); byte[] enc = Base64.decode(cert); if (enc == null) // shouldn't happen return "invalid"; int type = enc[0] & 0xff; if (type != Certificate.CERTIFICATE_TYPE_KEY) - return _("DSA 1024 bit"); + return _t("DSA 1024 bit"); int st = ((enc[3] & 0xff) << 8) | (enc[4] & 0xff); if (st == 0) - return _("DSA 1024 bit"); + return _t("DSA 1024 bit"); SigType stype = SigType.getByCode(st); if (stype == null) - return _("Type {0}", st); + return _t("Type {0}", st); return stype.toString(); } @@ -281,17 +281,17 @@ public class AddressBean } /** translate */ - private static String _(String s) { + private static String _t(String s) { return Messages.getString(s); } /** translate */ - private static String _(String s, Object o) { + private static String _t(String s, Object o) { return Messages.getString(s, o); } /** translate */ - private static String _(String s, Object o, Object o2) { + private static String _t(String s, Object o, Object o2) { return Messages.getString(s, o, o2); } } 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 4e616e261..360310682 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -200,7 +200,7 @@ public class AddressbookBean extends BaseBean } else { if (resultCount <= 0) // covered in jsp - //message = _("This addressbook is empty."); + //message = _t("This addressbook is empty."); message = ""; else message = ngettext("Address book contains 1 entry.", @@ -219,7 +219,7 @@ public class AddressbookBean extends BaseBean "&begin=" + newBegin + "&end=" + newEnd + "\">" + (newBegin+1) + '-' + (newEnd+1) + " | "; } - message += ' ' + _("Showing {0} of {1}", "" + (getBeginInt()+1) + '-' + (getEndInt()+1), Integer.valueOf(resultCount)); + message += ' ' + _t("Showing {0} of {1}", "" + (getBeginInt()+1) + '-' + (getEndInt()+1), Integer.valueOf(resultCount)); if (getEndInt() < resultCount - 1) { int newBegin = Math.min(resultCount - 1, getEndInt() + 1); int newEnd = Math.min(resultCount, getEndInt() + DISPLAY_SIZE); @@ -241,7 +241,7 @@ public class AddressbookBean extends BaseBean if (_context.getBooleanProperty(PROP_PW_ENABLE) || (serial != null && serial.equals(lastSerial))) { boolean changed = false; - if (action.equals(_("Add")) || action.equals(_("Replace"))) { + if (action.equals(_t("Add")) || action.equals(_t("Replace"))) { if( addressbook != null && hostname != null && destination != null ) { try { // throws IAE with translated message @@ -251,9 +251,9 @@ public class AddressbookBean extends BaseBean String oldDest = (String) addressbook.get(host); if (destination.equals(oldDest)) { - message = _("Host name {0} is already in address book, unchanged.", displayHost); - } else if (oldDest != null && !action.equals(_("Replace"))) { - message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); + message = _t("Host name {0} is already in address book, unchanged.", displayHost); + } else if (oldDest != null && !action.equals(_t("Replace"))) { + message = _t("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); } else { boolean valid = true; try { @@ -266,29 +266,29 @@ public class AddressbookBean extends BaseBean addressbook.put( host, destination ); changed = true; if (oldDest == null) - message = _("Destination added for {0}.", displayHost); + message = _t("Destination added for {0}.", displayHost); else - message = _("Destination changed for {0}.", displayHost); + message = _t("Destination changed for {0}.", displayHost); if (!host.endsWith(".i2p")) - message += "
              " + _("Warning - host name does not end with \".i2p\""); + message += "
              " + _t("Warning - host name does not end with \".i2p\""); // clear form hostname = null; destination = null; } else { - message = _("Invalid Base 64 destination."); + message = _t("Invalid Base 64 destination."); } } } catch (IllegalArgumentException iae) { message = iae.getMessage(); if (message == null) - message = _("Invalid host name \"{0}\".", hostname); + message = _t("Invalid host name \"{0}\".", hostname); } } else { - message = _("Please enter a host name and destination"); + message = _t("Please enter a host name and destination"); } // clear search when adding search = null; - } else if (action.equals(_("Delete Selected")) || action.equals(_("Delete Entry"))) { + } else if (action.equals(_t("Delete Selected")) || action.equals(_t("Delete Entry"))) { String name = null; int deleted = 0; for (String n : deletionMarks) { @@ -302,30 +302,30 @@ public class AddressbookBean extends BaseBean } if( changed ) { if (deleted == 1) - message = _("Destination {0} deleted.", name); + message = _t("Destination {0} deleted.", name); else // parameter will always be >= 2 message = ngettext("1 destination deleted.", "{0} destinations deleted.", deleted); } else { - message = _("No entries selected to delete."); + message = _t("No entries selected to delete."); } - if (action.equals(_("Delete Entry"))) + if (action.equals(_t("Delete Entry"))) search = null; } if( changed ) { try { save(); - message += "
              " + _("Address book saved."); + message += "
              " + _t("Address book saved."); } catch (Exception e) { warn(e); - message += "
              " + _("ERROR: Could not write addressbook file."); + message += "
              " + _t("ERROR: Could not write addressbook file."); } } } else { - message = _("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + message = _t("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser."); + _t("If the problem persists, verify that you have cookies enabled in your browser."); } } diff --git a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java index 08ca6dd31..e4449a4e0 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/BaseBean.java @@ -165,7 +165,7 @@ public class BaseBean * Translate * @since 0.9.13 moved from subclasses */ - protected static String _(String s) { + protected static String _t(String s) { return Messages.getString(s); } @@ -173,7 +173,7 @@ public class BaseBean * Translate * @since 0.9.13 moved from subclasses */ - protected static String _(String s, Object o) { + protected static String _t(String s, Object o) { return Messages.getString(s, o); } @@ -181,7 +181,7 @@ public class BaseBean * Translate * @since 0.9.13 moved from subclasses */ - protected static String _(String s, Object o, Object o2) { + protected static String _t(String s, Object o, Object o2) { return Messages.getString(s, o, o2); } diff --git a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java index 57f8fefe5..d5f3e0955 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/ConfigBean.java @@ -96,18 +96,18 @@ public class ConfigBean extends BaseBean implements Serializable { if( action != null ) { if (I2PAppContext.getGlobalContext().getBooleanProperty(BaseBean.PROP_PW_ENABLE) || (serial != null && serial.equals(lastSerial))) { - if(action.equals(_("Save"))) { + if(action.equals(_t("Save"))) { save(); - message = _("Configuration saved."); - } else if (action.equals(_("Reload"))) { + message = _t("Configuration saved."); + } else if (action.equals(_t("Reload"))) { reload(); - message = _("Configuration reloaded."); + message = _t("Configuration reloaded."); } } else { - message = _("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + message = _t("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser."); + _t("If the problem persists, verify that you have cookies enabled in your browser."); } } if( message.length() > 0 ) diff --git a/apps/susidns/src/java/src/i2p/susi/dns/Messages.java b/apps/susidns/src/java/src/i2p/susi/dns/Messages.java index 99aa07c0f..940a341f8 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/Messages.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/Messages.java @@ -16,12 +16,12 @@ public class Messages { } /** lang in routerconsole.lang property, else current locale */ - public String _(String key) { + public String _t(String key) { return Translate.getString(key, _context, BUNDLE_NAME); } /** @since 0.9.11 */ - public String _(String key, Object o) { + public String _t(String key, Object o) { return Translate.getString(key, o, _context, BUNDLE_NAME); } diff --git a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java index 2faefb853..14eaebbd7 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java @@ -101,7 +101,7 @@ public class NamingServiceBean extends AddressbookBean if (isDirect()) return super.getDisplayName(); loadConfig(); - return _("{0} address book in {1} database", getFileName(), getNamingService().getName()); + return _t("{0} address book in {1} database", getFileName(), getNamingService().getName()); } /** depth-first search */ @@ -229,7 +229,7 @@ public class NamingServiceBean extends AddressbookBean if (_context.getBooleanProperty(PROP_PW_ENABLE) || (serial != null && serial.equals(lastSerial))) { boolean changed = false; - if (action.equals(_("Add")) || action.equals(_("Replace"))) { + if (action.equals(_t("Add")) || action.equals(_t("Replace"))) { if(hostname != null && destination != null) { try { // throws IAE with translated message @@ -240,9 +240,9 @@ public class NamingServiceBean extends AddressbookBean Properties outProperties= new Properties(); Destination oldDest = getNamingService().lookup(host, nsOptions, outProperties); if (oldDest != null && destination.equals(oldDest.toBase64())) { - message = _("Host name {0} is already in address book, unchanged.", displayHost); - } else if (oldDest != null && !action.equals(_("Replace"))) { - message = _("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); + message = _t("Host name {0} is already in address book, unchanged.", displayHost); + } else if (oldDest != null && !action.equals(_t("Replace"))) { + message = _t("Host name {0} is already in address book with a different destination. Click \"Replace\" to overwrite.", displayHost); } else { try { Destination dest = new Destination(destination); @@ -250,37 +250,37 @@ public class NamingServiceBean extends AddressbookBean nsOptions.putAll(outProperties); nsOptions.setProperty("m", Long.toString(_context.clock().now())); } - nsOptions.setProperty("s", _("Manually added via SusiDNS")); + nsOptions.setProperty("s", _t("Manually added via SusiDNS")); boolean success = getNamingService().put(host, dest, nsOptions); if (success) { changed = true; if (oldDest == null) - message = _("Destination added for {0}.", displayHost); + message = _t("Destination added for {0}.", displayHost); else - message = _("Destination changed for {0}.", displayHost); + message = _t("Destination changed for {0}.", displayHost); if (!host.endsWith(".i2p")) - message += "
              " + _("Warning - host name does not end with \".i2p\""); + message += "
              " + _t("Warning - host name does not end with \".i2p\""); // clear form hostname = null; destination = null; } else { - message = _("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService().getName()) + "
              "; + message = _t("Failed to add Destination for {0} to naming service {1}", displayHost, getNamingService().getName()) + "
              "; } } catch (DataFormatException dfe) { - message = _("Invalid Base 64 destination."); + message = _t("Invalid Base 64 destination."); } } } catch (IllegalArgumentException iae) { message = iae.getMessage(); if (message == null) - message = _("Invalid host name \"{0}\".", hostname); + message = _t("Invalid host name \"{0}\".", hostname); } } else { - message = _("Please enter a host name and destination"); + message = _t("Please enter a host name and destination"); } // clear search when adding search = null; - } else if (action.equals(_("Delete Selected")) || action.equals(_("Delete Entry"))) { + } else if (action.equals(_t("Delete Selected")) || action.equals(_t("Delete Entry"))) { String name = null; int deleted = 0; for (String n : deletionMarks) { @@ -288,7 +288,7 @@ public class NamingServiceBean extends AddressbookBean String uni = AddressBean.toUnicode(n); String displayHost = uni.equals(n) ? n : uni + " (" + n + ')'; if (!success) { - message += _("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService().getName()) + "
              "; + message += _t("Failed to delete Destination for {0} from naming service {1}", displayHost, getNamingService().getName()) + "
              "; } else if (deleted++ == 0) { changed = true; name = displayHost; @@ -297,25 +297,25 @@ public class NamingServiceBean extends AddressbookBean if( changed ) { if (deleted == 1) // parameter is a host name - message += _("Destination {0} deleted.", name); + message += _t("Destination {0} deleted.", name); else // parameter will always be >= 2 message = ngettext("1 destination deleted.", "{0} destinations deleted.", deleted); } else { - message = _("No entries selected to delete."); + message = _t("No entries selected to delete."); } // clear search when deleting - if (action.equals(_("Delete Entry"))) + if (action.equals(_t("Delete Entry"))) search = null; } if( changed ) { - message += "
              " + _("Address book saved."); + message += "
              " + _t("Address book saved."); } } else { - message = _("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + message = _t("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser."); + _t("If the problem persists, verify that you have cookies enabled in your browser."); } } 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 aae4d50a3..c1043260f 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,7 @@ public class SubscriptionsBean extends BaseBean if( action != null ) { if (_context.getBooleanProperty(PROP_PW_ENABLE) || (serial != null && serial.equals(lastSerial))) { - if (action.equals(_("Save"))) { + if (action.equals(_t("Save"))) { save(); /******* String nonce = System.getProperty("addressbook.nonce"); @@ -141,22 +141,22 @@ public class SubscriptionsBean extends BaseBean *******/ if (content != null && content.length() > 2 && _context.portMapper().getPort(PortMapper.SVC_HTTP_PROXY) > 0) { - message = _("Subscriptions saved, updating addressbook from subscription sources now."); + message = _t("Subscriptions saved, updating addressbook from subscription sources now."); // + "\"\""; _context.namingService().requestUpdate(null); } else { - message = _("Subscriptions saved."); + message = _t("Subscriptions saved."); } - } else if (action.equals(_("Reload"))) { + } else if (action.equals(_t("Reload"))) { reloadSubs(); - message = _("Subscriptions reloaded."); + message = _t("Subscriptions reloaded."); } } else { - message = _("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + message = _t("Invalid form submission, probably because you used the \"back\" or \"reload\" button on your browser. Please resubmit.") + ' ' + - _("If the problem persists, verify that you have cookies enabled in your browser."); + _t("If the problem persists, verify that you have cookies enabled in your browser."); } } if( message.length() > 0 ) diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 806504b51..60ee04d67 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -48,31 +48,31 @@ -${book.book} <%=intl._("address book")%> - susidns +${book.book} <%=intl._t("address book")%> - susidns

              -

              <%=intl._("Address book")%>: <%=intl._(book.getBook())%>

              -

              <%=intl._("Storage")%>: ${book.displayName}

              +

              <%=intl._t("Address book")%>: <%=intl._t(book.getBook())%>

              +

              <%=intl._t("Storage")%>: ${book.displayName}

              ${book.messages}
              @@ -81,7 +81,7 @@ ${book.loadBookMessages}
              -

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

              <%=intl._t("Filter")%>: a b c @@ -109,11 +109,11 @@ ${book.loadBookMessages} y z 0-9 -<%=intl._("other")%> -<%=intl._("all")%>

              +<%=intl._t("other")%> +<%=intl._t("all")%>

              -

              <%=intl._("Current filter")%>: ${book.filter} -(<%=intl._("clear filter")%>)

              +

              <%=intl._t("Current filter")%>: ${book.filter} +(<%=intl._t("clear filter")%>)
              @@ -122,8 +122,8 @@ ${book.loadBookMessages} - - + +
              <%=intl._("Search")%>: " ><%=intl._t("Search")%>: " >
              @@ -147,21 +147,21 @@ ${book.loadBookMessages}
              		  <%=intl._("Name")%><%=intl._("Links")%><%=intl._("Destination")%><%=intl._t("Name")%><%=intl._t("Links")%><%=intl._t("Destination")%>
              ">"> ${addr.displayName} -">b32 +">b32 -"><%=intl._("details")%> +"><%=intl._t("details")%>
              -<%=intl._("Host Name")%> +<%=intl._t("Host Name")%>
              -<%=intl._("Destination")%> +<%=intl._t("Destination")%>

              -" > -" > -" > +" > +" > +" >

              diff --git a/apps/susidns/src/jsp/config.jsp b/apps/susidns/src/jsp/config.jsp index 6a650d3f5..27e57a6e9 100644 --- a/apps/susidns/src/jsp/config.jsp +++ b/apps/susidns/src/jsp/config.jsp @@ -44,24 +44,24 @@ -<%=intl._("configuration")%> - susidns +<%=intl._t("configuration")%> - susidns
              @@ -74,65 +74,65 @@
              -" > -" > +" > +" >
              -

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

              +

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

              1. -<%=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).")%> +<%=intl._t("File and directory paths here are relative to the addressbook's working directory, which is normally ~/.i2p/addressbook/ (Linux) or %APPDATA%\\I2P\\addressbook\\ (Windows).")%>
              2. -<%=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.")%> +<%=intl._t("If you want to manually add lines to an addressbook, add them to the private or master addressbooks.")%> +<%=intl._t("The router addressbook and the published addressbook are updated by the addressbook application.")%>
              3. -<%=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.")%> +<%=intl._t("When you publish your addressbook, ALL destinations from the master and router addressbooks appear there.")%> +<%=intl._t("Use the private addressbook for private destinations, these are not published.")%>
              -

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

              +

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

              • subscriptions - -<%=intl._("File containing the list of subscriptions URLs (no need to change)")%> +<%=intl._t("File containing the list of subscriptions URLs (no need to change)")%>
              • update_delay - -<%=intl._("Update interval in hours")%> +<%=intl._t("Update interval in hours")%>
              • published_addressbook - -<%=intl._("Your public hosts.txt file (choose a path within your webserver document root)")%> +<%=intl._t("Your public hosts.txt file (choose a path within your webserver document root)")%>
              • router_addressbook - -<%=intl._("Your hosts.txt (don't change)")%> +<%=intl._t("Your hosts.txt (don't change)")%>
              • master_addressbook - -<%=intl._("Your personal addressbook, these hosts will be published")%> +<%=intl._t("Your personal addressbook, these hosts will be published")%>
              • private_addressbook - -<%=intl._("Your private addressbook, it is never published")%> +<%=intl._t("Your private addressbook, it is never published")%>
              • proxy_port - -<%=intl._("Port for your eepProxy (no need to change)")%> +<%=intl._t("Port for your eepProxy (no need to change)")%>
              • proxy_host - -<%=intl._("Hostname for your eepProxy (no need to change)")%> +<%=intl._t("Hostname for your eepProxy (no need to change)")%>
              • should_publish - -<%=intl._("Whether to update the published addressbook")%> +<%=intl._t("Whether to update the published addressbook")%>
              • etags - -<%=intl._("File containing the etags header from the fetched subscription URLs (no need to change)")%> +<%=intl._t("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)")%> +<%=intl._t("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)")%> +<%=intl._t("File to log activity to (change to /dev/null if you like)")%>
              • theme - -<%=intl._("Name of the theme to use (defaults to 'light')")%> +<%=intl._t("Name of the theme to use (defaults to 'light')")%>
              diff --git a/apps/susidns/src/jsp/details.jsp b/apps/susidns/src/jsp/details.jsp index 9334e43ca..a5660b677 100644 --- a/apps/susidns/src/jsp/details.jsp +++ b/apps/susidns/src/jsp/details.jsp @@ -42,31 +42,31 @@ -${book.book} <%=intl._("addressbook")%> - susidns +${book.book} <%=intl._t("addressbook")%> - susidns
              -

              <%=intl._("Address book")%>: <%=intl._(book.getBook())%>

              -

              <%=intl._("Storage")%>: ${book.displayName}

              +

              <%=intl._t("Address book")%>: <%=intl._t(book.getBook())%>

              +

              <%=intl._t("Storage")%>: ${book.displayName}

              @@ -85,49 +85,49 @@ - + <% if (addr.isIDN()) { %> - + <% } %> - + - + - - + + - - + + - + - + - + - + - + - + - +
              <%=intl._("Host Name")%><%=intl._t("Host Name")%> <%=addr.getDisplayName()%>
              <%=intl._("Encoded Name")%><%=intl._t("Encoded Name")%> <%=addr.getName()%>
              <%=intl._("Base 32 Address")%><%=intl._t("Base 32 Address")%> <%=b32%>
              <%=intl._("Base 64 Hash")%><%=intl._t("Base 64 Hash")%> <%=addr.getB64()%>
              <%=intl._("Address Helper")%><%=intl._("link")%><%=intl._t("Address Helper")%><%=intl._t("link")%>
              <%=intl._("Public Key")%><%=intl._("ElGamal 2048 bit")%><%=intl._t("Public Key")%><%=intl._t("ElGamal 2048 bit")%>
              <%=intl._("Signing Key")%><%=intl._t("Signing Key")%> <%=addr.getSigType()%>
              <%=intl._("Certificate")%><%=intl._t("Certificate")%> <%=addr.getCert()%>
              <%=intl._("Added Date")%><%=intl._t("Added Date")%> <%=addr.getAdded()%>
              <%=intl._("Source")%><%=intl._t("Source")%> <%=addr.getSource()%>
              <%=intl._("Last Modified")%><%=intl._t("Last Modified")%> <%=addr.getModded()%>
              <%=intl._("Notes")%><%=intl._t("Notes")%> <%=addr.getNotes()%>
              <%=intl._("Destination")%><%=intl._t("Destination")%>
              @@ -138,7 +138,7 @@ -" > +" >

              diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index 505beeec7..67c96c680 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -42,7 +42,7 @@ -<%=intl._("Introduction")%> - SusiDNS +<%=intl._t("Introduction")%> - SusiDNS @@ -53,39 +53,39 @@
              -

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

              +

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

              -<%=intl._("The addressbook application is part of your I2P installation.")%> -<%=intl._("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%> +<%=intl._t("The addressbook application is part of your I2P installation.")%> +<%=intl._t("It regularly updates your hosts.txt file from distributed sources or \"subscriptions\".")%>

              -<%=intl._("In the default configuration, the address book is only subscribed to {0}.", "i2p-projekt.i2p")%> -<%=intl._("Subscribing to additional sites is easy, just add them to your subscriptions file.")%> +<%=intl._t("In the default configuration, the address book is only subscribed to {0}.", "i2p-projekt.i2p")%> +<%=intl._t("Subscribing to additional sites is easy, just add them to your subscriptions file.")%>

              -<%=intl._("For more information on naming in I2P, see the overview.")%> +<%=intl._t("For more information on naming in I2P, see the overview.")%>

              -

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

              +

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

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

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

              address book working scheme
              diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index db588c6a8..25ec21261 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -43,24 +43,24 @@ -<%=intl._("subscriptions")%> - susidns +<%=intl._t("subscriptions")%> - susidns
              @@ -73,18 +73,18 @@
              -" > -" > +" > +" >

              -<%=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 {0}, which is updated infrequently.", "i2p-projekt.i2p")%> -<%=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._t("The subscription file contains a list of i2p URLs.")%> +<%=intl._t("The addressbook application regularly checks this list for new eepsites.")%> +<%=intl._t("Those URLs refer to published hosts.txt files.")%> +<%=intl._t("The default subscription is the hosts.txt from {0}, which is updated infrequently.", "i2p-projekt.i2p")%> +<%=intl._t("So it is a good idea to add additional subscriptions to sites that have the latest addresses.")%> +<%=intl._t("See the FAQ for a list of subscription URLs.")%>

              " + _t("No messages") + "
              "); if (i > 0) { out.println( "
              "); if( sessionObject.reallyDelete ) { // TODO ngettext - out.println("

              " + _("Really delete the marked messages?") + - "

              " + button( REALLYDELETE, _("Yes, really delete them!") ) + - "
              " + button( CLEAR, _("Cancel"))); + out.println("

              " + _t("Really delete the marked messages?") + + "

              " + button( REALLYDELETE, _t("Yes, really delete them!") ) + + "
              " + button( CLEAR, _t("Cancel"))); } else { - out.println(button( DELETE, _("Delete Selected") ) + "
              "); + out.println(button( DELETE, _t("Delete Selected") ) + "
              "); out.print( - button( MARKALL, _("Mark All") ) + + button( MARKALL, _t("Mark All") ) + " " + - button( CLEAR, _("Clear All") )); + button( CLEAR, _t("Clear All") )); //"
              " + - //button( INVERT, _("Invert Selection") ) + + //button( INVERT, _t("Invert Selection") ) + //"
              "); } out.print("              		"); // moved to config page //out.print( - // _("Page Size") + ": " + + // _t("Page Size") + ": " + // " " + - // button( SETPAGESIZE, _("Set") ) ); + // button( SETPAGESIZE, _t("Set") ) ); out.print("
              "); - out.print(button(CONFIGURE, _("Settings"))); + out.print(button(CONFIGURE, _t("Settings"))); out.println("
              "); @@ -2303,14 +2303,14 @@ public class WebMail extends HttpServlet out.println( "
              " + ( folder.isFirstPage() ? - button2( FIRSTPAGE, _("First") ) + " " + button2( PREVPAGE, _("Previous") ) : - button( FIRSTPAGE, _("First") ) + " " + button( PREVPAGE, _("Previous") ) ) + + button2( FIRSTPAGE, _t("First") ) + " " + button2( PREVPAGE, _t("Previous") ) : + button( FIRSTPAGE, _t("First") ) + " " + button( PREVPAGE, _t("Previous") ) ) + "      " + - _("Page {0} of {1}", folder.getCurrentPage(), folder.getPages()) + + _t("Page {0} of {1}", folder.getCurrentPage(), folder.getPages()) + "      " + ( folder.isLastPage() ? - button2( NEXTPAGE, _("Next") ) + " " + button2( LASTPAGE, _("Last") ) : - button( NEXTPAGE, _("Next") ) + " " + button( LASTPAGE, _("Last") ) ) + button2( NEXTPAGE, _t("Next") ) + " " + button2( LASTPAGE, _t("Last") ) : + button( NEXTPAGE, _t("Next") ) + " " + button( LASTPAGE, _t("Last") ) ) ); } @@ -2322,7 +2322,7 @@ public class WebMail extends HttpServlet private static void showMessage( PrintWriter out, SessionObject sessionObject ) { if( sessionObject.reallyDelete ) { - out.println( "

              " + _("Really delete this message?") + " " + button( REALLYDELETE, _("Yes, really delete it!") ) + "

              " ); + out.println( "

              " + _t("Really delete this message?") + " " + button( REALLYDELETE, _t("Yes, really delete it!") ) + "

              " ); } Mail mail = sessionObject.mailCache.getMail( sessionObject.showUIDL, MailCache.FetchMode.ALL ); if(!RELEASE && mail != null && mail.hasBody()) { @@ -2334,31 +2334,31 @@ public class WebMail extends HttpServlet out.println( "-->" ); } out.println("
              "); - out.println( button( NEW, _("New") ) + spacer + - button( REPLY, _("Reply") ) + - button( REPLYALL, _("Reply All") ) + - button( FORWARD, _("Forward") ) + spacer + - button( SAVE_AS, _("Save As") ) + spacer); + out.println( button( NEW, _t("New") ) + spacer + + button( REPLY, _t("Reply") ) + + button( REPLYALL, _t("Reply All") ) + + button( FORWARD, _t("Forward") ) + spacer + + button( SAVE_AS, _t("Save As") ) + spacer); if (sessionObject.reallyDelete) - out.println(button2(DELETE, _("Delete"))); + out.println(button2(DELETE, _t("Delete"))); else - out.println(button(DELETE, _("Delete"))); + out.println(button(DELETE, _t("Delete"))); out.println("
              " + - ( sessionObject.folder.isFirstElement( sessionObject.showUIDL ) ? button2( PREV, _("Previous") ) : button( PREV, _("Previous") ) ) + spacer + - button( LIST, _("Back to Folder") ) + spacer + - ( sessionObject.folder.isLastElement( sessionObject.showUIDL ) ? button2( NEXT, _("Next") ) : button( NEXT, _("Next") ) )); + ( sessionObject.folder.isFirstElement( sessionObject.showUIDL ) ? button2( PREV, _t("Previous") ) : button( PREV, _t("Previous") ) ) + spacer + + button( LIST, _t("Back to Folder") ) + spacer + + ( sessionObject.folder.isLastElement( sessionObject.showUIDL ) ? button2( NEXT, _t("Next") ) : button( NEXT, _t("Next") ) )); out.println("
              "); //if (Config.hasConfigFile()) - // out.println(button( RELOAD, _("Reload Config") ) + spacer); - //out.println(button( LOGOUT, _("Logout") ) ); + // out.println(button( RELOAD, _t("Reload Config") ) + spacer); + //out.println(button( LOGOUT, _t("Logout") ) ); if( mail != null ) { out.println( "\n" + "\n" + - "\n" + - "\n" + - "\n" + "" ); if( mail.hasPart()) { @@ -2366,11 +2366,11 @@ public class WebMail extends HttpServlet showPart( out, mail.getPart(), 0, SHOW_HTML ); } else { - out.println( "" ); + out.println( "" ); } } else { - out.println( "" ); + out.println( "" ); } out.println( "\n
              " + _("From") + + "
              " + _t("From") + ":" + quoteHTML( mail.sender ) + "
              " + _("Subject") + + "
              " + _t("Subject") + ":" + quoteHTML( mail.formattedSubject ) + "
              " + _("Date") + + "
              " + _t("Date") + ":" + mail.quotedDate + "

              " + _("Could not fetch mail body.") + "

              " + _t("Could not fetch mail body.") + "

              " + _("Could not fetch mail.") + "

              " + _t("Could not fetch mail.") + "

              " ); } @@ -2388,13 +2388,13 @@ public class WebMail extends HttpServlet sz = Config.getProperty(Folder.PAGESIZE, Folder.DEFAULT_PAGESIZE); out.println("
              "); out.println( - _("Folder Page Size") + ": " + " " + - button( SETPAGESIZE, _("Set") ) ); + button( SETPAGESIZE, _t("Set") ) ); out.println("

              "); out.println("

              "); - out.print(_("Advanced Configuration")); + out.print(_t("Advanced Configuration")); Properties config = Config.getProperties(); out.print(":

              "); out.println("
              "); out.println("
              "); - out.println(button(SAVE, _("Save Configuration"))); - out.println(button(CANCEL, _("Cancel"))); + out.println(button(SAVE, _t("Save Configuration"))); + out.println(button(CANCEL, _t("Cancel"))); out.println("
              "); } /** translate */ - private static String _(String s) { + private static String _t(String s) { return Messages.getString(s); } /** translate */ - private static String _(String s, Object o) { + private static String _t(String s, Object o) { return Messages.getString(s, o); } /** translate */ - private static String _(String s, Object o, Object o2) { + private static String _t(String s, Object o, Object o2) { return Messages.getString(s, o, o2); } diff --git a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java index f688ddc16..5ed201827 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java +++ b/apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java @@ -99,7 +99,7 @@ public class POP3MailBox implements NewMailListener { sizes = new HashMap(); synchronizer = new Object(); // this appears in the UI so translate - lastLine = _("No response from server"); + lastLine = _t("No response from server"); lastActive = new AtomicLong(System.currentTimeMillis()); lastChecked = new AtomicLong(); delayedDeleter = new DelayedDeleter(this); @@ -665,15 +665,15 @@ public class POP3MailBox implements NewMailListener { idleCloser = new IdleCloser(this); } else { if (lastError.equals("")) - lastError = _("Error connecting to server"); + lastError = _t("Error connecting to server"); close(); } } catch (NumberFormatException e1) { - lastError = _("Error opening mailbox") + ": " + e1; + lastError = _t("Error opening mailbox") + ": " + e1; } catch (IOException e1) { - lastError = _("Error opening mailbox") + ": " + e1.getLocalizedMessage(); + lastError = _t("Error opening mailbox") + ": " + e1.getLocalizedMessage(); } } } @@ -748,7 +748,7 @@ public class POP3MailBox implements NewMailListener { } } else { Debug.debug(Debug.DEBUG, "sendCmd1a: (" + cmd + ") NO RESPONSE"); - lastError = _("No response from server"); + lastError = _t("No response from server"); throw new IOException(lastError); } return result; @@ -790,7 +790,7 @@ public class POP3MailBox implements NewMailListener { String foo = DataHelper.readLine(in); updateActivity(); if (foo == null) { - lastError = _("No response from server"); + lastError = _t("No response from server"); throw new IOException(lastError); } sr.response = foo.trim(); @@ -1022,7 +1022,7 @@ public class POP3MailBox implements NewMailListener { e = e.substring(5); // translate this common error if (e.trim().equals("Login failed.")) - e = _("Login failed"); + e = _t("Login failed"); return e; } @@ -1257,7 +1257,7 @@ public class POP3MailBox implements NewMailListener { } /** translate */ - private static String _(String s) { + private static String _t(String s) { return Messages.getString(s); } } diff --git a/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java b/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java index f3f755698..046dcbef5 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java +++ b/apps/susimail/src/src/i2p/susi/webmail/smtp/SMTPClient.java @@ -211,7 +211,7 @@ public class SMTPClient { try { socket = new Socket( host, port ); } catch (Exception e) { - error += _("Cannot connect") + ": " + e.getMessage() + '\n'; + error += _t("Cannot connect") + ": " + e.getMessage() + '\n'; ok = false; } try { @@ -222,7 +222,7 @@ public class SMTPClient { socket.setSoTimeout(120*1000); int result = sendCmd(null); if (result != 220) { - error += _("Server refused connection") + " (" + result + ")\n"; + error += _t("Server refused connection") + " (" + result + ")\n"; ok = false; } } @@ -234,7 +234,7 @@ public class SMTPClient { if (r.result == 250) { supportsPipelining = r.recv.contains("PIPELINING"); } else { - error += _("Server refused connection") + " (" + r.result + ")\n"; + error += _t("Server refused connection") + " (" + r.result + ")\n"; ok = false; } } @@ -246,7 +246,7 @@ public class SMTPClient { cmds.add(new SendExpect(base64.encode(user), 334)); cmds.add(new SendExpect(base64.encode(pass), 235)); if (sendCmds(cmds) != 3) { - error += _("Login failed") + '\n'; + error += _t("Login failed") + '\n'; ok = false; } } @@ -259,7 +259,7 @@ public class SMTPClient { cmds.add(new SendExpect("DATA", 354)); if (sendCmds(cmds) != cmds.size()) { // TODO which recipient? - error += _("Mail rejected") + '\n'; + error += _t("Mail rejected") + '\n'; ok = false; } } @@ -273,10 +273,10 @@ public class SMTPClient { if (result == 250) mailSent = true; else - error += _("Error sending mail") + " (" + result + ")\n"; + error += _t("Error sending mail") + " (" + result + ")\n"; } } catch (IOException e) { - error += _("Error sending mail") + ": " + e.getMessage() + '\n'; + error += _t("Error sending mail") + ": " + e.getMessage() + '\n'; } catch (EncodingException e) { error += e.getMessage(); @@ -324,7 +324,7 @@ public class SMTPClient { } /** translate */ - private static String _(String s) { + private static String _t(String s) { return Messages.getString(s); } } diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index f35a6ddb6..352529a6e 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -1546,7 +1546,7 @@ public class DataHelper { // years t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000))); } else { - return _("n/a"); + return _t("n/a"); } // Replace minus sign to work around // bug in Chrome (and IE?), line breaks at the minus sign @@ -1593,7 +1593,7 @@ public class DataHelper { // years t = ngettext("1 year", "{0} years", (int) (ms / (365L * 24 * 60 * 60 * 1000))); } else { - return _("n/a"); + return _t("n/a"); } if (ms < 0) t = t.replace("-", "−"); @@ -1602,7 +1602,7 @@ public class DataHelper { private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; - private static String _(String key) { + private static String _t(String key) { return Translate.getString(key, I2PAppContext.getGlobalContext(), BUNDLE_NAME); } diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java index 053cccdc6..08683b622 100644 --- a/core/java/src/net/i2p/util/LogWriterBase.java +++ b/core/java/src/net/i2p/util/LogWriterBase.java @@ -145,7 +145,7 @@ abstract class LogWriterBase implements Runnable { private String dupMessage(int dupCount, LogRecord lastRecord, boolean reverse) { String arrows = reverse ? "↓↓↓" : "^^^"; return LogRecordFormatter.getWhen(_manager, lastRecord) + ' ' + arrows + ' ' + - _(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + '\n'; + _t(dupCount, "1 similar message omitted", "{0} similar messages omitted") + ' ' + arrows + '\n'; } private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; @@ -154,7 +154,7 @@ abstract class LogWriterBase implements Runnable { * gettext * @since 0.9.3 */ - private String _(int a, String b, String c) { + private String _t(int a, String b, String c) { return Translate.getString(a, b, c, _manager.getContext(), BUNDLE_NAME); } diff --git a/core/java/src/net/i2p/util/Translate.java b/core/java/src/net/i2p/util/Translate.java index d83036d02..3b5ab1b53 100644 --- a/core/java/src/net/i2p/util/Translate.java +++ b/core/java/src/net/i2p/util/Translate.java @@ -65,7 +65,7 @@ public abstract class Translate { * 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")) + * To tranlslate parameter also, use _t("foo {0} bar", _t("baz")) * Do not double the single quotes in the parameter. * Use autoboxing to call with ints, longs, floats, etc. */ diff --git a/history.txt b/history.txt index b6097d90a..2a0172d77 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2015-09-25 dg + * Rename _() for translation to _t() for Java 9 compatibility (ticket #1456) + 2015-09-20 dg * /configreseed: Add 'Reset URL list' button for revert to default hosts (ticket #1554, thanks dzirtt@gmail.com) diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index 4e931f665..3ad8e7387 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -917,7 +917,7 @@ public class Blocklist { singles.addAll(_singleIPBlocklist); if (!(singles.isEmpty() && _singleIPv6Blocklist.isEmpty())) { out.write(""); // first 0 - 127 for (Integer ii : singles) { @@ -954,11 +954,11 @@ public class Blocklist { } if (_blocklistSize > 0) { out.write("
              "); - out.write(_("IPs Banned Until Restart")); + out.write(_t("IPs Banned Until Restart")); out.write("
              "); int max = Math.min(_blocklistSize, MAX_DISPLAY); int displayed = 0; @@ -994,7 +994,7 @@ public class Blocklist { out.write("
              "); - out.write(_("IPs Permanently Banned")); + out.write(_t("IPs Permanently Banned")); out.write("
              "); - out.write(_("From")); + out.write(_t("From")); out.write(""); - out.write(_("To")); + out.write(_t("To")); out.write("
              "); } else { out.write("
              "); - out.write(_("none")); + out.write(_t("none")); out.write(""); } out.flush(); @@ -1030,7 +1030,7 @@ public class Blocklist { private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; /** translate */ - private String _(String key) { + private String _t(String key) { return Translate.getString(key, _context, BUNDLE_NAME); } diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a6204817e..f2522cd4e 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 = 8; + public final static long BUILD = 9; /** for example "-test" */ public final static String EXTRA = ""; 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 f619391ec..bc7b1eeb1 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -209,7 +209,7 @@ public class Reseeder { if (fetched <= 0) throw new IOException("No seeds extracted"); _checker.setStatus( - _("Reseeding: got router info from file ({0} successful, {1} errors).", fetched, errors)); + _t("Reseeding: got router info from file ({0} successful, {1} errors).", fetched, errors)); System.err.println("Reseed got " + fetched + " router infos from file with " + errors + " errors"); _context.router().eventLog().addEvent(EventLog.RESEED, fetched + " from file"); return fetched; @@ -281,7 +281,7 @@ public class Reseeder { private void run2() { _isRunning = true; _checker.setError(""); - _checker.setStatus(_("Reseeding")); + _checker.setStatus(_t("Reseeding")); if (_context.getBooleanProperty(PROP_PROXY_ENABLE)) { _proxyHost = _context.getProperty(PROP_PROXY_HOST); _proxyPort = _context.getProperty(PROP_PROXY_PORT, -1); @@ -313,9 +313,9 @@ public class Reseeder { "and if nothing helps, read the FAQ about reseeding manually."); } // else < 0, no valid URLs String old = _checker.getError(); - _checker.setError(_("Reseed failed.") + ' ' + - _("See {0} for help.", - "" + _("reseed configuration page") + "") + + _checker.setError(_t("Reseed failed.") + ' ' + + _t("See {0} for help.", + "" + _t("reseed configuration page") + "") + "
              " + old); } _isRunning = false; @@ -563,7 +563,7 @@ public class Reseeder { try { // Don't use context clock as we may be adjusting the time final long timeLimit = System.currentTimeMillis() + MAX_TIME_PER_HOST; - _checker.setStatus(_("Reseeding: fetching seed URL.")); + _checker.setStatus(_t("Reseeding: fetching seed URL.")); System.err.println("Reseeding from " + seedURL); byte contentRaw[] = readURL(seedURL); if (contentRaw == null) { @@ -620,7 +620,7 @@ public class Reseeder { iter.hasNext() && fetched < 200 && System.currentTimeMillis() < timeLimit; ) { try { _checker.setStatus( - _("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors)); + _t("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors)); if (!fetchSeed(seedURL.toString(), iter.next())) continue; @@ -694,7 +694,7 @@ public class Reseeder { int errors = 0; File contentRaw = null; try { - _checker.setStatus(_("Reseeding: fetching seed URL.")); + _checker.setStatus(_t("Reseeding: fetching seed URL.")); System.err.println("Reseeding from " + seedURL); // don't use context time, as we may be step-changing it // from the server header @@ -730,7 +730,7 @@ public class Reseeder { contentRaw.delete(); } _checker.setStatus( - _("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors)); + _t("Reseeding: fetching router info from seed URL ({0} successful, {1} errors).", fetched, errors)); System.err.println("Reseed got " + fetched + " router infos from " + seedURL + " with " + errors + " errors"); return fetched; } @@ -1002,17 +1002,17 @@ public class Reseeder { private static final String BUNDLE_NAME = "net.i2p.router.web.messages"; /** translate */ - private String _(String key) { + private String _t(String key) { return Translate.getString(key, _context, BUNDLE_NAME); } /** translate */ - private String _(String s, Object o) { + private String _t(String s, Object o) { return Translate.getString(s, o, _context, BUNDLE_NAME); } /** translate */ - private String _(String s, Object o, Object o2) { + private String _t(String s, Object o, Object o2) { return Translate.getString(s, o, o2, _context, BUNDLE_NAME); } diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index a9b802060..fbea02990 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -499,7 +499,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { buf.append(""); boolean found = _context.netDb().lookupRouterInfoLocally(peer) != null; if (found) - buf.append(""); + buf.append(""); buf.append(h); if (found) buf.append(""); @@ -519,7 +519,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { /** * Translate */ - private final String _(String s) { + private final String _t(String s) { return Translate.getString(s, _context, BUNDLE_NAME); } diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index ce2d643a6..11fb08b96 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -983,7 +983,7 @@ public abstract class TransportImpl implements Transport { * Translate * @since 0.9.8 moved from transports */ - protected String _(String s) { + protected String _t(String s) { return Translate.getString(s, _context, BUNDLE_NAME); } @@ -991,7 +991,7 @@ public abstract class TransportImpl implements Transport { * Translate * @since 0.9.8 moved from transports */ - protected String _(String s, Object o) { + protected String _t(String s, Object o) { return Translate.getString(s, o, _context, BUNDLE_NAME); } diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 4c0f325bb..b49ff1551 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -671,9 +671,9 @@ public class TransportManager implements TransportEventListener { public void renderStatusHTML(Writer out, String urlBase, int sortFlags) throws IOException { if (_context.getBooleanProperty(PROP_ADVANCED)) { out.write("

              "); - out.write(_("Status")); + out.write(_t("Status")); out.write(": "); - out.write(_(getReachabilityStatus().toStatusString())); + out.write(_t(getReachabilityStatus().toStatusString())); out.write("

              "); } TreeMap transports = new TreeMap(); @@ -689,7 +689,7 @@ public class TransportManager implements TransportEventListener { } StringBuilder buf = new StringBuilder(4*1024); - buf.append("

              ").append(_("Router Transport Addresses")).append("

              \n");
+        buf.append("
              ").append(_t("Router Transport Addresses")).append("
              \n");
         for (Transport t : _transports.values()) {
             if (t.hasCurrentAddress()) {
                 for (RouterAddress ra : t.getCurrentAddresses()) {
@@ -697,7 +697,7 @@ public class TransportManager implements TransportEventListener {
                     buf.append("\n\n");
                 }
             } else {
-                buf.append(_("{0} is used for outbound connections only", t.getStyle()));
+                buf.append(_t("{0} is used for outbound connections only", t.getStyle()));
                 buf.append("\n\n");
             }
         }
@@ -708,7 +708,7 @@ public class TransportManager implements TransportEventListener {
         } else if (_upnpManager != null) {
             out.write(_upnpManager.renderStatusHTML());
         } else {
-            out.write("
              " + _("UPnP is not enabled") + "
              \n");
+            out.write("
              " + _t("UPnP is not enabled") + "
              \n");
         }
         out.write("
              \n");
         out.flush();
@@ -717,38 +717,38 @@ public class TransportManager implements TransportEventListener {
 
     private final String getTransportsLegend() {
         StringBuilder buf = new StringBuilder(1024);
-        buf.append("
              ").append(_("Help")).append("
              ")
-           .append(_("Your transport connection limits are automatically set based on your configured bandwidth."))
+        buf.append("
              ").append(_t("Help")).append("
              ")
+           .append(_t("Your transport connection limits are automatically set based on your configured bandwidth."))
            .append('\n')
-           .append(_("To override these limits, add the settings i2np.ntcp.maxConnections=nnn and i2np.udp.maxConnections=nnn on the advanced configuration page."))
+           .append(_t("To override these limits, add the settings i2np.ntcp.maxConnections=nnn and i2np.udp.maxConnections=nnn on the advanced configuration page."))
            .append("
              \n");
-        buf.append("
              ").append(_("Definitions")).append("
              " +
-                   "
              ").append(_("Peer")).append(": ").append(_("The remote peer, identified by router hash")).append("
              \n" +
-                   "").append(_("Dir")).append(": " +
-                   "\"Inbound\" ").append(_("Inbound connection")).append("
              \n" +
+        buf.append("
              ").append(_t("Definitions")).append("
              " +
+                   "
              ").append(_t("Peer")).append(": ").append(_t("The remote peer, identified by router hash")).append("
              \n" +
+                   "").append(_t("Dir")).append(": " +
+                   "\"Inbound\" ").append(_t("Inbound connection")).append("
              \n" +
                    "       " +
-                   "\"Outbound\" ").append(_("Outbound connection")).append("
              \n" +
+                   "\"Outbound\" ").append(_t("Outbound connection")).append("
              \n" +
                    "       " +
-                   "\"V\" ").append(_("They offered to introduce us (help other peers traverse our firewall)")).append("
              \n" +
+                   "\"V\" ").append(_t("They offered to introduce us (help other peers traverse our firewall)")).append("
              \n" +
                    "       " +
-                   "\"^\" ").append(_("We offered to introduce them (help other peers traverse their firewall)")).append("
              \n" +
-                   "").append(_("Idle")).append(": ").append(_("How long since a packet has been received / sent")).append("
              \n" +
-                   "").append(_("In/Out")).append(": ").append(_("The smoothed inbound / outbound transfer rate (KBytes per second)")).append("
              \n" +
-                   "").append(_("Up")).append(": ").append(_("How long ago this connection was established")).append("
              \n" +
-                   "").append(_("Skew")).append(": ").append(_("The difference between the peer's clock and your own")).append("
              \n" +
-                   "CWND: ").append(_("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" / 
              \n" +
-                   "        ").append(_("The number of sent messages awaiting acknowledgement")).append(" /
              \n" +
-                   "        ").append(_("The maximum number of concurrent messages to send")).append(" /
              \n"+
-                   "        ").append(_("The number of pending sends which exceed congestion window")).append("
              \n" +
-                   "SST: ").append(_("The slow start threshold")).append("
              \n" +
-                   "RTT: ").append(_("The round trip time in milliseconds")).append("
              \n" +
-                   //"").append(_("Dev")).append(": ").append(_("The standard deviation of the round trip time in milliseconds")).append("
              \n" +
-                   "RTO: ").append(_("The retransmit timeout in milliseconds")).append("
              \n" +
-                   "MTU: ").append(_("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("
              \n" +
-                   "").append(_("TX")).append(": ").append(_("The total number of packets sent to the peer")).append("
              \n" +
-                   "").append(_("RX")).append(": ").append(_("The total number of packets received from the peer")).append("
              \n" +
-                   "").append(_("Dup TX")).append(": ").append(_("The total number of packets retransmitted to the peer")).append("
              \n" +
-                   "").append(_("Dup RX")).append(": ").append(_("The total number of duplicate packets received from the peer")).append("
              " +
+                   "\"^\" ").append(_t("We offered to introduce them (help other peers traverse their firewall)")).append("
              \n" +
+                   "").append(_t("Idle")).append(": ").append(_t("How long since a packet has been received / sent")).append("
              \n" +
+                   "").append(_t("In/Out")).append(": ").append(_t("The smoothed inbound / outbound transfer rate (KBytes per second)")).append("
              \n" +
+                   "").append(_t("Up")).append(": ").append(_t("How long ago this connection was established")).append("
              \n" +
+                   "").append(_t("Skew")).append(": ").append(_t("The difference between the peer's clock and your own")).append("
              \n" +
+                   "CWND: ").append(_t("The congestion window, which is how many bytes can be sent without an acknowledgement")).append(" / 
              \n" +
+                   "        ").append(_t("The number of sent messages awaiting acknowledgement")).append(" /
              \n" +
+                   "        ").append(_t("The maximum number of concurrent messages to send")).append(" /
              \n"+
+                   "        ").append(_t("The number of pending sends which exceed congestion window")).append("
              \n" +
+                   "SST: ").append(_t("The slow start threshold")).append("
              \n" +
+                   "RTT: ").append(_t("The round trip time in milliseconds")).append("
              \n" +
+                   //"").append(_t("Dev")).append(": ").append(_t("The standard deviation of the round trip time in milliseconds")).append("
              \n" +
+                   "RTO: ").append(_t("The retransmit timeout in milliseconds")).append("
              \n" +
+                   "MTU: ").append(_t("Current maximum send packet size / estimated maximum receive packet size (bytes)")).append("
              \n" +
+                   "").append(_t("TX")).append(": ").append(_t("The total number of packets sent to the peer")).append("
              \n" +
+                   "").append(_t("RX")).append(": ").append(_t("The total number of packets received from the peer")).append("
              \n" +
+                   "").append(_t("Dup TX")).append(": ").append(_t("The total number of packets retransmitted to the peer")).append("
              \n" +
+                   "").append(_t("Dup RX")).append(": ").append(_t("The total number of duplicate packets received from the peer")).append("
              " +
                    "
              \n");
         return buf.toString();
     }
@@ -770,14 +770,14 @@ public class TransportManager implements TransportEventListener {
     /**
      *  Translate
      */
-    private final String _(String s) {
+    private final String _t(String s) {
         return Translate.getString(s, _context, BUNDLE_NAME);
     }
 
     /**
      *  Translate
      */
-    private final String _(String s, Object o) {
+    private final String _t(String s, Object o) {
         return Translate.getString(s, o, _context, BUNDLE_NAME);
     }
 }
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 29e0a037c..baec7ab62 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -557,68 +557,68 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		for(int i=0; i").append(_("Service")).append(": ");
+			sb.append("
            3. ").append(_t("Service")).append(": ");
 			// NOTE: Group all toString() of common actions together
 			// to avoid excess fetches, since toString() caches.
 			if("urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1".equals(serv.getServiceType())){
-				sb.append(_("WAN Common Interface Configuration"));
-				sb.append("
              • ").append(_("Status")).append(": ")
+				sb.append(_t("WAN Common Interface Configuration"));
+				sb.append("
                • ").append(_t("Status")).append(": ")
 				  .append(toString("GetCommonLinkProperties", "NewPhysicalLinkStatus", serv));
-				sb.append("
                • ").append(_("Type")).append(": ")
+				sb.append("
                • ").append(_t("Type")).append(": ")
 				  .append(toString("GetCommonLinkProperties", "NewWANAccessType", serv));
-				sb.append("
                • ").append(_("Upstream")).append(": ")
+				sb.append("
                • ").append(_t("Upstream")).append(": ")
 				  .append(toString("GetCommonLinkProperties", "NewLayer1UpstreamMaxBitRate", serv));
-				sb.append("
                • ").append(_("Downstream")).append(": ")
+				sb.append("
                • ").append(_t("Downstream")).append(": ")
 				  .append(toString("GetCommonLinkProperties", "NewLayer1DownstreamMaxBitRate", serv))
 				  .append("
                  • ");
 			}else if("urn:schemas-upnp-org:service:WANPPPConnection:1".equals(serv.getServiceType())){
-				sb.append(_("WAN PPP Connection"));
-				sb.append("
                  • ").append(_("Status")).append(": ")
+				sb.append(_t("WAN PPP Connection"));
+				sb.append("
                    • ").append(_t("Status")).append(": ")
 				  .append(toString("GetStatusInfo", "NewConnectionStatus", serv));
 				String up = toString("GetStatusInfo", "NewUptime", serv);
 				if (up != null) {
 					try {
 						long uptime = Long.parseLong(up);
 						uptime *= 1000;
-						sb.append("
                    • ").append(_("Uptime")).append(": ")
+						sb.append("
                    • ").append(_t("Uptime")).append(": ")
 						  .append(DataHelper.formatDuration2(uptime));
 					} catch (NumberFormatException nfe) {}
 				}
-				sb.append("
                    • ").append(_("Type")).append(": ")
+				sb.append("
                    • ").append(_t("Type")).append(": ")
 				  .append(toString("GetConnectionTypeInfo", "NewConnectionType", serv));
-				sb.append("
                    • ").append(_("Upstream")).append(": ")
+				sb.append("
                    • ").append(_t("Upstream")).append(": ")
 				  .append(toString("GetLinkLayerMaxBitRates", "NewUpstreamMaxBitRate", serv));
-				sb.append("
                    • ").append(_("Downstream")).append(": ")
+				sb.append("
                    • ").append(_t("Downstream")).append(": ")
 				  .append(toString("GetLinkLayerMaxBitRates", "NewDownstreamMaxBitRate", serv) + "
                      ");
-				sb.append("
                    • ").append(_("External IP")).append(": ")
+				sb.append("
                    • ").append(_t("External IP")).append(": ")
 				  .append(toString("GetExternalIPAddress", "NewExternalIPAddress", serv))
 				  .append("
                      • ");
 			}else if("urn:schemas-upnp-org:service:Layer3Forwarding:1".equals(serv.getServiceType())){
-				sb.append(_("Layer 3 Forwarding"));
-				sb.append("
                      • ").append(_("Default Connection Service")).append(": ")
+				sb.append(_t("Layer 3 Forwarding"));
+				sb.append("
                        • ").append(_t("Default Connection Service")).append(": ")
 				  .append(toString("GetDefaultConnectionService", "NewDefaultConnectionService", serv))
 				  .append("
                          • ");
 			}else if(WAN_IP_CONNECTION.equals(serv.getServiceType())){
-				sb.append(_("WAN IP Connection"));
-				sb.append("
                          • ").append(_("Status")).append(": ")
+				sb.append(_t("WAN IP Connection"));
+				sb.append("
                            • ").append(_t("Status")).append(": ")
 				  .append(toString("GetStatusInfo", "NewConnectionStatus", serv));
 				String up = toString("GetStatusInfo", "NewUptime", serv);
 				if (up != null) {
 					try {
 						long uptime = Long.parseLong(up);
 						uptime *= 1000;
-						sb.append("
                            • ").append(_("Uptime")).append(": ")
+						sb.append("
                            • ").append(_t("Uptime")).append(": ")
 						  .append(DataHelper.formatDuration2(uptime));
 					} catch (NumberFormatException nfe) {}
 				}
-				sb.append("
                            • ").append(_("Type")).append(": ")
+				sb.append("
                            • ").append(_t("Type")).append(": ")
 				  .append(toString("GetConnectionTypeInfo", "NewConnectionType", serv));
-				sb.append("
                            • ").append(_("External IP")).append(": ")
+				sb.append("
                            • ").append(_t("External IP")).append(": ")
 				  .append(toString("GetExternalIPAddress", "NewExternalIPAddress", serv))
 				  .append("
                              • ");
 			}else if("urn:schemas-upnp-org:service:WANEthernetLinkConfig:1".equals(serv.getServiceType())){
-				sb.append(_("WAN Ethernet Link Configuration"));
-				sb.append("
                              • ").append(_("Status")).append(": ")
+				sb.append(_t("WAN Ethernet Link Configuration"));
+				sb.append("
                                • ").append(_t("Status")).append(": ")
 				  .append(toString("GetEthernetLinkStatus", "NewEthernetLinkStatus", serv))
 				  .append("
                                  • ");
 			} else {
@@ -638,9 +638,9 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	
 	private void listSubDev(String prefix, Device dev, StringBuilder sb){
                 if (prefix == null)
-			sb.append("
                                  ").append(_("Found Device")).append(": ");
+			sb.append("
                                  ").append(_t("Found Device")).append(": ");
 		else
-			sb.append("
                                • ").append(_("Subdevice")).append(": ");
+			sb.append("
                                • ").append(_t("Subdevice")).append(": ");
 		sb.append(DataHelper.escapeHTML(dev.getFriendlyName()));
                 if (prefix == null)
 			sb.append("
                                  ");
@@ -661,11 +661,11 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	/** warning - slow */
 	public String renderStatusHTML() {
 		final StringBuilder sb = new StringBuilder();
-		sb.append("
                                  ").append(_("UPnP Status")).append("
                                  ");
+		sb.append("
                                  ").append(_t("UPnP Status")).append("
                                  ");
 		
 		synchronized(_otherUDNs) {
 			if (!_otherUDNs.isEmpty()) {
-				sb.append(_("Disabled UPnP Devices"));
+				sb.append(_t("Disabled UPnP Devices"));
 				sb.append("
                                    ");
 				for (Map.Entry e : _otherUDNs.entrySet()) {
 					String udn = e.getKey();
@@ -679,10 +679,10 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		}
 
 		if(isDisabled) {
-			sb.append(_("UPnP has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?"));
+			sb.append(_t("UPnP has been disabled; Do you have more than one UPnP Internet Gateway Device on your LAN ?"));
 			return sb.toString();
 		} else if(!isNATPresent()) {
-			sb.append(_("UPnP has not found any UPnP-aware, compatible device on your LAN."));
+			sb.append(_t("UPnP has not found any UPnP-aware, compatible device on your LAN."));
 			return sb.toString();
 		}
 		
@@ -690,15 +690,15 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		String addr = getNATAddress();
 		sb.append("
                                    ");
 		if (addr != null)
-		    sb.append(_("The current external IP address reported by UPnP is {0}", DataHelper.escapeHTML(addr)));
+		    sb.append(_t("The current external IP address reported by UPnP is {0}", DataHelper.escapeHTML(addr)));
 		else
-		    sb.append(_("The current external IP address is not available."));
+		    sb.append(_t("The current external IP address is not available."));
 		int downstreamMaxBitRate = getDownstreamMaxBitRate();
 		int upstreamMaxBitRate = getUpstreamMaxBitRate();
 		if(downstreamMaxBitRate > 0)
-			sb.append("
                                    ").append(_("UPnP reports the maximum downstream bit rate is {0}bits/sec", DataHelper.formatSize2(downstreamMaxBitRate)));
+			sb.append("
                                    ").append(_t("UPnP reports the maximum downstream bit rate is {0}bits/sec", DataHelper.formatSize2(downstreamMaxBitRate)));
 		if(upstreamMaxBitRate > 0)
-			sb.append("
                                    ").append(_("UPnP reports the maximum upstream bit rate is {0}bits/sec", DataHelper.formatSize2(upstreamMaxBitRate)));
+			sb.append("
                                    ").append(_t("UPnP reports the maximum upstream bit rate is {0}bits/sec", DataHelper.formatSize2(upstreamMaxBitRate)));
 		synchronized(lock) {
 			for(ForwardPort port : portsToForward) {
 				sb.append("
                                    ");
@@ -706,9 +706,9 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 					// {0} is TCP or UDP
 					// {1,number,#####} prevents 12345 from being output as 12,345 in the English locale.
 					// If you want the digit separator in your locale, translate as {1}.
-					sb.append(_("{0} port {1,number,#####} was successfully forwarded by UPnP.", protoToString(port.protocol), port.portNumber));
+					sb.append(_t("{0} port {1,number,#####} was successfully forwarded by UPnP.", protoToString(port.protocol), port.portNumber));
 				else
-					sb.append(_("{0} port {1,number,#####} was not forwarded by UPnP.", protoToString(port.protocol), port.portNumber));
+					sb.append(_t("{0} port {1,number,#####} was not forwarded by UPnP.", protoToString(port.protocol), port.portNumber));
 			}
 		}
 		
@@ -1101,21 +1101,21 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
     /**
      *  Translate
      */
-    private final String _(String s) {
+    private final String _t(String s) {
         return Translate.getString(s, _context, BUNDLE_NAME);
     }
 
     /**
      *  Translate
      */
-    private final String _(String s, Object o) {
+    private final String _t(String s, Object o) {
         return Translate.getString(s, o, _context, BUNDLE_NAME);
     }
 
     /**
      *  Translate
      */
-    private final String _(String s, Object o, Object o2) {
+    private final String _t(String s, Object o, Object o2) {
         return Translate.getString(s, o, o2, _context, BUNDLE_NAME);
     }
 }
diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index 0ff6d5d84..370ba813e 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -280,7 +280,7 @@ class UPnPManager {
      */
     public String renderStatusHTML() {
         if (!_isRunning)
-            return "
                                    " + _("UPnP is not enabled") + "
                                    \n";
+            return "
                                    " + _t("UPnP is not enabled") + "
                                    \n";
         return _upnp.renderStatusHTML();
     }
 
@@ -289,7 +289,7 @@ class UPnPManager {
     /**
      *  Translate
      */
-    private final String _(String s) {
+    private final String _t(String s) {
         return Translate.getString(s, _context, BUNDLE_NAME);
     }
 
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
index 382d4d89e..c38e932d5 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -1341,26 +1341,26 @@ public class NTCPTransport extends TransportImpl {
         }
 
         StringBuilder buf = new StringBuilder(512);
-        buf.append("
                                    ").append(_("NTCP connections")).append(": ").append(peers.size());
-        buf.append(". ").append(_("Limit")).append(": ").append(getMaxConnections());
-        buf.append(". ").append(_("Timeout")).append(": ").append(DataHelper.formatDuration2(_pumper.getIdleTimeout()));
+        buf.append("
                                    ").append(_t("NTCP connections")).append(": ").append(peers.size());
+        buf.append(". ").append(_t("Limit")).append(": ").append(getMaxConnections());
+        buf.append(". ").append(_t("Timeout")).append(": ").append(DataHelper.formatDuration2(_pumper.getIdleTimeout()));
         if (_context.getBooleanProperty(PROP_ADVANCED)) {
-            buf.append(". ").append(_("Status")).append(": ").append(_(getReachabilityStatus().toStatusString()));
+            buf.append(". ").append(_t("Status")).append(": ").append(_t(getReachabilityStatus().toStatusString()));
         }
         buf.append(".
                                    \n" +
                    "\n" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   "" +
-                   //"" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   "" +
+                   //"" +
                    " \n");
         out.write(buf.toString());
         buf.setLength(0);
@@ -1372,9 +1372,9 @@ public class NTCPTransport extends TransportImpl {
             //    buf.append(' ').append(_context.blocklist().toStr(ip));
             buf.append("");
                 }
                 List> alist = meta.getAnnounceList();
-                if (alist != null) {
+                if (alist != null && !alist.isEmpty()) {
                     buf.append("");
+                    buf.append("\n");
                 }
             }
 
             if (meta != null) {
                 String com = meta.getComment();
-                if (com != null) {
+                if (com != null && com.length() > 0) {
                     if (com.length() > 1024)
                         com = com.substring(0, 1024);
                     buf.append("\n");
                 }
                 String cby = meta.getCreatedBy();
-                if (cby != null) {
+                if (cby != null && cby.length() > 0) {
                     if (cby.length() > 128)
                         cby = com.substring(0, 128);
                     buf.append("
                                    ").append(_("Peer")).append("").append(_("Dir")).append("").append(_("IPv6")).append("").append(_("Idle")).append("").append(_("In/Out")).append("").append(_("Up")).append("").append(_("Skew")).append("").append(_("TX")).append("").append(_("RX")).append("").append(_("Out Queue")).append("").append(_("Backlogged?")).append("").append(_("Reading?")).append("
                                    ").append(_t("Peer")).append("").append(_t("Dir")).append("").append(_t("IPv6")).append("").append(_t("Idle")).append("").append(_t("In/Out")).append("").append(_t("Up")).append("").append(_t("Skew")).append("").append(_t("TX")).append("").append(_t("RX")).append("").append(_t("Out Queue")).append("").append(_t("Backlogged?")).append("").append(_t("Reading?")).append("
                                    ");
             if (con.isInbound())
-                buf.append("\"Inbound\"");
+                buf.append("\"Inbound\"");
             else
-                buf.append("\"Outbound\"");
+                buf.append("\"Outbound\"");
             buf.append("");
             if (con.isIPv6())
                 buf.append("✓");
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 d109cb099..223f655f5 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -2465,58 +2465,58 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         int numPeers = 0;
         
         StringBuilder buf = new StringBuilder(512);
-        buf.append("
                                    ").append(_("UDP connections")).append(": ").append(peers.size());
-        buf.append(". ").append(_("Limit")).append(": ").append(getMaxConnections());
-        buf.append(". ").append(_("Timeout")).append(": ").append(DataHelper.formatDuration2(_expireTimeout));
+        buf.append("
                                    ").append(_t("UDP connections")).append(": ").append(peers.size());
+        buf.append(". ").append(_t("Limit")).append(": ").append(getMaxConnections());
+        buf.append(". ").append(_t("Timeout")).append(": ").append(DataHelper.formatDuration2(_expireTimeout));
         if (_context.getBooleanProperty(PROP_ADVANCED)) {
-            buf.append(". ").append(_("Status")).append(": ").append(_(_reachabilityStatus.toStatusString()));
+            buf.append(". ").append(_t("Status")).append(": ").append(_t(_reachabilityStatus.toStatusString()));
         }
         buf.append(".
                                    \n");
         buf.append("\n");
-        buf.append("");
-        buf.append("\n");
-        buf.append("\n");
         buf.append("\n");
         buf.append("\n");
         buf.append("\n");
-        buf.append("\n");
         out.write(buf.toString());
         buf.setLength(0);
@@ -2532,17 +2532,17 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             //    buf.append(' ').append(_context.blocklist().toStr(ip));
             buf.append("");
 
             buf.append("
 
+<% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %>
 
@@ -166,18 +167,23 @@ ${book.loadBookMessages}
 
+<% } /* book..getEntries().length() > 0 */ %>
 
                                    ").append(_("Peer")).append("
                                    ");
+        buf.append("
                                    ").append(_t("Peer")).append("
                                    ");
         if (sortFlags != FLAG_ALPHA)
-            appendSortLinks(buf, urlBase, sortFlags, _("Sort by peer hash"), FLAG_ALPHA);
+            appendSortLinks(buf, urlBase, sortFlags, _t("Sort by peer hash"), FLAG_ALPHA);
         buf.append("                                    		").append(_("Dir"))
-           .append("").append(_("IPv6"))
-           .append("").append(_("Idle")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by idle inbound"), FLAG_IDLE_IN);
+           .append(_t("Direction/Introduction")).append("\">").append(_t("Dir"))
+           .append("                                    		").append(_t("IPv6"))
+           .append("").append(_t("Idle")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by idle inbound"), FLAG_IDLE_IN);
         buf.append(" / ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by idle outbound"), FLAG_IDLE_OUT);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by idle outbound"), FLAG_IDLE_OUT);
         buf.append("                                    		").append(_("In/Out")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by inbound rate"), FLAG_RATE_IN);
+        buf.append("                                    		").append(_t("In/Out")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by inbound rate"), FLAG_RATE_IN);
         buf.append(" / ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by outbound rate"), FLAG_RATE_OUT);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound rate"), FLAG_RATE_OUT);
         buf.append("                                    		").append(_("Up")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by connection uptime"), FLAG_UPTIME);
-        buf.append("                                    		").append(_("Skew")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by clock skew"), FLAG_SKEW);
+        buf.append("                                    		").append(_t("Up")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by connection uptime"), FLAG_UPTIME);
+        buf.append("                                    		").append(_t("Skew")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by clock skew"), FLAG_SKEW);
         buf.append("                                    		CWND
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by congestion window"), FLAG_CWND);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by congestion window"), FLAG_CWND);
         buf.append("                                    		SST
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by slow start threshold"), FLAG_SSTHRESH);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by slow start threshold"), FLAG_SSTHRESH);
         buf.append("                                    		RTT
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time"), FLAG_RTT);
-        //buf.append("                                    		").append(_("Dev")).append("
                                    ");
-        //appendSortLinks(buf, urlBase, sortFlags, _("Sort by round trip time deviation"), FLAG_DEV);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by round trip time"), FLAG_RTT);
+        //buf.append("                                    		").append(_t("Dev")).append("
                                    ");
+        //appendSortLinks(buf, urlBase, sortFlags, _t("Sort by round trip time deviation"), FLAG_DEV);
         buf.append("                                    		RTO
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by retransmission timeout"), FLAG_RTO);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by retransmission timeout"), FLAG_RTO);
         buf.append("                                    		MTU
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by outbound maximum transmit unit"), FLAG_MTU);
-        buf.append("                                    		").append(_("TX")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by packets sent"), FLAG_SEND);
-        buf.append("                                    		").append(_("RX")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by packets received"), FLAG_RECV);
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by outbound maximum transmit unit"), FLAG_MTU);
+        buf.append("                                    		").append(_t("TX")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets sent"), FLAG_SEND);
+        buf.append("                                    		").append(_t("RX")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received"), FLAG_RECV);
         buf.append("                                    		").append(_("Dup TX")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by packets retransmitted"), FLAG_RESEND);
-        buf.append("                                    		").append(_("Dup RX")).append("
                                    ");
-        appendSortLinks(buf, urlBase, sortFlags, _("Sort by packets received more than once"), FLAG_DUP);
+        buf.append("                                    		").append(_t("Dup TX")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets retransmitted"), FLAG_RESEND);
+        buf.append("                                    		").append(_t("Dup RX")).append("
                                    ");
+        appendSortLinks(buf, urlBase, sortFlags, _t("Sort by packets received more than once"), FLAG_DUP);
         buf.append("
                                    ");
             if (peer.isInbound())
-                buf.append("\"Inbound\"");
+                buf.append("\"Inbound\"");
             else
-                buf.append("\"Outbound\"");
+                buf.append("\"Outbound\"");
             if (peer.getWeRelayToThemAs() > 0)
-                buf.append("  \"^\"");
+                buf.append("  \"^\"");
             if (peer.getTheyRelayToUsAs() > 0)
-                buf.append("  \"V\"");
+                buf.append("  \"V\"");
             
             boolean appended = false;
             if (_activeThrottle.isChoked(peer.getRemotePeer())) {
-                buf.append("
                                    ").append(_("Choked")).append("");
+                buf.append("
                                    ").append(_t("Choked")).append("");
                 appended = true;
             }
             int cfs = peer.getConsecutiveFailedSends();
@@ -2550,15 +2550,15 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 if (!appended) buf.append("
                                    ");
                 buf.append(" ");
                 if (cfs == 1)
-                    buf.append(_("1 fail"));
+                    buf.append(_t("1 fail"));
                 else
-                    buf.append(_("{0} fails", cfs));
+                    buf.append(_t("{0} fails", cfs));
                 buf.append("");
                 appended = true;
             }
             if (_context.banlist().isBanlisted(peer.getRemotePeer(), STYLE)) {
                 if (!appended) buf.append("
                                    ");
-                buf.append(" ").append(_("Banned")).append("");
+                buf.append(" ").append(_t("Banned")).append("");
                 appended = true;
             }
             //byte[] ip = getIP(peer.getRemotePeer());
@@ -2617,7 +2617,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
             buf.append(THINSP).append(peer.getConcurrentSendWindow());
             buf.append(THINSP).append(peer.getConsecutiveSendRejections());
             if (peer.isBacklogged())
-                buf.append(' ').append(_("backlogged"));
+                buf.append(' ').append(_t("backlogged"));
             buf.append("                                    		");
@@ -2949,7 +2949,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                           " from: ", new Exception("traceback"));
             if (old != Status.UNKNOWN)
                 _context.router().eventLog().addEvent(EventLog.REACHABILITY,
-                   "from " + _(old.toStatusString()) + " to " +  _(status.toStatusString()));
+                   "from " + _t(old.toStatusString()) + " to " +  _t(status.toStatusString()));
             // Always rebuild when the status changes, even if our address hasn't changed,
             // as rebuildExternalAddress() calls replaceAddress() which calls CSFI.notifyReplaceAddress()
             // which will start up NTCP inbound when we transition to OK.

From 89c14c2e9a454f98728c413f28849bf642764abc Mon Sep 17 00:00:00 2001
From: dg2-new 
Date: Fri, 25 Sep 2015 20:21:03 +0000
Subject: [PATCH 184/258] javadoc

---
 apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
index 0bf598fd9..39120d6cc 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
@@ -356,7 +356,7 @@ class Sorters {
 
         /**
          *  @param storage may be null
-         *  @param remaining precomputed, non-null iff storage is non-null
+         *  @param remainingArray precomputed, non-null iff storage is non-null
          */
         public FileAndIndex(File file, Storage storage, long[] remainingArray) {
             this.file = file;

From a13552dd8db8f5a7f7723e8118d4c2cf63d3136f Mon Sep 17 00:00:00 2001
From: dg2-new 
Date: Fri, 25 Sep 2015 21:49:47 +0000
Subject: [PATCH 185/258] Fix news (ant poupdate), typos in bundle-*

---
 apps/desktopgui/bundle-messages.sh                   | 2 +-
 apps/i2psnark/java/bundle-messages.sh                | 2 +-
 apps/i2ptunnel/java/bundle-messages-proxy.sh         | 2 +-
 apps/i2ptunnel/java/bundle-messages.sh               | 2 +-
 apps/ministreaming/java/bundle-messages.sh           | 2 +-
 apps/routerconsole/java/bundle-messages-countries.sh | 2 +-
 apps/routerconsole/java/bundle-messages-news.sh      | 2 +-
 apps/routerconsole/java/bundle-messages.sh           | 2 +-
 apps/susidns/src/bundle-messages.sh                  | 2 +-
 apps/susimail/bundle-messages.sh                     | 2 +-
 core/java/src/net/i2p/util/TranslateReader.java      | 2 +-
 installer/resources/locale/bundle-messages.sh        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/desktopgui/bundle-messages.sh b/apps/desktopgui/bundle-messages.sh
index 997c76887..6823dde03 100644
--- a/apps/desktopgui/bundle-messages.sh
+++ b/apps/desktopgui/bundle-messages.sh
@@ -31,7 +31,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="src"
diff --git a/apps/i2psnark/java/bundle-messages.sh b/apps/i2psnark/java/bundle-messages.sh
index 9632ee958..7ef207a6d 100755
--- a/apps/i2psnark/java/bundle-messages.sh
+++ b/apps/i2psnark/java/bundle-messages.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/src"
diff --git a/apps/i2ptunnel/java/bundle-messages-proxy.sh b/apps/i2ptunnel/java/bundle-messages-proxy.sh
index 147e32952..a777a5eed 100755
--- a/apps/i2ptunnel/java/bundle-messages-proxy.sh
+++ b/apps/i2ptunnel/java/bundle-messages-proxy.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/build/Proxy.java ../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java ../java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java"
diff --git a/apps/i2ptunnel/java/bundle-messages.sh b/apps/i2ptunnel/java/bundle-messages.sh
index 29a0bec93..0b426cb4d 100755
--- a/apps/i2ptunnel/java/bundle-messages.sh
+++ b/apps/i2ptunnel/java/bundle-messages.sh
@@ -29,7 +29,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/src/net/i2p/i2ptunnel/web ../jsp/WEB-INF"
diff --git a/apps/ministreaming/java/bundle-messages.sh b/apps/ministreaming/java/bundle-messages.sh
index 5c3395114..140efc61e 100755
--- a/apps/ministreaming/java/bundle-messages.sh
+++ b/apps/ministreaming/java/bundle-messages.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/src"
diff --git a/apps/routerconsole/java/bundle-messages-countries.sh b/apps/routerconsole/java/bundle-messages-countries.sh
index d4f1b9e71..23588e440 100755
--- a/apps/routerconsole/java/bundle-messages-countries.sh
+++ b/apps/routerconsole/java/bundle-messages-countries.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 #
 # generate strings/Countries.java from ../../../installer/resources/countries.txt
diff --git a/apps/routerconsole/java/bundle-messages-news.sh b/apps/routerconsole/java/bundle-messages-news.sh
index 4b71ea4fc..759a3137b 100755
--- a/apps/routerconsole/java/bundle-messages-news.sh
+++ b/apps/routerconsole/java/bundle-messages-news.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="../java/build/News.java"
diff --git a/apps/routerconsole/java/bundle-messages.sh b/apps/routerconsole/java/bundle-messages.sh
index ebe925b3e..dd100561b 100755
--- a/apps/routerconsole/java/bundle-messages.sh
+++ b/apps/routerconsole/java/bundle-messages.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 
 # list specific files in core/ and router/ here, so we don't scan the whole tree
diff --git a/apps/susidns/src/bundle-messages.sh b/apps/susidns/src/bundle-messages.sh
index 6ae1e111f..25bfae4d7 100755
--- a/apps/susidns/src/bundle-messages.sh
+++ b/apps/susidns/src/bundle-messages.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../src/ so the refs will work in the po file
 JPATHS="../src/java/ ../src/tmp/"
diff --git a/apps/susimail/bundle-messages.sh b/apps/susimail/bundle-messages.sh
index 82945802a..8d8b55fc5 100644
--- a/apps/susimail/bundle-messages.sh
+++ b/apps/susimail/bundle-messages.sh
@@ -30,7 +30,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 # add ../java/ so the refs will work in the po file
 JPATHS="src"
diff --git a/core/java/src/net/i2p/util/TranslateReader.java b/core/java/src/net/i2p/util/TranslateReader.java
index bc26bbe59..5ab9bf2cb 100644
--- a/core/java/src/net/i2p/util/TranslateReader.java
+++ b/core/java/src/net/i2p/util/TranslateReader.java
@@ -351,7 +351,7 @@ public class TranslateReader extends FilterReader {
         public void tag(List args) {
             if (args.size() <= 0)
                 return;
-            _out.print("\t_(");
+            _out.print("\t_t(");
             for (int i = 0; i < args.size(); i++) {
                 if (i > 0)
                     _out.print(", ");
diff --git a/installer/resources/locale/bundle-messages.sh b/installer/resources/locale/bundle-messages.sh
index d49b553b0..ce5704d7e 100755
--- a/installer/resources/locale/bundle-messages.sh
+++ b/installer/resources/locale/bundle-messages.sh
@@ -24,7 +24,7 @@ if which find|grep -q -i windows ; then
 	export PATH=.:/bin:/usr/local/bin:$PATH
 fi
 # Fast mode - update ondemond
-# set LG2 to the language you need in envrionment varibales to enable this
+# set LG2 to the language you need in environment variables to enable this
 
 JPATHS=".."
 for i in po/messages_*.po

From ea4dd12bff4226235099ec5c76122526c3980491 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:10:59 +0000
Subject: [PATCH 186/258] SimpleTimer2:   - Fix bug in forceReschedule() that
 caused subsequent uncaught IllegalStateException;     forceReschedule() is
 only used by streaming timers   - Log uncaught exceptions   - Enforce 5
 second minimum delay for periodic events   - atomic count   - de-wtf

---
 core/java/src/net/i2p/util/SimpleTimer2.java | 53 ++++++++++++++------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index ec4f2528d..fa803338c 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -6,6 +6,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import net.i2p.I2PAppContext;
 
@@ -38,7 +39,7 @@ public class SimpleTimer2 {
     private static final int MAX_THREADS = 4;
     private final ScheduledThreadPoolExecutor _executor;
     private final String _name;
-    private volatile int _count;
+    private final AtomicInteger _count = new AtomicInteger();
     private final int _threads;
 
     /**
@@ -102,7 +103,7 @@ public class SimpleTimer2 {
             super.afterExecute(r, t);
             if (t != null) { // shoudn't happen, caught in RunnableEvent.run()
                 Log log = I2PAppContext.getGlobalContext().logManager().getLog(SimpleTimer2.class);
-                log.log(Log.CRIT, "wtf, event borked: " + r, t);
+                log.log(Log.CRIT, "event borked: " + r, t);
             }
         }
     }
@@ -110,7 +111,7 @@ public class SimpleTimer2 {
     private class CustomThreadFactory implements ThreadFactory {
         public Thread newThread(Runnable r) {
             Thread rv = Executors.defaultThreadFactory().newThread(r);
-            rv.setName(_name + ' ' + (++_count) + '/' + _threads);
+            rv.setName(_name + ' ' + _count.incrementAndGet() + '/' + _threads);
 // Uncomment this to test threadgrouping, but we should be all safe now that the constructor preallocates!
 //            String name = rv.getThreadGroup().getName();
 //            if(!name.equals("main")) {
@@ -164,7 +165,8 @@ public class SimpleTimer2 {
      * New code should use SimpleTimer2.TimedEvent.
      * 
      * @since 0.9.20
-     * @param timeoutMs run first and subsequent iterations of this event every timeoutMs ms
+     * @param timeoutMs run subsequent iterations of this event every timeoutMs ms, 5000 minimum
+     * @throws IllegalArgumentException if timeoutMs less than 5000
      */
     public void addPeriodicEvent(final SimpleTimer.TimedEvent event, final long timeoutMs) {
         addPeriodicEvent(event, timeoutMs, timeoutMs);
@@ -183,7 +185,8 @@ public class SimpleTimer2 {
      * 
      * @since 0.9.20
      * @param delay run the first iteration of this event after delay ms
-     * @param timeoutMs run subsequent iterations of this event every timeoutMs ms
+     * @param timeoutMs run subsequent iterations of this event every timeoutMs ms, 5000 minimum
+     * @throws IllegalArgumentException if timeoutMs less than 5000
      */
     public void addPeriodicEvent(final SimpleTimer.TimedEvent event, final long delay,  final long timeoutMs) {
         
@@ -286,9 +289,12 @@ public class SimpleTimer2 {
         public synchronized void schedule(long timeoutMs) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Scheduling: " + this + " timeout = " + timeoutMs + " state: " + _state);
-            if (timeoutMs <= 0 && _log.shouldLog(Log.WARN))
+            if (timeoutMs <= 0) {
+                if (_log.shouldLog(Log.WARN))
+                    _log.warn("Timeout <= 0: " + this + " timeout = " + timeoutMs + " state: " + _state);
                 timeoutMs = 1; // otherwise we may execute before _future is updated, which is fine
                                // except it triggers 'early execution' warning logging
+            }
 
             // always set absolute time of execution
             _nextRun = timeoutMs + System.currentTimeMillis();
@@ -352,11 +358,13 @@ public class SimpleTimer2 {
          * @param timeoutMs 
          */
         public synchronized void forceReschedule(long timeoutMs) {
-            cancel();
+            // don't cancel while running!
+            if (_state == TimedEventState.SCHEDULED)
+                cancel();
             schedule(timeoutMs);
         }
 
-        /** returns true if cancelled */
+        /** @return true if cancelled */
         public synchronized boolean cancel() {
             // always clear
             _rescheduleAfterRun = false;
@@ -378,20 +386,29 @@ public class SimpleTimer2 {
         }
 
         public void run() {
+            try {
+                run2();
+            } catch (RuntimeException re) {
+                _log.error("timer error", re);
+                throw re;
+            }
+        }
+
+        private void run2() {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Running: " + this);
             long before = System.currentTimeMillis();
             long delay = 0;
             synchronized(this) {
                 if (_rescheduleAfterRun)
-                    throw new IllegalStateException("rescheduleAfterRun cannot be true here");
+                    throw new IllegalStateException(this + " rescheduleAfterRun cannot be true here");
                 
                 switch(_state) {
                   case CANCELLED: 
                     return; // goodbye
                   case IDLE:  // fall through
                   case RUNNING:
-                    throw new IllegalStateException("not possible to be in " + _state);
+                    throw new IllegalStateException(this + " not possible to be in " + _state);
                   case SCHEDULED: // proceed, switch to IDLE in case I need to reschedule
                     _state = TimedEventState.IDLE;
                 }
@@ -411,12 +428,12 @@ public class SimpleTimer2 {
             if (_future != null)
                 delay = _future.getDelay(TimeUnit.MILLISECONDS);
             else if (_log.shouldLog(Log.WARN))
-                _log.warn(_pool + " wtf, no _future " + this);
+                _log.warn(_pool + " no _future " + this);
             // This can be an incorrect warning especially after a schedule(0)
             if (_log.shouldLog(Log.WARN) && delay > 100)
-                _log.warn(_pool + " wtf, early execution " + delay + ": " + this);
+                _log.warn(_pool + " early execution " + delay + ": " + this);
             else if (_log.shouldLog(Log.WARN) && delay < -1000)
-                _log.warn(" wtf, late execution " + (0 - delay) + ": " + this + _pool.debug());
+                _log.warn(" late execution " + (0 - delay) + ": " + this + _pool.debug());
             try {
                 timeReached();
             } catch (Throwable t) {
@@ -426,7 +443,7 @@ public class SimpleTimer2 {
                     switch(_state) {
                       case SCHEDULED:  // fall through
                       case IDLE:
-                        throw new IllegalStateException("can't be " + _state);
+                        throw new IllegalStateException(this + " can't be " + _state);
                       case CANCELLED:
                         break; // nothing
                       case RUNNING: 
@@ -441,7 +458,7 @@ public class SimpleTimer2 {
             }
             long time = System.currentTimeMillis() - before;
             if (time > 500 && _log.shouldLog(Log.WARN))
-                _log.warn(_pool + " wtf, event execution took " + time + ": " + this);
+                _log.warn(_pool + " event execution took " + time + ": " + this);
             if (_log.shouldLog(Log.INFO)) {
                  // this call is slow - iterates through a HashMap -
                  // would be better to have a local AtomicLong if we care
@@ -470,6 +487,7 @@ public class SimpleTimer2 {
         return _executor.getCompletedTaskCount();
     }
 
+    /** warning - slow */
     private String debug() {
         _executor.purge();  // Remove cancelled tasks from the queue so we get a good queue size stat
         return
@@ -490,10 +508,13 @@ public class SimpleTimer2 {
          * Schedule periodic event
          * 
          * @param delay run the first iteration of this event after delay ms
-         * @param timeoutMs run subsequent iterations of this event every timeoutMs ms
+         * @param timeoutMs run subsequent iterations of this event every timeoutMs ms, 5000 minimum
+         * @throws IllegalArgumentException if timeoutMs less than 5000
          */
         public PeriodicTimedEvent(SimpleTimer2 pool, long delay, long timeoutMs) {
             super(pool, delay);
+            if (timeoutMs < 5000)
+                throw new IllegalArgumentException("timeout minimum 5000");
             _timeoutMs = timeoutMs;
         }
         

From 3ea8b477d88d607d6ccbea6ad14391f2ef8b2d3f Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:14:18 +0000
Subject: [PATCH 187/258] Streaming: Move throttler from context timer to
 streaming timer

---
 .../src/net/i2p/client/streaming/impl/ConnThrottler.java | 8 ++++----
 .../net/i2p/client/streaming/impl/ConnectionManager.java | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
index 51941d219..3b69c1137 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
@@ -25,7 +25,7 @@ class ConnThrottler {
      * @param totalMax for all peers, 0 for unlimited
      * @param period ms
      */
-    ConnThrottler(int max, int totalMax, long period) {
+    ConnThrottler(int max, int totalMax, long period, SimpleTimer2 timer) {
         _max = max;
         _totalMax = totalMax;
         this.counter = new ObjectCounter();
@@ -33,9 +33,9 @@ class ConnThrottler {
         // shorten the initial period by a random amount
         // to prevent correlation across destinations
         // and identification of router startup time
-        SimpleTimer2.getInstance().addPeriodicEvent(new Cleaner(),
-                                                       (period / 2) + RandomSource.getInstance().nextLong(period / 2),
-                                                       period);
+        timer.addPeriodicEvent(new Cleaner(),
+                               (period / 2) + RandomSource.getInstance().nextLong(period / 2),
+                               period);
     }
 
     /*
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
index be2bbed11..5861be6d1 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
@@ -178,21 +178,24 @@ class ConnectionManager {
             if ((_defaultOptions.getMaxConnsPerMinute() > 0 || _defaultOptions.getMaxTotalConnsPerMinute() > 0) &&
                 _minuteThrottler == null) {
                _context.statManager().createRateStat("stream.con.throttledMinute", "Dropped for conn limit", "Stream", new long[] { 5*60*1000 });
-               _minuteThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerMinute(), _defaultOptions.getMaxTotalConnsPerMinute(), 60*1000);
+               _minuteThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerMinute(), _defaultOptions.getMaxTotalConnsPerMinute(),
+                                                    60*1000, _timer);
             } else if (_minuteThrottler != null) {
                _minuteThrottler.updateLimits(_defaultOptions.getMaxConnsPerMinute(), _defaultOptions.getMaxTotalConnsPerMinute());
             }
             if ((_defaultOptions.getMaxConnsPerHour() > 0 || _defaultOptions.getMaxTotalConnsPerHour() > 0) &&
                 _hourThrottler == null) {
                _context.statManager().createRateStat("stream.con.throttledHour", "Dropped for conn limit", "Stream", new long[] { 5*60*1000 });
-               _hourThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerHour(), _defaultOptions.getMaxTotalConnsPerHour(), 60*60*1000);
+               _hourThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerHour(), _defaultOptions.getMaxTotalConnsPerHour(),
+                                                  60*60*1000, _timer);
             } else if (_hourThrottler != null) {
                _hourThrottler.updateLimits(_defaultOptions.getMaxConnsPerHour(), _defaultOptions.getMaxTotalConnsPerHour());
             }
             if ((_defaultOptions.getMaxConnsPerDay() > 0 || _defaultOptions.getMaxTotalConnsPerDay() > 0) &&
                 _dayThrottler == null) {
                _context.statManager().createRateStat("stream.con.throttledDay", "Dropped for conn limit", "Stream", new long[] { 5*60*1000 });
-               _dayThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerDay(), _defaultOptions.getMaxTotalConnsPerDay(), 24*60*60*1000);
+               _dayThrottler = new ConnThrottler(_defaultOptions.getMaxConnsPerDay(), _defaultOptions.getMaxTotalConnsPerDay(),
+                                                 24*60*60*1000, _timer);
             } else if (_dayThrottler != null) {
                _dayThrottler.updateLimits(_defaultOptions.getMaxConnsPerDay(), _defaultOptions.getMaxTotalConnsPerDay());
             }

From 4d7ad6ef7f80637ff21b6903a0da0beb8354af74 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:53:37 +0000
Subject: [PATCH 188/258] Console: show 'none' if no leases log timing for
 /netdb (ticket #1532)

---
 .../src/net/i2p/router/web/NetDbRenderer.java | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
index e0340f68a..ff6b092a2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java
@@ -35,6 +35,7 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelPoolSettings;
 import net.i2p.router.util.HashDistance;   // debug
 import net.i2p.router.networkdb.kademlia.FloodfillNetworkDatabaseFacade;
+import net.i2p.util.Log;
 import net.i2p.util.ObjectCounter;
 import net.i2p.util.Translate;
 import net.i2p.util.VersionComparator;
@@ -141,16 +142,20 @@ public class NetDbRenderer {
         int rapCount = 0;
         BigInteger median = null;
         int c = 0;
-        if (debug) {
+        if (leases.isEmpty()) {
+          if (!debug)
+              buf.append("").append(_t("none")).append("");
+        } else {
+          if (debug) {
             // Find the center of the RAP leasesets
             for (LeaseSet ls : leases) {
                 if (ls.getReceivedAsPublished())
                     rapCount++;
             }
             medianCount = rapCount / 2;
-        }
-        long now = _context.clock().now();
-        for (LeaseSet ls : leases) {
+          }
+          long now = _context.clock().now();
+          for (LeaseSet ls : leases) {
             Destination dest = ls.getDestination();
             Hash key = dest.calculateHash();
             buf.append("").append(_t("LeaseSet")).append(": ").append(key.toBase64()).append("\n");
@@ -223,7 +228,8 @@ public class NetDbRenderer {
             buf.append("
                                    \n");
             out.write(buf.toString());
             buf.setLength(0);
-        }
+          } // for each
+        }  // !empty
         if (debug) {
             FloodfillNetworkDatabaseFacade netdb = (FloodfillNetworkDatabaseFacade)_context.netDb();
             buf.append("
                                    Total Leasesets: ").append(leases.size());
@@ -281,6 +287,8 @@ public class NetDbRenderer {
             out.flush();
             return;
         }
+        Log log = _context.logManager().getLog(NetDbRenderer.class);
+        long start = System.currentTimeMillis();
         
         boolean full = mode == 1;
         boolean shortStats = mode == 2;
@@ -319,6 +327,10 @@ public class NetDbRenderer {
                 transportCount[classifyTransports(ri)]++;
             }
         }
+        long end = System.currentTimeMillis();
+        if (log.shouldWarn())
+            log.warn("part 1 took " + (end - start));
+        start = end;
             
      //
      // don't bother to reindent
@@ -346,6 +358,10 @@ public class NetDbRenderer {
         buf.append("
                                    		");
         out.write(buf.toString());
         buf.setLength(0);
+        end = System.currentTimeMillis();
+        if (log.shouldWarn())
+            log.warn("part 2 took " + (end - start));
+        start = end;
             
         // transports table
         buf.append("\n");
@@ -361,6 +377,10 @@ public class NetDbRenderer {
         buf.append("
                                    ");
         out.write(buf.toString());
         buf.setLength(0);
+        end = System.currentTimeMillis();
+        if (log.shouldWarn())
+            log.warn("part 3 took " + (end - start));
+        start = end;
 
         // country table
         List countryList = new ArrayList(countries.objects());
@@ -379,6 +399,10 @@ public class NetDbRenderer {
         }
 
         buf.append("
                                    ");
+        end = System.currentTimeMillis();
+        if (log.shouldWarn())
+            log.warn("part 4 took " + (end - start));
+        start = end;
 
      //
      // don't bother to reindent

From 1c3527e1a41ab3fc27061f8661be1248f5200a9d Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:56:03 +0000
Subject: [PATCH 189/258] Console:  - Export SSL cert on creation  - new /certs
 page to show local SSL certs

---
 .../src/net/i2p/router/web/CertHelper.java    | 81 +++++++++++++++++++
 .../i2p/router/web/RouterConsoleRunner.java   |  7 ++
 apps/routerconsole/jsp/certs.jsp              | 17 ++++
 3 files changed, 105 insertions(+)
 create mode 100644 apps/routerconsole/java/src/net/i2p/router/web/CertHelper.java
 create mode 100644 apps/routerconsole/jsp/certs.jsp

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CertHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CertHelper.java
new file mode 100644
index 000000000..f476c1dfe
--- /dev/null
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CertHelper.java
@@ -0,0 +1,81 @@
+package net.i2p.router.web;
+
+import java.io.File;
+import java.io.IOException;
+
+import net.i2p.util.FileUtil;
+
+
+/**
+ *  Dump out our local SSL certs, if any
+ *
+ *  @since 0.9.23
+ */
+public class CertHelper extends HelperBase {
+    
+    private static final String DIR = "certificates";
+    private static final String I2CP = "i2cp/i2cp.local.crt";
+    private static final String CONSOLE = "console/console.local.crt";
+    private static final String I2PTUNNEL_DIR = "i2ptunnel";
+
+    public String getSummary() {
+        File dir = new File(_context.getConfigDir(), DIR);
+        try {
+            _out.write("
                                    ");
+            _out.write(_t("Local SSL Certificates"));
+            _out.write("
                                    \n");
+            // console
+            output("Console", new File(dir, CONSOLE));
+            // I2CP
+            output("I2CP", new File(dir, I2CP));
+            // i2ptunnel clients
+            File tunnelDir = new File(_context.getConfigDir(), I2PTUNNEL_DIR);
+            boolean hasTunnels = false;
+            File[] tunnels = tunnelDir.listFiles();
+            if (tunnels != null) {
+                for (int i = 0; i < tunnels.length; i++) {
+                    File f = tunnels[i];
+                    if (!f.isFile())
+                        continue;
+                    String name = f.getName();
+                    if (!name.endsWith(".local.crt"))
+                        continue;
+                    if (!name.startsWith("i2ptunnel-"))
+                        continue;
+                    String b32 = name.substring(10, name.length() - 10);
+                    output(_t("I2PTunnel") + ' ' + b32, f);
+                    hasTunnels = true;
+                }
+            }
+            if (!hasTunnels)
+                output(_t("I2PTunnel"), null);
+            // anything else? plugins?
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return ""; 
+    }
+
+    /**
+     *  @param file may be null
+     */
+    private void output(String name, File file) throws IOException {
+        _out.write("
                                    ");
+        _out.write("
                                    ");
+        _out.write(name);
+        if (file != null && file.exists()) {
+            String cert = FileUtil.readTextFile(file.toString(), -1, true);
+            if (cert != null) {
+                _out.write("\n\n");
+            } else {
+                _out.write(": read failure");
+            }
+        } else {
+            _out.write(": ");
+            _out.write(_t("none"));
+        }
+        _out.write("
                                    \n");
+    }
+}
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 35e96b6ea..91483b97f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -760,6 +760,13 @@ public class RouterConsoleRunner implements RouterApp {
                     changes.put(PROP_KEY_PASSWORD, keyPassword);
                     _context.router().saveConfig(changes, null);
                 } catch (Exception e) {}  // class cast exception
+                // export cert, fails silently
+                File dir = new SecureDirectory(_context.getConfigDir(), "certificates");
+                dir.mkdir();
+                dir = new SecureDirectory(dir, "console");
+                dir.mkdir();
+                File certFile = new File(dir, "console.local.crt");
+                KeyStoreUtil.exportCert(ks, DEFAULT_KEYSTORE_PASSWORD, "console", certFile);
             }
         }
         if (success) {
diff --git a/apps/routerconsole/jsp/certs.jsp b/apps/routerconsole/jsp/certs.jsp
new file mode 100644
index 000000000..3c4e59cf6
--- /dev/null
+++ b/apps/routerconsole/jsp/certs.jsp
@@ -0,0 +1,17 @@
+<%@page contentType="text/html"%>
+<%@page trimDirectiveWhitespaces="true"%>
+<%@page pageEncoding="UTF-8"%>
+
+
+<%@include file="css.jsi" %>
+<%=intl.title("Certificates")%>
+
+<%@include file="summaryajax.jsi" %>
+
+<%@include file="summary.jsi" %>
                                    <%=intl._t("Certificates")%>
                                    
+
                                    
+
+" />
+<% certhelper.storeWriter(out); %>
+
+
                                    

From b22a6bc163a12b7a6bc07514bed3c9acef6dc762 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:57:22 +0000
Subject: [PATCH 190/258] log tweak

---
 .../src/net/i2p/router/update/ConsoleUpdateManager.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
index 4c72544ba..7999b2b47 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -323,7 +323,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
                     t = r.checker.check(type, r.method, id, current, maxWait);
                     if (t != null) {
                          if (_log.shouldLog(Log.INFO))
-                             _log.info("Starting " + r);
+                             _log.info("Starting " + r, new Exception());
                         _activeCheckers.add(t);
                         t.start();
                     }
@@ -366,7 +366,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
                     UpdateTask t = r.checker.check(type, r.method, id, current, DEFAULT_CHECK_TIME);
                     if (t != null) {
                          if (_log.shouldLog(Log.INFO))
-                             _log.info("Starting " + r);
+                             _log.info("Starting " + r, new Exception());
                         _activeCheckers.add(t);
                         t.start();
                         break;
@@ -670,7 +670,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
                         // race window here
                         //  store the remaining ones for retrying
                         if (_log.shouldLog(Log.INFO))
-                            _log.info("Starting " + r);
+                            _log.info("Starting " + r, new Exception());
                         _downloaders.put(t, toTry);
                         t.start();
                         return t;

From d21777fbc1d2382fd84d8fde5c1a2c0282a9ca27 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:57:53 +0000
Subject: [PATCH 191/258] log tweak

---
 core/java/src/net/i2p/util/EepGet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index a098a997a..2c29c09e4 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -1098,7 +1098,7 @@ public class EepGet {
      */
     private int handleStatus(String line) {
         if (_log.shouldLog(Log.DEBUG))
-            _log.debug("Status line: [" + line + "]");
+            _log.debug("Status line: [" + line.trim() + "]");
         String[] toks = line.split(" ", 3);
         if (toks.length < 2) {
             if (_log.shouldLog(Log.WARN))

From 22417715e776c070205c459d0806eb6e8804a191 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 15:58:47 +0000
Subject: [PATCH 192/258] javadoc

---
 core/java/src/net/i2p/util/TranslateReader.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/src/net/i2p/util/TranslateReader.java b/core/java/src/net/i2p/util/TranslateReader.java
index 5ab9bf2cb..171edd4a8 100644
--- a/core/java/src/net/i2p/util/TranslateReader.java
+++ b/core/java/src/net/i2p/util/TranslateReader.java
@@ -373,6 +373,9 @@ public class TranslateReader extends FilterReader {
         }
     }
 
+    /**
+     *  Do not comment out, used to extract tags as a part of the build process.
+     */
     public static void main(String[] args) {
         try {
             if (args.length >= 2 && args[0].equals("test"))

From 39b810bd799f3e45b86ddbc80461d4b0d0f27cb1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 16:01:22 +0000
Subject: [PATCH 193/258] Tunnels: Use max of 2 not-failing peers in an
 exploratory tunnel, use high cap for the rest; change outbound exploratory
 default length from 2 + 0-1 to 3+0.

---
 history.txt                                   | 12 ++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 .../net/i2p/router/TunnelPoolSettings.java    |  8 +--
 .../tunnel/pool/ExploratoryPeerSelector.java  | 71 +++++++++++--------
 4 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/history.txt b/history.txt
index 2a0172d77..363362832 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,15 @@
+2015-09-27 zzz
+ * Console:
+   - Export SSL cert on creation
+   - New /certs page to show local SSL certs
+   - Show 'none' if no leasesets
+ * SimpleTimer2: Fix bug in forceReschedule() that caused subsequent uncaught IllegalStateException,
+   affected streaming timers
+ * Streaming: Move throttler from context timer to streaming timer
+ * Tunnels: Use max of 2 not-failing peers in an exploratory tunnel,
+   use high cap for the rest; change outbound exploratory
+   default length from 2 + 0-1 to 3+0.
+
 2015-09-25 dg
  * Rename _() for translation to _t() for Java 9 compatibility (ticket #1456)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4e..7ca1a3ec2 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 = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index b7984c085..24184cc14 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -76,11 +76,11 @@ public class TunnelPoolSettings {
     private static final int    DEFAULT_LENGTH_VARIANCE = 0;
     /** expl only */
     private static final int    DEFAULT_IB_EXPL_LENGTH = 2;
-    //private static final int    DEFAULT_OB_EXPL_LENGTH = isSlow ? 2 : 3;
-    private static final int    DEFAULT_OB_EXPL_LENGTH = 2;
+    private static final int    DEFAULT_OB_EXPL_LENGTH = isSlow ? 2 : 3;
+    //private static final int    DEFAULT_OB_EXPL_LENGTH = 2;
     private static final int    DEFAULT_IB_EXPL_LENGTH_VARIANCE = isSlow ? 0 : 1;
-    //private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = 0;
-    private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = isSlow ? 0 : 1;
+    private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = 0;
+    //private static final int    DEFAULT_OB_EXPL_LENGTH_VARIANCE = isSlow ? 0 : 1;
 
     public static final boolean DEFAULT_ALLOW_ZERO_HOP = true;
     public static final int     DEFAULT_IP_RESTRICTION = 2;    // class B (/16)
diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
index 6bb81fbc8..b6b141e7a 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
@@ -33,12 +33,12 @@ class ExploratoryPeerSelector extends TunnelPeerSelector {
             return null;
         }
         
-        if (false && shouldSelectExplicit(settings)) {
-            List rv = selectExplicit(settings, length);
-            if (l.shouldLog(Log.DEBUG))
-                l.debug("Explicit peers selected: " + rv);
-            return rv;
-        }
+        //if (false && shouldSelectExplicit(settings)) {
+        //    List rv = selectExplicit(settings, length);
+        //    if (l.shouldLog(Log.DEBUG))
+        //        l.debug("Explicit peers selected: " + rv);
+        //    return rv;
+        //}
         
         Set exclude = getExclude(settings.isInbound(), true);
         exclude.add(ctx.routerHash());
@@ -55,34 +55,43 @@ class ExploratoryPeerSelector extends TunnelPeerSelector {
         // FloodfillNetworkDatabaseFacade fac = (FloodfillNetworkDatabaseFacade)ctx.netDb();
         // exclude.addAll(fac.getFloodfillPeers());
         HashSet matches = new HashSet(length);
-        boolean exploreHighCap = shouldPickHighCap();
 
-        //
-        // We don't honor IP Restriction here, to be fixed
-        //
+        if (length > 0) {
+            boolean exploreHighCap = shouldPickHighCap();
 
-        // If hidden and inbound, use fast peers - that we probably have recently
-        // connected to and so they have our real RI - to maximize the chance
-        // that the adjacent hop can connect to us.
-        if (settings.isInbound() && ctx.router().isHidden()) {
-            if (l.shouldLog(Log.INFO))
-                l.info("EPS SFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
-            ctx.profileOrganizer().selectFastPeers(length, exclude, matches);
-        } else if (exploreHighCap) {
-            if (l.shouldLog(Log.INFO))
-                l.info("EPS SHCP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
-            ctx.profileOrganizer().selectHighCapacityPeers(length, exclude, matches);
-        } else if (ctx.commSystem().haveHighOutboundCapacity()) {
-            if (l.shouldLog(Log.INFO))
-                l.info("EPS SNFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
-            ctx.profileOrganizer().selectNotFailingPeers(length, exclude, matches, false);
-        } else { // use only connected peers so we don't make more connections
-            if (l.shouldLog(Log.INFO))
-                l.info("EPS SANFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
-            ctx.profileOrganizer().selectActiveNotFailingPeers(length, exclude, matches);
+            //
+            // We don't honor IP Restriction here, to be fixed
+            //
+
+            // If hidden and inbound, use fast peers - that we probably have recently
+            // connected to and so they have our real RI - to maximize the chance
+            // that the adjacent hop can connect to us.
+            if (settings.isInbound() && ctx.router().isHidden()) {
+                if (l.shouldLog(Log.INFO))
+                    l.info("EPS SFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
+                ctx.profileOrganizer().selectFastPeers(length, exclude, matches);
+            } else if (exploreHighCap) {
+                if (l.shouldLog(Log.INFO))
+                    l.info("EPS SHCP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
+                ctx.profileOrganizer().selectHighCapacityPeers(length, exclude, matches);
+            } else if (ctx.commSystem().haveHighOutboundCapacity()) {
+                if (l.shouldLog(Log.INFO))
+                    l.info("EPS SNFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
+                // As of 0.9.23, we include a max of 2 not failing peers,
+                // to improve build success on 3-hop tunnels.
+                // Peer org credits existing items in matches
+                if (length > 2)
+                    ctx.profileOrganizer().selectHighCapacityPeers(length - 2, exclude, matches);
+                ctx.profileOrganizer().selectNotFailingPeers(length, exclude, matches, false);
+            } else { // use only connected peers so we don't make more connections
+                if (l.shouldLog(Log.INFO))
+                    l.info("EPS SANFP " + length + (settings.isInbound() ? " IB" : " OB") + " exclude " + exclude.size());
+                ctx.profileOrganizer().selectActiveNotFailingPeers(length, exclude, matches);
+            }
+            
+            matches.remove(ctx.routerHash());
         }
-        
-        matches.remove(ctx.routerHash());
+
         ArrayList rv = new ArrayList(matches);
         if (rv.size() > 1)
             orderPeers(rv, settings.getRandomKey());

From f46a902256b0095eb73f05f8bf449a2f71f24db0 Mon Sep 17 00:00:00 2001
From: dg2-new 
Date: Sun, 27 Sep 2015 21:15:51 +0000
Subject: [PATCH 194/258] Router: Fix soft restarts for 'massive' clock jumps
 (over +150s or -61s) and recover from standby/hibernate (ticket #1014). I2P
 should now recover (better) from a system hibernate/standby and be able to
 reconnect to peers automatically.

---
 history.txt                                         | 2 ++
 router/java/src/net/i2p/router/Router.java          | 6 ++++--
 router/java/src/net/i2p/router/RouterVersion.java   | 2 +-
 router/java/src/net/i2p/router/tasks/Restarter.java | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/history.txt b/history.txt
index 363362832..a9580a192 100644
--- a/history.txt
+++ b/history.txt
@@ -9,6 +9,8 @@
  * Tunnels: Use max of 2 not-failing peers in an exploratory tunnel,
    use high cap for the rest; change outbound exploratory
    default length from 2 + 0-1 to 3+0.
+ * Router: Fix soft restarts for 'massive' clock jumps (over +150s or -61s) and recover from standby
+   and hibernate (ticket #1014).
 
 2015-09-25 dg
  * Rename _() for translation to _t() for Java 9 compatibility (ticket #1456)
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index a76d4b7fa..fd68b7b69 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1443,8 +1443,10 @@ public class Router implements RouterClock.ClockShiftListener {
         _eventLog.addEvent(EventLog.CLOCK_SHIFT, Long.toString(delta));
         // update the routing key modifier
         _context.routerKeyGenerator().generateDateBasedModData();
-        if (_context.commSystem().countActivePeers() <= 0)
-            return;
+        // Commented because this check makes no sense (#1014)
+        // .. and 'active' is relative to our broken time.
+        //if (_context.commSystem().countActivePeers() <= 0)
+        //    return;
         if (delta > 0)
             _log.error("Restarting after large clock shift forward by " + DataHelper.formatDuration(delta));
         else
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2..5a58b19bc 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/tasks/Restarter.java b/router/java/src/net/i2p/router/tasks/Restarter.java
index c904cad50..23991ae0e 100644
--- a/router/java/src/net/i2p/router/tasks/Restarter.java
+++ b/router/java/src/net/i2p/router/tasks/Restarter.java
@@ -30,9 +30,9 @@ public class Restarter implements Runnable {
         log.logAlways(Log.WARN, "Stopping the tunnel manager");
         try { _context.tunnelManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the tunnel manager", t); }
 
-        //try { _context.peerManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the peer manager", t); }
+        try { _context.peerManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the peer manager", t); }
         //try { _context.netDb().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the networkDb", t); }
-        //try { _context.jobQueue().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the job queue", t); }
+        try { _context.jobQueue().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the job queue", t); }
     
         log.logAlways(Log.WARN, "Router teardown complete, restarting the router...");
         try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}

From 59b05d4214a28fab555b8f11b8fffd3b640ae50e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 27 Sep 2015 21:54:14 +0000
Subject: [PATCH 195/258] Util: Speed up IP address validation by using
 Apache's implementation (ticket #1198)

---
 core/java/src/net/i2p/util/Addresses.java                | 9 ++++-----
 history.txt                                              | 7 +++++--
 router/java/src/net/i2p/data/router/RouterAddress.java   | 6 ++++--
 router/java/src/net/i2p/router/RouterVersion.java        | 2 +-
 .../src/net/i2p/router/transport/udp/UDPAddress.java     | 9 ++++-----
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java
index d522167f4..b33839b48 100644
--- a/core/java/src/net/i2p/util/Addresses.java
+++ b/core/java/src/net/i2p/util/Addresses.java
@@ -15,6 +15,8 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.http.conn.util.InetAddressUtils;
+
 import net.i2p.I2PAppContext;
 
 /**
@@ -260,12 +262,9 @@ public abstract class Addresses {
         }
         if (rv == null) {
             try {
-                boolean isIPv4 = host.replaceAll("[0-9\\.]", "").length() == 0;
-                if (isIPv4 && host.replaceAll("[0-9]", "").length() != 3)
-                    return null;
                 rv = InetAddress.getByName(host).getAddress();
-                if (isIPv4 ||
-                    host.replaceAll("[0-9a-fA-F:]", "").length() == 0) {
+                if (InetAddressUtils.isIPv4Address(host) ||
+                    InetAddressUtils.isIPv6Address(host)) {
                     synchronized (_IPAddress) {
                         _IPAddress.put(host, rv);
                     }
diff --git a/history.txt b/history.txt
index a9580a192..fc5a07713 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2015-09-27 dg
+ * Router: Fix soft restarts for 'massive' clock jumps (over +150s or -61s) and recover from standby
+   and hibernate (ticket #1014).
+
 2015-09-27 zzz
  * Console:
    - Export SSL cert on creation
@@ -9,8 +13,7 @@
  * Tunnels: Use max of 2 not-failing peers in an exploratory tunnel,
    use high cap for the rest; change outbound exploratory
    default length from 2 + 0-1 to 3+0.
- * Router: Fix soft restarts for 'massive' clock jumps (over +150s or -61s) and recover from standby
-   and hibernate (ticket #1014).
+ * Util: Speed up IP address validation by using Apache's implementation (ticket #1198)
 
 2015-09-25 dg
  * Rename _() for translation to _t() for Java 9 compatibility (ticket #1456)
diff --git a/router/java/src/net/i2p/data/router/RouterAddress.java b/router/java/src/net/i2p/data/router/RouterAddress.java
index ca0f94d08..e7cd0d684 100644
--- a/router/java/src/net/i2p/data/router/RouterAddress.java
+++ b/router/java/src/net/i2p/data/router/RouterAddress.java
@@ -17,6 +17,8 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.http.conn.util.InetAddressUtils;
+
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.DataStructureImpl;
@@ -219,8 +221,8 @@ public class RouterAddress extends DataStructureImpl {
         if (host != null) {
             rv = Addresses.getIP(host);
             if (rv != null &&
-                (host.replaceAll("[0-9\\.]", "").length() == 0 ||
-                 host.replaceAll("[0-9a-fA-F:]", "").length() == 0)) {
+                (InetAddressUtils.isIPv4Address(host) ||
+                 InetAddressUtils.isIPv6Address(host))) {
                 _ip = rv;
             }
         }
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5a58b19bc..e36cd3b14 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 = 11;
+    public final static long BUILD = 12;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
index 691601933..3d22e41b7 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
@@ -4,6 +4,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Map;
 
+import org.apache.http.conn.util.InetAddressUtils;
+
 import net.i2p.data.Base64;
 import net.i2p.data.router.RouterAddress;
 import net.i2p.data.SessionKey;
@@ -262,12 +264,9 @@ class UDPAddress {
         }
         if (rv == null) {
             try {
-                boolean isIPv4 = host.replaceAll("[0-9\\.]", "").length() == 0;
-                if (isIPv4 && host.replaceAll("[0-9]", "").length() != 3)
-                    return null;
                 rv = InetAddress.getByName(host);
-                if (isIPv4 ||
-                    host.replaceAll("[0-9a-fA-F:]", "").length() == 0) {
+                if (InetAddressUtils.isIPv4Address(host) ||
+                    InetAddressUtils.isIPv6Address(host)) {
                     synchronized (_inetAddressCache) {
                         _inetAddressCache.put(host, rv);
                     }

From 58ccfed41d2f35329122f9d5c1c7434c49292801 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Mon, 28 Sep 2015 14:50:53 +0000
Subject: [PATCH 196/258] Addressbook: - Use Patterns instead of replaceAll() -
 Fix isValidDest() for EC/Ed dests

---
 .../src/net/i2p/addressbook/AddressBook.java  | 54 ++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
index 40eeff590..fea030774 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/AddressBook.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.regex.Pattern;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.EepGet;
@@ -49,6 +50,26 @@ class AddressBook {
     private boolean modified;
     private static final boolean DEBUG = false;
 
+    private static final int MIN_DEST_LENGTH = 516;
+    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
+
+    /**
+     * 5-67 chars lower/upper case
+     */
+    private static final Pattern HOST_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z\\.-]{5,67}$");
+
+    /**
+     * 52 chars lower/upper case
+     * Always ends in 'a' or 'q'
+     */
+    private static final Pattern B32_PATTERN =
+        Pattern.compile("^[2-7a-zA-Z]{51}[aAqQ]$");
+
+    /** not a complete qualification, just a quick check */
+    private static final Pattern B64_PATTERN =
+        Pattern.compile("^[0-9a-zA-Z~-]{" + MIN_DEST_LENGTH + ',' + MAX_DEST_LENGTH + "}={0,2}$");
+
     /**
      * Construct an AddressBook from the contents of the Map addresses.
      * 
@@ -206,9 +227,6 @@ class AddressBook {
         return "Map containing " + this.addresses.size() + " entries";
     }
 
-    private static final int MIN_DEST_LENGTH = 516;
-    private static final int MAX_DEST_LENGTH = MIN_DEST_LENGTH + 100;  // longer than any known cert type for now
-
     /**
      * Do basic validation of the hostname
      * hostname was already converted to lower case by ConfigParser.parse()
@@ -225,9 +243,10 @@ class AddressBook {
 		host.indexOf("..") < 0 &&
                 // IDN - basic check, not complete validation
                 (host.indexOf("--") < 0 || host.startsWith("xn--") || host.indexOf(".xn--") > 0) &&
-                host.replaceAll("[a-z0-9.-]", "").length() == 0 &&
+                HOST_PATTERN.matcher(host).matches() &&
                 // Base32 spoofing (52chars.i2p)
-                (! (host.length() == 56 && host.substring(0,52).replaceAll("[a-z2-7]", "").length() == 0)) &&
+                // We didn't do it this way, we use a .b32.i2p suffix, but let's prohibit it anyway
+                (! (host.length() == 56 && B32_PATTERN.matcher(host.substring(0,52)).matches())) &&
                 // ... or maybe we do Base32 this way ...
                 (! host.equals("b32.i2p")) &&
                 (! host.endsWith(".b32.i2p")) &&
@@ -251,7 +270,7 @@ class AddressBook {
 		 (dest.length() > MIN_DEST_LENGTH && dest.length() <= MAX_DEST_LENGTH)) &&
 		// B64 comes in groups of 2, 3, or 4 chars, but never 1
 		((dest.length() % 4) != 1) &&
-                dest.replaceAll("[a-zA-Z0-9~-]", "").length() == 0
+                B64_PATTERN.matcher(dest).matches()
                 ;	
     }
 
@@ -337,4 +356,27 @@ class AddressBook {
     protected void finalize() {
         delete();
     }
+
+/****
+    public static void main(String[] args) {
+        String[] tests = { "foo.i2p",
+                           "3bnipzzu67cdq2rcygyxz52xhvy6ylokn4zfrk36ywn6pixmaoza.b32.i2p",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA==",
+                           "te9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "(*&(*&(*&(*",
+                           "9rhEy4dT9fMlcSOhDzfWRxCV2aen4Zp4eSthOf5f9gVKMa4PtQJ-wEzm2KEYeDXkbM6wEDvMQ6ou4LIniSE6bSAwy7fokiXk5oabels-sJmftnQWRbZyyXEAsLc3gpJJvp9km7kDyZ0z0YGL5tf3S~OaWdptB5tSBOAOjm6ramcYZMWhyUqm~xSL1JyXUqWEHRYwhoDJNL6-L516VpDYVigMBpIwskjeFGcqK8BqWAe0bRwxIiFTPN6Ck8SDzQvS1l1Yj-zfzg3X3gOknzwR8nrHUkjsWtEB6nhbOr8AR21C9Hs0a7MUJvSe2NOuBoNTrtxT76jDruI78JcG5r~WKl6M12yM-SqeBNE9hQn2QCHeHAKju7FdRCbqaZ99IwyjfwvZbkiYYQVN1xlUuGaXrj98XDzK7GORYdH-PrVGfEbMXQ40KLHUWHz8w4tQXAOQrCHEichod0RIzuuxo3XltCWKrf1xGZhkAo9bk2qXi6digCijvYNaKmQdXZYWW~RtAAA",
+                           "6IZTYacjlXjSAxu-uXEO5oGsj-f4tfePHEvGjs5pu-AMXMwD7-xFdi8kdobDMJp9yRAl96U7yLl~0t9zHeqqYmNeZnDSkTmAcSC2PT45ZJDXBobKi1~a77zuqfPwnzEatYfW3GL1JQAEkAmiwNJoG7ThTZ3zT7W9ekVJpHi9mivpTbaI~rALLfuAg~Mvr60nntZHjqhEZuiU4dTXrmc5nykl~UaMnBdwHL4jKmoN5CotqHyLYZfp74fdD-Oq4SkhuBhU8wkBIM3lz3Ul1o6-s0lNUMdYJq1CyxnyP7jeekdfAlSx4P4sU4M0dPaYvPdOFWPWwBuEh0pCs5Mj01B2xeEBhpV~xSLn6ru5Vq98TrmaR33KHxd76OYYFsWwzVbBuMVSd800XpBghGFucGw01YHYsPh3Afb01sXbf8Nb1bkxCy~DsrmoH4Ww3bpx66JhRTWvg5al3oWlCX51CnJUqaaK~dPL-pBvAyLKIA5aYvl8ca66jtA7AFDxsOb2texBBQAEAAcAAA===",
+                           "!e9Ky7XvVcLLr5vQqvfmOasg915P3-ddP3iDqpMMk7v5ufFKobLAX~1k-E4WVsJVlkYvkHVOjxix-uT1IdewKmLd81s5wZtz0GQ3ZC6p0C3S2cOxz7kQqf7QYSR0BrhZC~2du3-GdQO9TqNmsnHrah5lOZf0LN2JFEFPqg8ZB5JNm3JjJeSqePBRk3zAUogNaNK3voB1MVI0ZROKopXAJM4XMERNqI8tIH4ngGtV41SEJJ5pUFrrTx~EiUPqmSEaEA6UDYZiqd23ZlewZ31ExXQj97zvkuhKCoS9A9MNkzZejJhP-TEXWF8~KHur9f51H--EhwZ42Aj69-3GuNjsMdTwglG5zyIfhd2OspxJrXzCPqIV2sXn80IbPgwxHu0CKIJ6X43B5vTyVu87QDI13MIRNGWNZY5KmM5pilGP7jPkOs4xQDo4NHzpuJR5igjWgJIBPU6fI9Pzq~BMzjLiZOMp8xNWey1zKC96L0eX4of1MG~oUvq0qmIHGNa1TlUwBQAEAAEAAA==",
+                           "x"
+        };
+        for (String s : tests) {
+            test(s);
+        }
+    }
+
+    public static void test(String s) {
+        System.out.println(s + " valid host? " + isValidKey(s) + " valid dest? " + isValidDest(s));
+    }
+****/
 }

From ccc8c04782e57a66f04c268c844bdbb8f91eb877 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Mon, 28 Sep 2015 14:52:55 +0000
Subject: [PATCH 197/258] i2psnark: Support adding plain base 32 hashes convert
 plain hashes to upper case

---
 .../java/src/org/klomp/snark/web/I2PSnarkServlet.java       | 6 ++++++
 1 file changed, 6 insertions(+)

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 72ea2ecad..fdd70c0d9 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -981,6 +981,12 @@ public class I2PSnarkServlet extends BasicServlet {
                 } else if (newURL.startsWith(MagnetURI.MAGNET) || newURL.startsWith(MagnetURI.MAGGOT)) {
                     addMagnet(newURL, dir);
                 } else if (newURL.length() == 40 && newURL.replaceAll("[a-fA-F0-9]", "").length() == 0) {
+                    // hex
+                    newURL = newURL.toUpperCase(Locale.US);
+                    addMagnet(MagnetURI.MAGNET_FULL + newURL, dir);
+                } else if (newURL.length() == 32 && newURL.replaceAll("[a-zA-Z2-7]", "").length() == 0) {
+                    // b32
+                    newURL = newURL.toUpperCase(Locale.US);
                     addMagnet(MagnetURI.MAGNET_FULL + newURL, dir);
                 } else {
                     _manager.addMessage(_t("Invalid URL: Must start with \"http://\", \"{0}\", or \"{1}\"",

From 5d345f65a3446c1341a141d0296f91c9f5b83a95 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Mon, 28 Sep 2015 16:58:18 +0000
Subject: [PATCH 198/258] SusiDNS: Hide table headers and buttons if there are
 no search results

---
 apps/susidns/src/jsp/addressbook.jsp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 60ee04d67..20ff0bfef 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -147,6 +147,7 @@ ${book.loadBookMessages}
                                     		 
 <%=intl._t("Name")%>
 <%=intl._t("Links")%>
 <%=intl._t("Destination")%>
 
                                    
 
                                    
 
 
+<% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %>
 
 
                                    
 
                                    
 " >
 " >
 
                                    
-
                                    
+
                                     
+<% } /* book..getEntries().length() > 0 */ %>
+
 
+<% if (book.getEntries().length > 0) { /* Don't show if no results. Can't figure out how to do this with c:if */ %>
 
                                    
 
                                    
 
                                    
@@ -190,6 +196,7 @@ ${book.loadBookMessages}
 
 " />
 
                                    
+<% } /* book..getEntries().length() > 0 */ %>
 
 <% /* book.notEmpty */ %>
 

From 2f92b274466123b5b8a0c42a82c60a280713c9d6 Mon Sep 17 00:00:00 2001
From: kytv 
Date: Tue, 29 Sep 2015 19:30:13 +0000
Subject: [PATCH 199/258] Ticket #1596 - part 2

Removing 193.150.121.66 as a reseed host from the source and its certificate.
---
 .../certificates/ssl/193.150.121.66.crt       | 21 -------------------
 .../i2p/router/networkdb/reseed/Reseeder.java |  3 ---
 2 files changed, 24 deletions(-)
 delete mode 100644 installer/resources/certificates/ssl/193.150.121.66.crt

diff --git a/installer/resources/certificates/ssl/193.150.121.66.crt b/installer/resources/certificates/ssl/193.150.121.66.crt
deleted file mode 100644
index 450581d23..000000000
--- a/installer/resources/certificates/ssl/193.150.121.66.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDgDCCAmgCCQCAKEkFUJcEezANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UEBhMC
-Tk8xDTALBgNVBAgMBE9zbG8xDTALBgNVBAcMBE9zbG8xDDAKBgNVBAoMA0kyUDEM
-MAoGA1UECwwDSTJQMRcwFQYDVQQDDA4xOTMuMTUwLjEyMS42NjEfMB0GCSqGSIb3
-DQEJARYQbWVlaEBpMnBtYWlsLm9yZzAeFw0xMzA2MjcxODM2MjhaFw0yMDA2MjUx
-ODM2MjhaMIGBMQswCQYDVQQGEwJOTzENMAsGA1UECAwET3NsbzENMAsGA1UEBwwE
-T3NsbzEMMAoGA1UECgwDSTJQMQwwCgYDVQQLDANJMlAxFzAVBgNVBAMMDjE5My4x
-NTAuMTIxLjY2MR8wHQYJKoZIhvcNAQkBFhBtZWVoQGkycG1haWwub3JnMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBuFY4ZFvsbr5l1/s/GeUBLIWQLB
-nqrRkonrwCyxgjSnnG1uz/Z5nf6QDUjiVnFKMXenLaDn4KCmEi4LjWQllhK9r6pj
-BRkR7C0DTHq7WqfyvWnGSZZsOJDiH2vLlivV8N9oGdjxvv0N9No3AJcsmLYrxSLi
-6/JF8xZ2HGuT/oWW6aWvpIOKpIqti865BJw5P5KgYAS24J8vHRFM3FA4dfLNTBA2
-IGqPqYLQA+2zfOC4z01aArmcYnT1iJLT7krgKnr/BXdJfGQ2GjxkRSt8IwB6WmXA
-byz6QdNYM/0eubi102/zpD/DrySTU2kc8xKjknGUqBJvVdsL+iLK98uJrQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQCTimMu3X7+ztXxlIFhwGh42GfMjeBYT0NHOLAy
-ZtQNRqhNvkl3jZ4ERPLxP99+bcAfCX0wgVpgD32OWEZopwveRyMImP8HfFr4NnZ+
-edbM37fRYiVJv57kbi6O0rhEC7J5JF+fnCaZVLCuvYIrIXTdxTjvxuLhyan6Ej7V
-7iGDJ8t16tpLVJgcXfRg+dvAa6aDOK6x3w78j0bvh6rhvpOd9sW/Nk3LBKP4Xgkx
-PHkqm3hNfDIu8Hubeav9SA1kLVMS/uce52VyYMEDauObfC65ds0GRmCtYhZqMvj+
-FFCbssLraVJE9Hi/ZKGu33jNngDCG+wG+nmleksMYE1yTSRt
------END CERTIFICATE-----
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 bc7b1eeb1..d19147688 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -81,7 +81,6 @@ public class Reseeder {
 
               // Disabling everything, use SSL
               //"http://i2p.mooo.com/netDb/" + "," +
-              //"http://193.150.121.66/netDb/" + "," +
               //"http://uk.reseed.i2p2.no/" + "," +
               //"http://netdb.i2p2.no/"; // Only SU3 (v3) support
               "";
@@ -92,8 +91,6 @@ public class Reseeder {
               //"https://netdb.rows.io:444/" + "," + // Only HTTPS and SU3 (v3) support
               "https://i2pseed.zarrenspry.info/" + "," + // Only HTTPS and SU3 (v3) support
               "https://i2p.mooo.com/netDb/" + "," +
-              // ticket #1596
-              // "https://193.150.121.66/netDb/" + "," +
               "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support, SNI required
               "https://us.reseed.i2p2.no:444/" + "," +
               "https://uk.reseed.i2p2.no:444/" + "," +

From 5fa059b4a8ce910053c6fe81fda87e37eb8d8f2b Mon Sep 17 00:00:00 2001
From: kytv 
Date: Tue, 29 Sep 2015 19:41:01 +0000
Subject: [PATCH 200/258] Adding the new reseed server hosted by our friends at
 TorontoCrypto. Thanks. :)

---
 .../reseed/j_at_torontocrypto.org.crt         | 34 +++++++++++++++++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 .../i2p/router/networkdb/reseed/Reseeder.java |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 installer/resources/certificates/reseed/j_at_torontocrypto.org.crt

diff --git a/installer/resources/certificates/reseed/j_at_torontocrypto.org.crt b/installer/resources/certificates/reseed/j_at_torontocrypto.org.crt
new file mode 100644
index 000000000..4a2789ec0
--- /dev/null
+++ b/installer/resources/certificates/reseed/j_at_torontocrypto.org.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e36cd3b14..7f4edb975 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 = 12;
+    public final static long BUILD = 13;
 
     /** for example "-test" */
     public final static String EXTRA = "";
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 d19147688..59e697253 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -94,6 +94,7 @@ public class Reseeder {
               "https://netdb.i2p2.no/" + "," + // Only SU3 (v3) support, SNI required
               "https://us.reseed.i2p2.no:444/" + "," +
               "https://uk.reseed.i2p2.no:444/" + "," +
+              "https://www.torontocrypto.org:8443/" + "," +
               "https://reseed.i2p.vzaws.com:8443/" + ", " + // Only SU3 (v3) support
               "https://user.mx24.eu/" + "," + // Only HTTPS and SU3 (v3) support
               "https://ieb9oopo.mooo.com/"; // Only HTTPS and SU3 (v3) support

From b068f9a262b05d14dc7349eb8cc213c39c01681c Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 2 Oct 2015 13:43:54 +0000
Subject: [PATCH 201/258] Router: Don't check config files for reload on
 Android

---
 core/java/src/net/i2p/util/LogWriterBase.java          |  4 +++-
 .../src/net/i2p/router/startup/BootCommSystemJob.java  | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java
index 08683b622..b9b98e10d 100644
--- a/core/java/src/net/i2p/util/LogWriterBase.java
+++ b/core/java/src/net/i2p/util/LogWriterBase.java
@@ -67,10 +67,12 @@ abstract class LogWriterBase implements Runnable {
 
     public void run() {
         _write = true;
+        // don't bother on Android
+        final boolean shouldReadConfig = !SystemVersion.isAndroid();
         try {
             while (_write) {
                 flushRecords();
-                if (_write)
+                if (_write && shouldReadConfig)
                     rereadConfig();
             }
         } catch (Exception e) {
diff --git a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
index 2b3be5586..bb9f30846 100644
--- a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
+++ b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
@@ -14,6 +14,7 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.RouterClock;
 import net.i2p.router.tasks.ReadConfigJob;
 import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
 
 /** This actually boots almost everything */
 class BootCommSystemJob extends JobImpl {
@@ -46,9 +47,12 @@ class BootCommSystemJob extends JobImpl {
         // start I2CP
         getContext().jobQueue().addJob(new StartAcceptingClientsJob(getContext()));
 
-        Job j = new ReadConfigJob(getContext());
-        j.getTiming().setStartAfter(getContext().clock().now() + 2*60*1000);
-        getContext().jobQueue().addJob(j);
+        if (!SystemVersion.isAndroid()) {
+            Job j = new ReadConfigJob(getContext());
+            j.getTiming().setStartAfter(getContext().clock().now() + 2*60*1000);
+            getContext().jobQueue().addJob(j);
+        }
+
         ((RouterClock) getContext().clock()).addShiftListener(getContext().router());
     }
         

From f93da93cf0097c414a8460b0c032e5abfb3f789e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 2 Oct 2015 13:45:42 +0000
Subject: [PATCH 202/258] Router: Minor cleanup, remove some deprecated and
 small methods

---
 router/java/src/net/i2p/router/Router.java | 35 ++++------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index fd68b7b69..0bad3eced 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -62,7 +62,7 @@ import net.i2p.util.Translate;
 /**
  * Main driver for the router.
  *
- * For embedded use, instantiate and then call runRouter().
+ * For embedded use, instantiate, call setKillVMOnEnd(false), and then call runRouter().
  *
  */
 public class Router implements RouterClock.ClockShiftListener {
@@ -77,7 +77,6 @@ public class Router implements RouterClock.ClockShiftListener {
     public final Object routerInfoFileLock = new Object();
     private final Object _configFileLock = new Object();
     private long _started;
-    private boolean _higherVersionSeen;
     private boolean _killVMOnEnd;
     private int _gracefulExitCode;
     private I2PThread.OOMEventListener _oomListener;
@@ -392,7 +391,6 @@ public class Router implements RouterClock.ClockShiftListener {
         CryptoChecker.warnUnavailableCrypto(_context);
 
         _routerInfo = null;
-        _higherVersionSeen = false;
         if (_log.shouldLog(Log.INFO))
             _log.info("New router created with config file " + _configFilename);
         _oomListener = new OOMListener(_context);
@@ -510,20 +508,6 @@ public class Router implements RouterClock.ClockShiftListener {
             _context.jobQueue().addJob(new PersistRouterInfoJob(_context));
     }
 
-    /**
-     * True if the router has tried to communicate with another router who is running a higher
-     * incompatible protocol version.  
-     * @deprecated unused
-     */
-    public boolean getHigherVersionSeen() { return _higherVersionSeen; }
-
-    /**
-     * True if the router has tried to communicate with another router who is running a higher
-     * incompatible protocol version.  
-     * @deprecated unused
-     */
-    public void setHigherVersionSeen(boolean seen) { _higherVersionSeen = seen; }
-    
     /**
      *  Used only by routerconsole.. to be deprecated?
      */
@@ -577,7 +561,9 @@ public class Router implements RouterClock.ClockShiftListener {
         if (!SystemVersion.isAndroid())
             I2PThread.addOOMEventListener(_oomListener);
         
-        setupHandlers();
+        // message handlers
+        _context.inNetMessagePool().registerHandlerJobBuilder(GarlicMessage.MESSAGE_TYPE, new GarlicMessageHandler(_context));
+
         //if (ALLOW_DYNAMIC_KEYS) {
         //    if ("true".equalsIgnoreCase(_context.getProperty(Router.PROP_HIDDEN, "false")))
         //        killKeys();
@@ -586,7 +572,7 @@ public class Router implements RouterClock.ClockShiftListener {
         _context.messageValidator().startup();
         _context.tunnelDispatcher().startup();
         _context.inNetMessagePool().startup();
-        startupQueue();
+        _context.jobQueue().runQueue(1);
         //_context.jobQueue().addJob(new CoalesceStatsJob(_context));
         _context.simpleTimer2().addPeriodicEvent(new CoalesceStatsEvent(_context), COALESCE_TIME);
         _context.jobQueue().addJob(new UpdateRoutingKeyModifierJob(_context));
@@ -1080,15 +1066,6 @@ public class Router implements RouterClock.ClockShiftListener {
             saveConfig(PROP_JBIGI, loaded);
     }
     
-    private void startupQueue() {
-        _context.jobQueue().runQueue(1);
-    }
-    
-    private void setupHandlers() {
-        _context.inNetMessagePool().registerHandlerJobBuilder(GarlicMessage.MESSAGE_TYPE, new GarlicMessageHandler(_context));
-        //_context.inNetMessagePool().registerHandlerJobBuilder(TunnelMessage.MESSAGE_TYPE, new TunnelMessageHandler(_context));
-    }
-    
     /** shut down after all tunnels are gone */
     public static final int EXIT_GRACEFUL = 2;
     /** shut down immediately */
@@ -1582,7 +1559,7 @@ public class Router implements RouterClock.ClockShiftListener {
         if (f.exists()) {
             long lastWritten = f.lastModified();
             if (System.currentTimeMillis()-lastWritten > LIVELINESS_DELAY) {
-                System.err.println("WARN: Old router was not shut down gracefully, deleting router.ping");
+                System.err.println("WARN: Old router was not shut down gracefully, deleting " + f);
                 f.delete();
             } else {
                 return false;

From f4a6cf200214ed6815650c11bc39f428cf328eec Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 3 Oct 2015 14:06:12 +0000
Subject: [PATCH 203/258] Show 'none' if no part. tunnels on /tunnels

---
 .../src/net/i2p/router/web/TunnelRenderer.java   | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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 3784e4a30..aab84c630 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
@@ -66,11 +66,13 @@ public class TunnelRenderer {
         }
         
         List participating = _context.tunnelDispatcher().listParticipatingTunnels();
-        Collections.sort(participating, new TunnelComparator());
-        out.write("
                                    " + _t("Participating tunnels") + "
                                    \n");
-        out.write("
                                    " + _t("Receive on") + "" + _t("From") + ""
+        out.write("
                                    " + _t("Participating tunnels") + "
                                    \n");
+        if (!participating.isEmpty()) {
+            Collections.sort(participating, new TunnelComparator());
+            out.write(""
                   + "\n");
+        }
         long processed = 0;
         RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCount");
         if (rs != null)
@@ -125,10 +127,14 @@ public class TunnelRenderer {
                 out.write("");
             out.write("\n");
         }
-        out.write("
                                    " + _t("Receive on") + "" + _t("From") + ""
                   + _t("Send on") + "" + _t("To") + "" + _t("Expiration") + "" + _t("Usage") + "" + _t("Rate") + "" + _t("Role") + "
                                    " + _t("Participant") + "
                                    \n");
+        if (!participating.isEmpty())
+            out.write("
                                    \n");
         if (displayed > DISPLAY_LIMIT)
             out.write("
                                    " + _t("Limited display to the {0} tunnels with the highest usage", DISPLAY_LIMIT)  + "
                                    \n");
-        out.write("
                                    " + _t("Inactive participating tunnels") + ": " + inactive + "
                                    \n");
+        if (inactive > 0)
+            out.write("
                                    " + _t("Inactive participating tunnels") + ": " + inactive + "
                                    \n");
+        else if (displayed <= 0)
+            out.write("
                                    " + _t("none") + "
                                    \n");
         out.write("
                                    " + _t("Lifetime bandwidth usage") + ": " + DataHelper.formatSize2(processed*1024) + "B
                                    \n");
         //renderPeers(out);
         out.write("");

From 03f9df4ff0d4f78434a42da147462db7a1f1ab9a Mon Sep 17 00:00:00 2001
From: dg2-new 
Date: Sun, 4 Oct 2015 15:17:26 +0000
Subject: [PATCH 204/258] JobQueue: Listen to clock shifts as well as clock
 changes (ticket #1014). Restarter: Don't restart the JobQueue or PeerManager
 (ticket #1014)/undo previous commit. More to do.

---
 router/java/src/net/i2p/router/JobQueue.java        | 9 ++++++++-
 router/java/src/net/i2p/router/JobTiming.java       | 7 ++++++-
 router/java/src/net/i2p/router/RouterVersion.java   | 2 +-
 router/java/src/net/i2p/router/tasks/Restarter.java | 4 ++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index da08c521a..b08bf9058 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.i2p.data.DataHelper;
 import net.i2p.router.message.HandleGarlicMessageJob;
 import net.i2p.router.networkdb.kademlia.HandleFloodfillDatabaseLookupMessageJob;
+import net.i2p.router.RouterClock;
 import net.i2p.util.Clock;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
@@ -516,9 +517,10 @@ public class JobQueue {
      * max number of runners.
      *
      */
-    private final class QueuePumper implements Runnable, Clock.ClockUpdateListener {
+    private final class QueuePumper implements Runnable, Clock.ClockUpdateListener, RouterClock.ClockShiftListener {
         public QueuePumper() { 
             _context.clock().addUpdateListener(this);
+            ((RouterClock) _context.clock()).addShiftListener(this);
         }
         public void run() {
             try {
@@ -590,6 +592,7 @@ public class JobQueue {
                 } // while (_alive)
             } catch (Throwable t) {
                 _context.clock().removeUpdateListener(this);
+                ((RouterClock) _context.clock()).removeShiftListener(this);
                 if (_log.shouldLog(Log.ERROR))
                     _log.error("pumper killed?!", t);
             }
@@ -602,6 +605,10 @@ public class JobQueue {
             }
         }
 
+        public void clockShift(long delta) {
+            offsetChanged(delta);
+        }
+
     }
     
     /**
diff --git a/router/java/src/net/i2p/router/JobTiming.java b/router/java/src/net/i2p/router/JobTiming.java
index 98d8e67c7..f934f1556 100644
--- a/router/java/src/net/i2p/router/JobTiming.java
+++ b/router/java/src/net/i2p/router/JobTiming.java
@@ -8,6 +8,7 @@ package net.i2p.router;
  *
  */
 
+import net.i2p.router.RouterClock;
 import net.i2p.util.Clock;
 
 /**
@@ -15,7 +16,7 @@ import net.i2p.util.Clock;
  *
  * For use by the router only. Not to be used by applications or plugins.
  */
-public class JobTiming implements Clock.ClockUpdateListener {
+public class JobTiming implements Clock.ClockUpdateListener, RouterClock.ClockShiftListener {
     private volatile long _start;
     private volatile long _actualStart;
     private volatile long _actualEnd;
@@ -81,4 +82,8 @@ public class JobTiming implements Clock.ClockUpdateListener {
         if (_actualEnd != 0)
             _actualEnd += delta;
     }
+
+    public void clockShift(long delta) {
+        offsetChanged(delta);
+    }
 }
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb975..31c35f8c3 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 = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/tasks/Restarter.java b/router/java/src/net/i2p/router/tasks/Restarter.java
index 23991ae0e..c904cad50 100644
--- a/router/java/src/net/i2p/router/tasks/Restarter.java
+++ b/router/java/src/net/i2p/router/tasks/Restarter.java
@@ -30,9 +30,9 @@ public class Restarter implements Runnable {
         log.logAlways(Log.WARN, "Stopping the tunnel manager");
         try { _context.tunnelManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the tunnel manager", t); }
 
-        try { _context.peerManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the peer manager", t); }
+        //try { _context.peerManager().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the peer manager", t); }
         //try { _context.netDb().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the networkDb", t); }
-        try { _context.jobQueue().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the job queue", t); }
+        //try { _context.jobQueue().restart(); } catch (Throwable t) { log.log(Log.CRIT, "Error restarting the job queue", t); }
     
         log.logAlways(Log.WARN, "Router teardown complete, restarting the router...");
         try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}

From 419d6a8e186c467a4cb513e29b7cb757ec5c5d7e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 8 Oct 2015 13:42:31 +0000
Subject: [PATCH 205/258] SimpleTimer2: Additional fix for uncaught
 IllegalStateException affecting streaming timers (ticket #1672) Minor
 streaming cleanup

---
 .../i2p/client/streaming/impl/Connection.java |  4 ++-
 core/java/src/net/i2p/util/SimpleTimer2.java  | 25 +++++++++++++------
 history.txt                                   | 12 +++++++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index f5e93ddf0..478afcdb8 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -1311,7 +1311,9 @@ class Connection {
         }
         
         public long getNextSendTime() { return _nextSend; }
+
         public void timeReached() { retransmit(); }
+
         /**
          * Retransmit the packet if we need to.  
          *
@@ -1323,7 +1325,7 @@ class Connection {
          *
          * @return true if the packet was sent, false if it was not
          */
-        public boolean retransmit() {
+        private boolean retransmit() {
             if (_packet.getAckTime() > 0) 
                 return false;
             
diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index fa803338c..aff0b61f6 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -257,6 +257,8 @@ public class SimpleTimer2 {
         private long _nextRun;
         /** whether this was scheduled during RUNNING state.  LOCKING: this */
         private boolean _rescheduleAfterRun;
+        /** whether this was cancelled during RUNNING state.  LOCKING: this */
+        private boolean _cancelAfterRun;
         
         /** must call schedule() later */
         public TimedEvent(SimpleTimer2 pool) {
@@ -290,7 +292,8 @@ public class SimpleTimer2 {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Scheduling: " + this + " timeout = " + timeoutMs + " state: " + _state);
             if (timeoutMs <= 0) {
-                if (_log.shouldLog(Log.WARN))
+                // streaming timers do call with timeoutMs == 0
+                if (timeoutMs < 0 && _log.shouldLog(Log.WARN))
                     _log.warn("Timeout <= 0: " + this + " timeout = " + timeoutMs + " state: " + _state);
                 timeoutMs = 1; // otherwise we may execute before _future is updated, which is fine
                                // except it triggers 'early execution' warning logging
@@ -298,6 +301,7 @@ public class SimpleTimer2 {
 
             // always set absolute time of execution
             _nextRun = timeoutMs + System.currentTimeMillis();
+            _cancelAfterRun = false;
             
             switch(_state) {
               case RUNNING:
@@ -373,7 +377,9 @@ public class SimpleTimer2 {
               case CANCELLED:  // fall through
               case IDLE: 
                 break; // my preference is to throw IllegalState here, but let it be.
-              case RUNNING:    // fall through
+              case RUNNING:
+                _cancelAfterRun = true;
+                return true;
               case SCHEDULED:
                 boolean cancelled = _future.cancel(false);
                 if (cancelled)
@@ -447,11 +453,16 @@ public class SimpleTimer2 {
                       case CANCELLED:
                         break; // nothing
                       case RUNNING: 
-                        _state = TimedEventState.IDLE; 
-                        // do we need to reschedule?
-                        if (_rescheduleAfterRun) {
-                            _rescheduleAfterRun = false;
-                            schedule(_nextRun - System.currentTimeMillis());
+                        if (_cancelAfterRun) {
+                            _cancelAfterRun = false;
+                            _state = TimedEventState.CANCELLED;
+                        } else {
+                            _state = TimedEventState.IDLE; 
+                            // do we need to reschedule?
+                            if (_rescheduleAfterRun) {
+                                _rescheduleAfterRun = false;
+                                schedule(_nextRun - System.currentTimeMillis());
+                            }
                         }
                     }
                 }
diff --git a/history.txt b/history.txt
index fc5a07713..bd4cde9e3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,15 @@
+2015-10-08 zzz
+ * SimpleTimer2: Additional fix for uncaught IllegalStateException
+   affecting streaming timers (ticket #1672)
+
+2015-10-02 zzz
+ * Router: Don't check config files for reload on Android
+
+2015-09-28 zzz
+ * Addressbook: Fix isValidDest() for EC/Ed dests
+ * i2psnark: Support adding plain base 32 hashes
+ * Susimail: Hide headers and buttons if search results are empty
+
 2015-09-27 dg
  * Router: Fix soft restarts for 'massive' clock jumps (over +150s or -61s) and recover from standby
    and hibernate (ticket #1014).
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 31c35f8c3..ea17ad55f 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 = 14;
+    public final static long BUILD = 15;
 
     /** for example "-test" */
     public final static String EXTRA = "";

From b32c8d5fa4cec3cc5cf617ef6e003aeceae04ee1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 10 Oct 2015 12:29:52 +0000
Subject: [PATCH 206/258] NamingServices: Add support for lookups prefixed with
 "www."

---
 .../client/naming/BlockfileNamingService.java | 22 +++++++++++++++++++
 .../naming/SingleFileNamingService.java       |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
index ec12eb792..efa8b3e06 100644
--- a/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/BlockfileNamingService.java
@@ -621,11 +621,33 @@ public class BlockfileNamingService extends DummyNamingService {
     ////////// Start NamingService API
 
     /*
+     *
+     * Will strip a "www." prefix and retry if lookup fails
+     *
+     * @param hostname upper/lower case ok
      * @param options If non-null and contains the key "list", lookup in
      *                that list only, otherwise all lists
      */
     @Override
     public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) {
+        Destination rv = lookup2(hostname, lookupOptions, storedOptions);
+        if (rv == null) {
+            // if hostname starts with "www.", strip and try again
+            // but not for www.i2p
+            hostname = hostname.toLowerCase(Locale.US);
+            if (hostname.startsWith("www.") && hostname.length() > 7) {
+                hostname = hostname.substring(4);
+                rv = lookup2(hostname, lookupOptions, storedOptions);
+            }
+        }
+        return rv;
+    }
+
+    /*
+     * @param options If non-null and contains the key "list", lookup in
+     *                that list only, otherwise all lists
+     */
+    private Destination lookup2(String hostname, Properties lookupOptions, Properties storedOptions) {
         String listname = null;
         if (lookupOptions != null)
             listname = lookupOptions.getProperty("list");
diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
index c331fae01..219c61bbc 100644
--- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
@@ -77,6 +77,8 @@ public class SingleFileNamingService extends NamingService {
     }
 
     /** 
+     *  Will strip a "www." prefix and retry if lookup fails
+     *
      *  @param hostname case-sensitive; caller should convert to lower case
      *  @param lookupOptions ignored
      *  @param storedOptions ignored
@@ -85,6 +87,8 @@ public class SingleFileNamingService extends NamingService {
     public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) {
         try {
             String key = getKey(hostname);
+            if (key == null && hostname.startsWith("www.") && hostname.length() > 7)
+                key = getKey(hostname.substring(4));
             if (key != null)
                 return lookupBase64(key);
         } catch (Exception ioe) {

From 7063609f05d5959f3f8922d4a07285af64469b37 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 10 Oct 2015 13:33:46 +0000
Subject: [PATCH 207/258] JobQueue: Only adjust timing for negative clock
 shifts

---
 router/java/src/net/i2p/router/JobQueue.java | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index b08bf9058..2641707be 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -522,6 +522,7 @@ public class JobQueue {
             _context.clock().addUpdateListener(this);
             ((RouterClock) _context.clock()).addShiftListener(this);
         }
+
         public void run() {
             try {
                 while (_alive) {
@@ -591,10 +592,11 @@ public class JobQueue {
                     } catch (InterruptedException ie) {}
                 } // while (_alive)
             } catch (Throwable t) {
-                _context.clock().removeUpdateListener(this);
-                ((RouterClock) _context.clock()).removeShiftListener(this);
                 if (_log.shouldLog(Log.ERROR))
                     _log.error("pumper killed?!", t);
+            } finally {
+                _context.clock().removeUpdateListener(this);
+                ((RouterClock) _context.clock()).removeShiftListener(this);
             }
         }
 
@@ -605,8 +607,20 @@ public class JobQueue {
             }
         }
 
+        /**
+         *  Clock shift listener.
+         *  Only adjust timings for negative shifts.
+         *  For positive shifts, just wake up the pumper.
+         *  @since 0.9.23
+         */
         public void clockShift(long delta) {
-            offsetChanged(delta);
+            if (delta < 0) {
+                offsetChanged(delta);
+            } else {
+                synchronized (_jobLock) {
+                    _jobLock.notifyAll();
+                }
+            }
         }
 
     }

From dd4d12f287cc4612473a38d67837639ff924c44a Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 10 Oct 2015 14:02:48 +0000
Subject: [PATCH 208/258] i2psnark: Increase max piece size to 16 MB, max files
 to 999, close files faster based on file count (tickets #1626, #1671) Remove
 dup synchs

---
 .../src/org/klomp/snark/PeerCheckerTask.java  | 18 ++++++++++++-
 .../src/org/klomp/snark/SnarkManager.java     |  2 +-
 .../java/src/org/klomp/snark/Storage.java     | 26 ++++++++++---------
 history.txt                                   |  9 +++++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
index 430f6c7ae..c2abf6660 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCheckerTask.java
@@ -267,7 +267,23 @@ class PeerCheckerTask implements Runnable
 
         // close out unused files, but we don't need to do it every time
         Storage storage = coordinator.getStorage();
-        if (storage != null && (_runCount % 4) == 0) {
+        if (storage != null) {
+            // The more files a torrent has, the more often we call the cleaner,
+            // to keep from running out of FDs
+            int files = storage.getFileCount();
+            int skip;
+            if (files == 1)
+                skip = 6;
+            else if (files <= 4)
+                skip = 4;
+            else if (files <= 20)
+                skip = 3;
+            else if (files <= 50)
+                skip = 2;
+            else
+                skip = 1;
+
+            if ((_runCount % skip) == 0)
                 storage.cleanRAFs();
         }
 
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index bcb4fa34c..98d0ee2c0 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -1092,7 +1092,7 @@ public class SnarkManager implements CompleteListener {
     }
     
     /** hardcoded for sanity.  perhaps this should be customizable, for people who increase their ulimit, etc. */
-    public static final int MAX_FILES_PER_TORRENT = 512;
+    public static final int MAX_FILES_PER_TORRENT = 999;
     
     /**
      *  Set of canonical .torrent filenames that we are dealing with.
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 62cb1aa45..3f1682318 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -78,7 +78,7 @@ public class Storage implements Closeable
   /** The default piece size. */
   private static final int DEFAULT_PIECE_SIZE = 256*1024;
   /** bigger than this will be rejected */
-  public static final int MAX_PIECE_SIZE = 8*1024*1024;
+  public static final int MAX_PIECE_SIZE = 16*1024*1024;
   /** The maximum number of pieces in a torrent. */
   public static final int MAX_PIECES = 10*1024;
   public static final long MAX_TOTAL_SIZE = MAX_PIECE_SIZE * (long) MAX_PIECES;
@@ -819,6 +819,14 @@ public class Storage implements Closeable
       return rv;
   }
 
+  /**
+   *  Does not include directories.
+   *  @since 0.9.23
+   */
+  public int getFileCount() {
+      return _torrentFiles.size();
+  }
+
   /**
    *  Includes the base for a multi-file torrent.
    *  Sorted bottom-up for easy deletion.
@@ -958,11 +966,9 @@ public class Storage implements Closeable
             pieceEnd += length;
             while (fileEnd <= pieceEnd) {
                 TorrentFile tf = _torrentFiles.get(file);
-                synchronized(tf) {
-                    try {
-                        tf.closeRAF();
-                    } catch (IOException ioe) {}
-                }
+                try {
+                    tf.closeRAF();
+                } catch (IOException ioe) {}
                 if (++file >= _torrentFiles.size())
                     break;
                 fileEnd += _torrentFiles.get(file).length;
@@ -1035,9 +1041,7 @@ public class Storage implements Closeable
     for (TorrentFile tf : _torrentFiles)
       {
         try {
-          synchronized(tf) {
             tf.closeRAF();
-          }
         } catch (IOException ioe) {
             _log.error("Error closing " + tf, ioe);
             // gobble gobble
@@ -1262,17 +1266,15 @@ public class Storage implements Closeable
     return length;
   }
 
-  private static final long RAFCloseDelay = 4*60*1000;
+  private static final long RAF_CLOSE_DELAY = 4*60*1000;
 
   /**
    * Close unused RAFs - call periodically
    */
   public void cleanRAFs() {
-    long cutoff = System.currentTimeMillis() - RAFCloseDelay;
+    long cutoff = System.currentTimeMillis() - RAF_CLOSE_DELAY;
     for (TorrentFile tf : _torrentFiles) {
-      synchronized(tf) {
          tf.closeRAF(cutoff);
-      }
     }
   }
 
diff --git a/history.txt b/history.txt
index bd4cde9e3..0dccbc130 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2015-10-10 zzz
+ * i2psnark: Increase max piece size to 16 MB, max files to 999,
+   close files faster based on file count (tickets #1626, #1671)
+ * JobQueue: Only adjust timing for negative clock shifts
+ * NamingServices: Add support for lookups prefixed with "www."
+
 2015-10-08 zzz
  * SimpleTimer2: Additional fix for uncaught IllegalStateException
    affecting streaming timers (ticket #1672)
@@ -30,6 +36,9 @@
 2015-09-25 dg
  * Rename _() for translation to _t() for Java 9 compatibility (ticket #1456)
 
+2015-09-24 zzz
+  - Rename bad .torrent files instead of deleting them
+
 2015-09-20 dg
  * /configreseed: Add 'Reset URL list' button for revert to default hosts (ticket #1554, thanks dzirtt@gmail.com)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index ea17ad55f..e1f87e077 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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "";

From 68aa8800b6b3fe55da255a6707e11082f6f9c2b2 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 10 Oct 2015 15:45:54 +0000
Subject: [PATCH 209/258] increase rekey probability

---
 .../java/src/net/i2p/router/startup/LoadRouterInfoJob.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
index 75977e0ab..f58a1002c 100644
--- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
@@ -112,9 +112,9 @@ class LoadRouterInfoJob extends JobImpl {
                 boolean sigTypeChanged = stype != cstype;
                 if (sigTypeChanged && getContext().getProperty(CreateRouterInfoJob.PROP_ROUTER_SIGTYPE) == null) {
                     // Not explicitly configured, and default has changed
-                    // Give a 10% chance of rekeying for each restart
-                    // TODO reduce from 20 to ~3 (i.e. increase probability) in future release
-                    if (getContext().random().nextInt(20) > 0) {
+                    // Give a 15% chance of rekeying for each restart
+                    // TODO reduce to ~3 (i.e. increase probability) in future release
+                    if (getContext().random().nextInt(7) > 0) {
                         sigTypeChanged = false;
                         if (_log.shouldWarn())
                             _log.warn("Deferring RI rekey from " + stype + " to " + cstype);

From 971a2652e34dce2e290d869ea50f5da01caf1cba Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 10 Oct 2015 19:53:34 +0000
Subject: [PATCH 210/258] adjust date in warning

---
 .../java/src/net/i2p/router/web/RouterConsoleRunner.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 91483b97f..f16cee608 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
@@ -299,12 +299,12 @@ public class RouterConsoleRunner implements RouterApp {
             log.logAlways(net.i2p.util.Log.WARN, s);
             System.out.println("Warning: " + s);
             if (noJava7) {
-                s = "Java 7 will be required by mid-2015, please upgrade soon";
+                s = "Java 7 will be required by late 2015, please upgrade soon";
                 log.logAlways(net.i2p.util.Log.WARN, s);
                 System.out.println("Warning: " + s);
             }
             if (noPack200) {
-                s = "Pack200 will be required by mid-2015, please upgrade Java soon";
+                s = "Pack200 will be required by late 2015, please upgrade Java soon";
                 log.logAlways(net.i2p.util.Log.WARN, s);
                 System.out.println("Warning: " + s);
             }

From 55a6f446515651a107f179ef71966814a4672614 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 11 Oct 2015 15:39:28 +0000
Subject: [PATCH 211/258] Crypto: Test for broken Gentoo ECDSA support Add
 SystemVersion.isJava9()

---
 core/java/src/net/i2p/crypto/SigType.java     | 22 +++++++++++++++++--
 core/java/src/net/i2p/util/SystemVersion.java | 21 ++++++++++++++++++
 history.txt                                   |  4 ++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/core/java/src/net/i2p/crypto/SigType.java b/core/java/src/net/i2p/crypto/SigType.java
index ca05f8eed..48ad93e0a 100644
--- a/core/java/src/net/i2p/crypto/SigType.java
+++ b/core/java/src/net/i2p/crypto/SigType.java
@@ -11,7 +11,9 @@ import java.util.Map;
 
 import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
 import net.i2p.data.Hash;
+import net.i2p.data.SigningPrivateKey;
 import net.i2p.data.SimpleDataStructure;
+import net.i2p.util.SystemVersion;
 
 /**
  * Defines the properties for various signature types
@@ -193,8 +195,24 @@ public enum SigType {
             return true;
         try {
             getParams();
-            if (getBaseAlgorithm() != SigAlgo.EdDSA)
-                Signature.getInstance(getAlgorithmName());
+            if (getBaseAlgorithm() != SigAlgo.EdDSA) {
+                Signature jsig = Signature.getInstance(getAlgorithmName());
+                if (getBaseAlgorithm() == SigAlgo.EC && SystemVersion.isGentoo() ) {
+                    // Do a full keygen/sign test on Gentoo, because it lies. Keygen works but sigs fail.
+                    // https://bugs.gentoo.org/show_bug.cgi?id=528338
+                    // http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2497
+                    // http://zzz.i2p/topics/1931
+                    // Be sure nothing in the code paths below calls isAvailable()
+                    // get an I2P keypair
+                    SimpleDataStructure[] keys = KeyGenerator.getInstance().generateSigningKeys(this);
+                    SigningPrivateKey privKey = (SigningPrivateKey) keys[1];
+                    // convert privkey back to Java key and sign
+                    jsig.initSign(SigUtil.toJavaECKey(privKey));
+                    // use the pubkey as random data
+                    jsig.update(keys[0].getData());
+                    jsig.sign();
+                }
+            }
             getDigestInstance();
             getHashInstance();
         } catch (Exception e) {
diff --git a/core/java/src/net/i2p/util/SystemVersion.java b/core/java/src/net/i2p/util/SystemVersion.java
index 6650cf479..3e5e56e7c 100644
--- a/core/java/src/net/i2p/util/SystemVersion.java
+++ b/core/java/src/net/i2p/util/SystemVersion.java
@@ -18,6 +18,8 @@ public abstract class SystemVersion {
     private static final boolean _isArm = System.getProperty("os.arch").startsWith("arm");
     private static final boolean _isX86 = System.getProperty("os.arch").contains("86") ||
                                           System.getProperty("os.arch").equals("amd64");
+    private static final boolean _isGentoo = System.getProperty("os.version").contains("gentoo") ||
+                                             System.getProperty("os.version").contains("hardened");  // Funtoo
     private static final boolean _isAndroid;
     private static final boolean _isApache;
     private static final boolean _isGNU;
@@ -27,6 +29,7 @@ public abstract class SystemVersion {
     private static final boolean _oneDotSix;
     private static final boolean _oneDotSeven;
     private static final boolean _oneDotEight;
+    private static final boolean _oneDotNine;
     private static final int _androidSDK;
 
     static {
@@ -62,10 +65,12 @@ public abstract class SystemVersion {
             _oneDotSix = _androidSDK >= 9;
             _oneDotSeven = _androidSDK >= 19;
             _oneDotEight = false;
+            _oneDotNine = false;
         } else {
             _oneDotSix = VersionComparator.comp(System.getProperty("java.version"), "1.6") >= 0;
             _oneDotSeven = _oneDotSix && VersionComparator.comp(System.getProperty("java.version"), "1.7") >= 0;
             _oneDotEight = _oneDotSeven && VersionComparator.comp(System.getProperty("java.version"), "1.8") >= 0;
+            _oneDotNine = _oneDotEight && VersionComparator.comp(System.getProperty("java.version"), "1.9") >= 0;
         }
     }
 
@@ -95,6 +100,13 @@ public abstract class SystemVersion {
         return _isGNU;
     }
 
+    /**
+     *  @since 0.9.23
+     */
+    public static boolean isGentoo() {
+        return _isGentoo;
+    }
+
     /**
      *  @since 0.9.8
      */
@@ -139,6 +151,15 @@ public abstract class SystemVersion {
         return _oneDotEight;
     }
 
+    /**
+     *
+     *  @return true if Java 1.9 or higher, false for Android.
+     *  @since 0.9.23
+     */
+    public static boolean isJava9() {
+        return _oneDotNine;
+    }
+
     /**
      * This isn't always correct.
      * http://stackoverflow.com/questions/807263/how-do-i-detect-which-kind-of-jre-is-installed-32bit-vs-64bit
diff --git a/history.txt b/history.txt
index 0dccbc130..80b38233e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,8 +1,12 @@
+2015-10-11 zzz
+ * Crypto: Test for broken Gentoo ECDSA support
+
 2015-10-10 zzz
  * i2psnark: Increase max piece size to 16 MB, max files to 999,
    close files faster based on file count (tickets #1626, #1671)
  * JobQueue: Only adjust timing for negative clock shifts
  * NamingServices: Add support for lookups prefixed with "www."
+ * Startup: Increase rekey probability
 
 2015-10-08 zzz
  * SimpleTimer2: Additional fix for uncaught IllegalStateException
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e1f87e077..8ab24107c 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 = 16;
+    public final static long BUILD = 17;
 
     /** for example "-test" */
     public final static String EXTRA = "";

From 2c03b434e128d94226e424fe032cd97ed51a67b0 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Tue, 13 Oct 2015 19:24:30 +0000
Subject: [PATCH 212/258] Startup: Delete our old RI from netDB when rekeying

---
 .../kademlia/PersistentDataStore.java         | 21 +++++++++++++++++--
 .../i2p/router/startup/LoadRouterInfoJob.java | 13 +++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index c3c413930..90a51740c 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -44,8 +44,10 @@ import net.i2p.util.SecureFileOutputStream;
  * Write out keys to disk when we get them and periodically read ones we don't know
  * about into memory, with newly read routers are also added to the routing table.
  *
+ * Public only for access to static methods by startup classes
+ *
  */
-class PersistentDataStore extends TransientDataStore {
+public class PersistentDataStore extends TransientDataStore {
     private final File _dbDir;
     private final KademliaNetworkDatabaseFacade _facade;
     private final Writer _writer;
@@ -630,8 +632,23 @@ class PersistentDataStore extends TransientDataStore {
             return ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX;
         return DIR_PREFIX + b64.charAt(0) + File.separatorChar + ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX;
     }
+
+    /**
+     *  The persistent RI file for a hash.
+     *  This is available before the netdb subsystem is running, so we can delete our old RI.
+     *
+     *  @return non-null, should be absolute, does not necessarily exist
+     *  @since 0.9.23
+     */
+    public static File getRouterInfoFile(RouterContext ctx, Hash hash) {
+        String b64 = hash.toBase64();
+        File dir = new File(ctx.getRouterDir(), ctx.getProperty(KademliaNetworkDatabaseFacade.PROP_DB_DIR, KademliaNetworkDatabaseFacade.DEFAULT_DB_DIR));
+        if (ctx.getBooleanProperty(PROP_FLAT))
+            return new File(dir, ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX);
+        return new File(dir, DIR_PREFIX + b64.charAt(0) + File.separatorChar + ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX);
+    }
     
-    static Hash getRouterInfoHash(String filename) {
+    private static Hash getRouterInfoHash(String filename) {
         return getHash(filename, ROUTERINFO_PREFIX, ROUTERINFO_SUFFIX);
     }
     
diff --git a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
index f58a1002c..1ddce12b9 100644
--- a/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java
@@ -20,6 +20,7 @@ import net.i2p.crypto.SigType;
 import net.i2p.data.Certificate;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.PublicKey;
 import net.i2p.data.SigningPrivateKey;
@@ -30,6 +31,7 @@ import net.i2p.data.router.RouterPrivateKeyFile;
 import net.i2p.router.JobImpl;
 import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
+import net.i2p.router.networkdb.kademlia.PersistentDataStore;
 import net.i2p.util.Log;
 
 /**
@@ -122,9 +124,18 @@ class LoadRouterInfoJob extends JobImpl {
                 }
 
                 if (sigTypeChanged || shouldRebuild(privkey)) {
+                    if (_us != null) {
+                        Hash h = _us.getIdentity().getHash();
+                        _log.logAlways(Log.WARN, "Deleting old router identity " + h.toBase64());
+                        // the netdb hasn't started yet, but we want to delete the RI
+                        File f = PersistentDataStore.getRouterInfoFile(getContext(), h);
+                        f.delete();
+                        // the banlist can be called at any time
+                        getContext().banlist().banlistRouterForever(h, "Our previous identity");
+                        _us = null;
+                    }
                     if (sigTypeChanged)
                         _log.logAlways(Log.WARN, "Rebuilding RouterInfo with new signature type " + cstype);
-                    _us = null;
                     // windows... close before deleting
                     if (fis1 != null) {
                         try { fis1.close(); } catch (IOException ioe) {}

From 5e879b85a8dbe569809bb96cf764f7fc281eb05c Mon Sep 17 00:00:00 2001
From: zzz 
Date: Tue, 13 Oct 2015 19:49:18 +0000
Subject: [PATCH 213/258] fix installer build

---
 .../i2p/router/networkdb/kademlia/PersistentDataStore.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
index 90a51740c..a04a339cc 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/PersistentDataStore.java
@@ -648,7 +648,10 @@ public class PersistentDataStore extends TransientDataStore {
         return new File(dir, DIR_PREFIX + b64.charAt(0) + File.separatorChar + ROUTERINFO_PREFIX + b64 + ROUTERINFO_SUFFIX);
     }
     
-    private static Hash getRouterInfoHash(String filename) {
+    /**
+     *  Package private for installer BundleRouterInfos
+     */
+    static Hash getRouterInfoHash(String filename) {
         return getHash(filename, ROUTERINFO_PREFIX, ROUTERINFO_SUFFIX);
     }
     

From 9224afb78d7bf301d4efbd02cf1e7a4520538b19 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Tue, 13 Oct 2015 21:38:19 +0000
Subject: [PATCH 214/258] i2psnark: Don't show empty fields on details page

---
 .../java/src/org/klomp/snark/web/I2PSnarkServlet.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 fdd70c0d9..913fd6d77 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -2751,7 +2751,7 @@ public class I2PSnarkServlet extends BasicServlet {
                     buf.append("
                                    ");
                     toThemeImg(buf, "details");
                     buf.append(" ")
@@ -2768,13 +2768,13 @@ public class I2PSnarkServlet extends BasicServlet {
                         }
                         buf.append("] ");
                     }
-                    buf.append("
                                    ");
@@ -2799,7 +2799,7 @@ public class I2PSnarkServlet extends BasicServlet {
                        .append("
                                    ");

From 6aa8ed12805a36d3eb899c09f467286ea2221afe Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 14 Oct 2015 18:22:35 +0000
Subject: [PATCH 215/258] Update: Require Java 7 to download dev builds

---
 .../router/update/DevSU3UpdateChecker.java    | 11 +++++++-
 .../router/update/UnsignedUpdateChecker.java  | 16 +++++++++---
 .../src/net/i2p/router/web/NewsHelper.java    | 22 ++++++++++++++++
 .../src/net/i2p/router/web/SummaryHelper.java | 26 +++++++++++++++++++
 4 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/DevSU3UpdateChecker.java b/apps/routerconsole/java/src/net/i2p/router/update/DevSU3UpdateChecker.java
index 8c5eeed54..4c5cd902b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/DevSU3UpdateChecker.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/DevSU3UpdateChecker.java
@@ -10,8 +10,10 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.RouterVersion;
 import net.i2p.router.web.ConfigUpdateHandler;
 import net.i2p.update.*;
+import net.i2p.util.Log;
 import net.i2p.util.PartialEepGet;
 import net.i2p.util.PortMapper;
+import net.i2p.util.SystemVersion;
 import net.i2p.util.VersionComparator;
 
 /**
@@ -73,8 +75,15 @@ class DevSU3UpdateChecker extends UpdateRunner {
         String newVersion = TrustedUpdate.getVersionString(new ByteArrayInputStream(_baos.toByteArray()));
         boolean newer = VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0;
         if (newer) {
-            _mgr.notifyVersionAvailable(this, _currentURI, UpdateType.ROUTER_DEV_SU3, "", UpdateMethod.HTTP,
+            if (SystemVersion.isJava7()) {
+                _mgr.notifyVersionAvailable(this, _currentURI, UpdateType.ROUTER_DEV_SU3, "", UpdateMethod.HTTP,
                                         _urls, newVersion, RouterVersion.FULL_VERSION);
+            } else {
+                String ourJava = System.getProperty("java.version");
+                String msg = _mgr._t("Requires Java version {0} but installed Java version is {1}", "1.7", ourJava);
+                _log.logAlways(Log.WARN, "Cannot update to version " + newVersion + ": " + msg);
+                _mgr.notifyVersionConstraint(this, _currentURI, UpdateType.ROUTER_DEV_SU3, "", newVersion, msg);
+            }
         } else {
             //updateStatus("" + _t("No new version found at {0}", linkify(url)) + "");
             if (_log.shouldWarn())
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
index 5d3a45695..02406e418 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/UnsignedUpdateChecker.java
@@ -8,7 +8,9 @@ import net.i2p.router.util.RFC822Date;
 import net.i2p.router.web.ConfigUpdateHandler;
 import net.i2p.update.*;
 import net.i2p.util.EepHead;
+import net.i2p.util.Log;
 import net.i2p.util.PortMapper;
+import net.i2p.util.SystemVersion;
 
 /**
  *  Does a simple EepHead to get the last-modified header.
@@ -76,9 +78,17 @@ class UnsignedUpdateChecker extends UpdateRunner {
                     if (modtime <= 0) return false;
                     if (_ms <= 0) return false;
                     if (modtime > _ms) {
-                        _unsignedUpdateAvailable = true;
-                        _mgr.notifyVersionAvailable(this, _urls.get(0), getType(), "", getMethod(), _urls,
-                                                    Long.toString(modtime), "");
+                        String newVersion = Long.toString(modtime);
+                        if (SystemVersion.isJava7()) {
+                            _unsignedUpdateAvailable = true;
+                            _mgr.notifyVersionAvailable(this, _urls.get(0), getType(), "", getMethod(), _urls,
+                                                        newVersion, "");
+                        } else {
+                            String ourJava = System.getProperty("java.version");
+                            String msg = _mgr._t("Requires Java version {0} but installed Java version is {1}", "1.7", ourJava);
+                            _log.logAlways(Log.WARN, "Cannot update to version " + newVersion + ": " + msg);
+                            _mgr.notifyVersionConstraint(this, _urls.get(0), getType(), "", newVersion, msg);
+                        }
                     }
                 }
                 return true;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java
index 5b068f4b1..ee353925a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java
@@ -99,6 +99,28 @@ public class NewsHelper extends ContentHelper {
         return mgr.getUpdateConstraint(ROUTER_SIGNED, "");
     }
 
+    /**
+     *  Translated message about new version available but constrained
+     *  @return null if none
+     *  @since 0.9.23
+     */
+    public static String unsignedUpdateConstraint() {
+        ConsoleUpdateManager mgr = ConsoleUpdateManager.getInstance();
+        if (mgr == null) return null;
+        return mgr.getUpdateConstraint(ROUTER_UNSIGNED, "");
+    }
+
+    /**
+     *  Translated message about new version available but constrained
+     *  @return null if none
+     *  @since 0.9.23
+     */
+    public static String devSU3UpdateConstraint() {
+        ConsoleUpdateManager mgr = ConsoleUpdateManager.getInstance();
+        if (mgr == null) return null;
+        return mgr.getUpdateConstraint(ROUTER_DEV_SU3, "");
+    }
+
     /**
      *  Release update only.
      *  Already downloaded but not installed version.
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 88a0e43d9..7e97d9573 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -724,6 +724,8 @@ public class SummaryHelper extends HelperBase {
         boolean unsignedAvail = unsignedUpdateAvailable();
         boolean devSU3Avail = devSU3UpdateAvailable();
         String constraint = avail ? NewsHelper.updateConstraint() : null;
+        String unsignedConstraint = unsignedAvail ? NewsHelper.unsignedUpdateConstraint() : null;
+        String devSU3Constraint = devSU3Avail ? NewsHelper.devSU3UpdateConstraint() : null;
         if (avail && constraint != null &&
             !NewsHelper.isUpdateInProgress() &&
             !_context.router().gracefulShutdownInProgress()) {
@@ -736,6 +738,30 @@ public class SummaryHelper extends HelperBase {
             buf.append(constraint).append("");
             avail = false;
         }
+        if (unsignedAvail && unsignedConstraint != null &&
+            !NewsHelper.isUpdateInProgress() &&
+            !_context.router().gracefulShutdownInProgress()) {
+            if (needSpace)
+                buf.append("
                                    ");
+            else
+                needSpace = true;
+            buf.append("
                                    ").append(_t("Update available")).append(":
                                    ");
+            buf.append(_t("Version {0}", getUnsignedUpdateVersion())).append("
                                    ");
+            buf.append(unsignedConstraint).append("
                                    ");
+            unsignedAvail = false;
+        }
+        if (devSU3Avail && devSU3Constraint != null &&
+            !NewsHelper.isUpdateInProgress() &&
+            !_context.router().gracefulShutdownInProgress()) {
+            if (needSpace)
+                buf.append("
                                    ");
+            else
+                needSpace = true;
+            buf.append("
                                    ").append(_t("Update available")).append(":
                                    ");
+            buf.append(_t("Version {0}", getDevSU3UpdateVersion())).append("
                                    ");
+            buf.append(devSU3Constraint).append("
                                    ");
+            devSU3Avail = false;
+        }
         if ((avail || unsignedAvail || devSU3Avail) &&
             !NewsHelper.isUpdateInProgress() &&
             !_context.router().gracefulShutdownInProgress() &&

From 649a63db6f2fd3b698ee9c167b3c16ebf3230a4f Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 14 Oct 2015 19:18:10 +0000
Subject: [PATCH 216/258] Update: Fix persistence of the available dev version
 Java 7 check at startup with persisted versions

---
 .../router/update/ConsoleUpdateManager.java   | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
index 7999b2b47..d34492294 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -39,6 +39,7 @@ import net.i2p.util.ConcurrentHashSet;
 import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
+import net.i2p.util.SystemVersion;
 import net.i2p.util.VersionComparator;
 
 /**
@@ -184,7 +185,11 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
         if (newVersion != null) {
             List updateSources = uuh.getUpdateSources();
             if (updateSources != null) {
-                VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
+                VersionAvailable newVA;
+                if (SystemVersion.isJava7())
+                    newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
+                else
+                    newVA = new VersionAvailable(newVersion, "Requires Java 7");
                 _available.put(new UpdateItem(ROUTER_UNSIGNED, ""), newVA);
             }
         }
@@ -197,7 +202,11 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
             if (VersionComparator.comp(newVersion, RouterVersion.FULL_VERSION) > 0) {
                 List updateSources = dsuh.getUpdateSources();
                 if (updateSources != null) {
-                    VersionAvailable newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
+                    VersionAvailable newVA;
+                    if (SystemVersion.isJava7())
+                        newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
+                    else
+                        newVA = new VersionAvailable(newVersion, "Requires Java 7");
                     _available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA);
                 }
             } else {
@@ -846,6 +855,14 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
             _available.put(ui, newVA);
             shouldUpdate = true;
         }
+
+        // save across restarts
+        if (type == ROUTER_UNSIGNED) {
+            _context.router().saveConfig(PROP_UNSIGNED_AVAILABLE, newVersion);
+        } else if (type == ROUTER_DEV_SU3) {
+            _context.router().saveConfig(PROP_DEV_SU3_AVAILABLE, newVersion);
+        }
+
         if (!shouldUpdate)
             return false;
 
@@ -857,12 +874,6 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
 
             case ROUTER_UNSIGNED:
             case ROUTER_DEV_SU3:
-                // save across restarts
-                String prop = type == ROUTER_UNSIGNED ? PROP_UNSIGNED_AVAILABLE
-                                                      : PROP_DEV_SU3_AVAILABLE;
-                _context.router().saveConfig(prop, newVersion);
-                // fall through
-
             case ROUTER_SIGNED:
             case ROUTER_SIGNED_SU3:
                 if (shouldInstall() &&

From b43417bf77467b3ce624a2b956377a53a8bd35d6 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 15 Oct 2015 18:59:37 +0000
Subject: [PATCH 217/258] update jetty javadoc link

---
 build.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.properties b/build.properties
index 195a13c6b..9e219c333 100644
--- a/build.properties
+++ b/build.properties
@@ -11,7 +11,10 @@
 # Note: Include the trailing slash! Don't surround the URL in quotes!
 javasedocs.url=http://docs.oracle.com/javase/6/docs/api/
 javaeedocs.url=http://docs.oracle.com/javaee/6/api/
-jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
+# The following link is dead, perhaps temporarily,
+# perhaps not, as they move 7 and 8 to unsupported status.
+#jettydocs.url=http://download.eclipse.org/jetty/stable-8/apidocs/
+jettydocs.url=http://download.eclipse.org/jetty/8.1.17.v20150415/apidocs/
 jrobindocs.url=http://docs.i2p-projekt.de/jrobin/javadoc/
 wrapperdocs.url=http://wrapper.tanukisoftware.com/jdoc/
 # these are only for unit test javadocs

From 39b218b216a7ba5088db2b8e89a8d5fe5ef1e7b1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 16 Oct 2015 14:25:55 +0000
Subject: [PATCH 218/258] i2psnark: Fix deadlock (ticket #1432)

---
 .../src/org/klomp/snark/PeerCoordinator.java  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index b347b5448..8daf8b030 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -984,8 +984,9 @@ class PeerCoordinator implements PeerListener
     }
     int piece = pp.getPiece();
     
-    synchronized(wantedPieces)
-      {
+    // try/catch outside the synch to avoid deadlock in the catch
+    try {
+      synchronized(wantedPieces) {
         Piece p = new Piece(piece);
         if (!wantedPieces.contains(p))
           {
@@ -1001,8 +1002,7 @@ class PeerCoordinator implements PeerListener
             }
           }
         
-        try
-          {
+          // try/catch moved outside of synch
             // this takes forever if complete, as it rechecks
             if (storage.putPiece(pp))
               {
@@ -1028,21 +1028,21 @@ class PeerCoordinator implements PeerListener
                     _log.warn("Got BAD piece " + piece + "/" + metainfo.getPieces() + " from " + peer + " for " + metainfo.getName());
                 return false; // No need to announce BAD piece to peers.
               }
-          }
-        catch (IOException ioe)
-          {
+
+        wantedPieces.remove(p);
+        wantedBytes -= metainfo.getPieceLength(p.getId());
+      }  // synch
+    } catch (IOException ioe) {
             String msg = "Error writing storage (piece " + piece + ") for " + metainfo.getName() + ": " + ioe;
             _log.error(msg, ioe);
             if (listener != null) {
                 listener.addMessage(msg);
                 listener.addMessage("Fatal storage error: Stopping torrent " + metainfo.getName());
             }
+            // deadlock was here
             snark.stopTorrent();
             throw new RuntimeException(msg, ioe);
-          }
-        wantedPieces.remove(p);
-        wantedBytes -= metainfo.getPieceLength(p.getId());
-      }
+    }
 
     // just in case
     removePartialPiece(piece);

From ba1488bccea566eef49a001b0f204029789c20a0 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 16 Oct 2015 19:45:23 +0000
Subject: [PATCH 219/258] i2psnark: Add "smart sort" option, set sort based on
 language (tickets #637, #1303)

---
 .../src/org/klomp/snark/SnarkManager.java     |  28 +++-
 .../org/klomp/snark/web/I2PSnarkServlet.java  |  17 ++-
 .../java/src/org/klomp/snark/web/Sorters.java | 128 ++++++++++++++++--
 history.txt                                   |  13 ++
 .../src/net/i2p/router/RouterVersion.java     |   2 +-
 5 files changed, 175 insertions(+), 13 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 98d0ee2c0..bb1684e5f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -126,6 +126,7 @@ public class SnarkManager implements CompleteListener {
     public static final String PROP_OPENTRACKERS = "i2psnark.opentrackers";
     public static final String PROP_PRIVATETRACKERS = "i2psnark.privatetrackers";
     private static final String PROP_USE_DHT = "i2psnark.enableDHT";
+    private static final String PROP_SMART_SORT = "i2psnark.smartSort";
 
     public static final int MIN_UP_BW = 10;
     public static final int DEFAULT_MAX_UP_BW = 25;
@@ -340,6 +341,17 @@ public class SnarkManager implements CompleteListener {
     public boolean shouldAutoStart() {
         return Boolean.parseBoolean(_config.getProperty(PROP_AUTO_START, DEFAULT_AUTO_START));
     }
+    
+    /**
+     *  @return default true
+     *  @since 0.9.23
+     */
+    public boolean isSmartSortEnabled() {
+        String val = _config.getProperty(PROP_SMART_SORT);
+        if (val == null)
+            return true;
+        return Boolean.parseBoolean(val);
+    }
 
 /****
     public String linkPrefix() {
@@ -736,19 +748,19 @@ public class SnarkManager implements CompleteListener {
     /**
      *  all params may be null or need trimming
      */
-    public void updateConfig(String dataDir, boolean filesPublic, boolean autoStart, String refreshDelay,
+    public void updateConfig(String dataDir, boolean filesPublic, boolean autoStart, boolean smartSort, String refreshDelay,
                              String startDelay, String pageSize, String seedPct, String eepHost, 
                              String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
                              String upLimit, String upBW, boolean useOpenTrackers, boolean useDHT, String theme) {
         synchronized(_configLock) {
-            locked_updateConfig(dataDir, filesPublic, autoStart, refreshDelay,
+            locked_updateConfig(dataDir, filesPublic, autoStart, smartSort,refreshDelay,
                                 startDelay,  pageSize,  seedPct,  eepHost, 
                                 eepPort,  i2cpHost,  i2cpPort,  i2cpOpts,
                                 upLimit,  upBW, useOpenTrackers, useDHT,  theme);
         }
     }
 
-    private void locked_updateConfig(String dataDir, boolean filesPublic, boolean autoStart, String refreshDelay,
+    private void locked_updateConfig(String dataDir, boolean filesPublic, boolean autoStart, boolean smartSort, String refreshDelay,
                              String startDelay, String pageSize, String seedPct, String eepHost, 
                              String eepPort, String i2cpHost, String i2cpPort, String i2cpOpts,
                              String upLimit, String upBW, boolean useOpenTrackers, boolean useDHT, String theme) {
@@ -966,6 +978,16 @@ public class SnarkManager implements CompleteListener {
                 addMessage(_t("Disabled autostart"));
             changed = true;
         }
+
+        if (isSmartSortEnabled() != smartSort) {
+            _config.setProperty(PROP_SMART_SORT, Boolean.toString(smartSort));
+            if (smartSort)
+                addMessage(_t("Enabled smart sort"));
+            else
+                addMessage(_t("Disabled smart sort"));
+            changed = true;
+        }
+
         if (_util.shouldUseOpenTrackers() != useOpenTrackers) {
             _config.setProperty(PROP_USE_OPENTRACKERS, useOpenTrackers + "");
             if (useOpenTrackers)
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 913fd6d77..b0335f6a8 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -32,6 +32,7 @@ import net.i2p.data.DataHelper;
 import net.i2p.data.Hash;
 import net.i2p.util.Log;
 import net.i2p.util.SecureFile;
+import net.i2p.util.Translate;
 
 import org.klomp.snark.I2PSnarkUtil;
 import org.klomp.snark.MagnetURI;
@@ -1118,6 +1119,7 @@ public class I2PSnarkServlet extends BasicServlet {
             String dataDir = req.getParameter("nofilter_dataDir");
             boolean filesPublic = req.getParameter("filesPublic") != null;
             boolean autoStart = req.getParameter("autoStart") != null;
+            boolean smartSort = req.getParameter("smartSort") != null;
             String seedPct = req.getParameter("seedPct");
             String eepHost = req.getParameter("eepHost");
             String eepPort = req.getParameter("eepPort");
@@ -1133,7 +1135,7 @@ public class I2PSnarkServlet extends BasicServlet {
             boolean useDHT = req.getParameter("useDHT") != null;
             //String openTrackers = req.getParameter("openTrackers");
             String theme = req.getParameter("theme");
-            _manager.updateConfig(dataDir, filesPublic, autoStart, refreshDel, startupDel, pageSize,
+            _manager.updateConfig(dataDir, filesPublic, autoStart, smartSort, refreshDel, startupDel, pageSize,
                                   seedPct, eepHost, eepPort, i2cpHost, i2cpPort, i2cpOpts,
                                   upLimit, upBW, useOpenTrackers, useDHT, theme);
             // update servlet
@@ -1401,6 +1403,10 @@ public class I2PSnarkServlet extends BasicServlet {
                     sort = Integer.parseInt(ssort);
                 } catch (NumberFormatException nfe) {}
             }
+            if (_manager.isSmartSortEnabled())
+                Sorters.setPattern(Translate.getLanguage(_manager.util().getContext()));
+            else
+                Sorters.setPattern(null);
             try {
                 Collections.sort(rv, Sorters.getComparator(sort, this));
             } catch (IllegalArgumentException iae) {
@@ -2144,6 +2150,7 @@ public class I2PSnarkServlet extends BasicServlet {
         String dataDir = _manager.getDataDir().getAbsolutePath();
         boolean filesPublic = _manager.areFilesPublic();
         boolean autoStart = _manager.shouldAutoStart();
+        boolean smartSort = _manager.isSmartSortEnabled();
         boolean useOpenTrackers = _manager.util().shouldUseOpenTrackers();
         //String openTrackers = _manager.util().getOpenTrackerString();
         boolean useDHT = _manager.util().shouldUseDHT();
@@ -2177,6 +2184,14 @@ public class I2PSnarkServlet extends BasicServlet {
                   + (autoStart ? "checked " : "") 
                   + "title=\"");
         out.write(_t("If checked, automatically start torrents that are added"));
+        out.write("\" >" +
+
+                  "
                                    ");
+        out.write(_t("Smart torrent sorting"));
+        out.write(": " +
 
                   "
                                    ");
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
index 39120d6cc..964e6d80d 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/Sorters.java
@@ -6,6 +6,8 @@ import java.text.Collator;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.klomp.snark.MetaInfo;
 import org.klomp.snark.Snark;
@@ -18,6 +20,13 @@ import org.klomp.snark.Storage;
  */
 class Sorters {
 
+    /**
+     * See below
+     */
+    private static final Pattern PATTERN_DE, PATTERN_EN, PATTERN_ES, PATTERN_FR,
+                                 PATTERN_IT, PATTERN_NL, PATTERN_PT;
+    private static Pattern _pattern;
+
     /**
      *  Negative is reverse
      *
@@ -113,8 +122,8 @@ class Sorters {
 
 
     /**
-     *  Sort alphabetically in current locale, ignore case, ignore leading "the "
-     *  (I guess this is worth it, a lot of torrents start with "The "
+     *  Sort alphabetically in current locale, ignore case, ignore leading
+     *  articles such as "the" if the pattern is set by setPattern()
      *  @since 0.7.14
      */
     private static class TorrentNameComparator implements Comparator, Serializable {
@@ -130,13 +139,16 @@ class Sorters {
             if (l.getStorage() != null && r.getStorage() == null)
                 return 1;
             String ls = l.getBaseName();
-            String llc = ls.toLowerCase(Locale.US);
-            if (llc.startsWith("the ") || llc.startsWith("the.") || llc.startsWith("the_"))
-                ls = ls.substring(4);
             String rs = r.getBaseName();
-            String rlc = rs.toLowerCase(Locale.US);
-            if (rlc.startsWith("the ") || rlc.startsWith("the.") || rlc.startsWith("the_"))
-                rs = rs.substring(4);
+            Pattern p = _pattern;
+            if (p != null) {
+                Matcher m = p.matcher(ls);
+                if (m.matches())
+                    ls = ls.substring(m.group(1).length());
+                m = p.matcher(rs);
+                if (m.matches())
+                    rs = rs.substring(m.group(1).length());
+            }
             return Collator.getInstance().compare(ls, rs);
         }
     }
@@ -528,4 +540,104 @@ class Sorters {
             return r.priority - l.priority;
         }
     }
+
+    /*
+     *  Match an indefinite or definite article in the language,
+     *  followed by one or more whitespace, '.', or '_'.
+     *  Does not match "partitive" articles.
+     *
+     *  https://en.wikipedia.org/wiki/Article_%28grammar%29
+     *  http://www.loc.gov/marc/bibliographic/bdapndxf.html
+     */
+    static {
+        PATTERN_DE = Pattern.compile(
+            // can't make the non-capturing innner group work
+            //"^((?:" +
+            "^((" +
+            "der|die|das|des|dem|den|ein|eine|einer|eines|einem|einen" +
+            ")[\\s\\._]+).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_EN = Pattern.compile(
+            "^((" +
+            "a|an|the" +
+            ")[\\s\\._]+).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_ES = Pattern.compile(
+            "^((" +
+            "el|la|lo|los|las|un|una|unos|unas" +
+            ")[\\s\\._]+).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_FR = Pattern.compile(
+            // note l' doesn't require whitespace after
+            "^(l'|((" +
+            "le|la|les|un|une|des" +
+            ")[\\s\\._]+)).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_IT = Pattern.compile(
+            // note l' and un' don't require whitespace after
+            "^(l'|un'|((" +
+            "il|lo|la|i|gli|le|uno|una|un" +
+            ")[\\s\\._]+)).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_NL = Pattern.compile(
+            "^((" +
+            "de|het|het'n|een|een'n" +
+            ")[\\s\\._]+).*",
+            Pattern.CASE_INSENSITIVE);
+        PATTERN_PT = Pattern.compile(
+            "^((" +
+            "o|a|os|as|um|uma|uns|umas" +
+            ")[\\s\\._]+).*",
+            Pattern.CASE_INSENSITIVE);
+    }
+
+    /**
+     * Sets static field, oh well
+     * @param lang null for none
+     * @since 0.9.23
+     */
+    public static void setPattern(String lang) {
+        Pattern p;
+        if (lang == null)
+            p = null;
+        else if (lang.equals("de"))
+            p = PATTERN_DE;
+        else if (lang.equals("en"))
+            p = PATTERN_EN;
+        else if (lang.equals("es"))
+            p = PATTERN_ES;
+        else if (lang.equals("fr"))
+            p = PATTERN_FR;
+        else if (lang.equals("it"))
+            p = PATTERN_IT;
+        else if (lang.equals("nl"))
+            p = PATTERN_NL;
+        else if (lang.equals("pt"))
+            p = PATTERN_PT;
+        else
+            p = null;
+        _pattern = p;
+    }
+
+/****
+    public static final void main(String[] args) {
+        if (args.length != 2) {
+            System.out.println("Usage: Sorters lang 'string'");
+            System.exit(1);
+        }
+        String lang = args[0];
+        setPattern(lang);
+        if (_pattern == null) {
+            System.out.println("Unsupported " + lang);
+            System.exit(1);
+        }
+        String s = args[1];
+        Matcher m = _pattern.matcher(s);
+        if (m.matches()) {
+            System.out.println("Match is \"" + m.group(1) + '"');
+        } else {
+            System.out.println("No match for \"" + s + '"');
+        }
+    }
+****/
 }
diff --git a/history.txt b/history.txt
index 80b38233e..f04c70cac 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,16 @@
+2015-10-16 zzz
+ * i2psnark:
+   - Fix deadlock (ticket #1432)
+   - Add "smart sort" option, set sort based on language (tickets #637, #1303)
+
+2015-10-14 zzz
+ * Update:
+   - Require Java 7 to download dev builds (ticket #1669)
+   - Fix persistence of the available dev version
+
+2015-10-13 zzz
+ * Startup: Delete our old RI from netDB when rekeying
+
 2015-10-11 zzz
  * Crypto: Test for broken Gentoo ECDSA support
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 8ab24107c..80cfb9c84 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 = 17;
+    public final static long BUILD = 18;
 
     /** for example "-test" */
     public final static String EXTRA = "";

From fe260521895df30891abccf2feb83b73c40f80e8 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 16 Oct 2015 20:54:12 +0000
Subject: [PATCH 220/258] add mime type for .mka

---
 apps/i2psnark/mime.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/i2psnark/mime.properties b/apps/i2psnark/mime.properties
index 7f21bea1c..5a1157e0a 100644
--- a/apps/i2psnark/mime.properties
+++ b/apps/i2psnark/mime.properties
@@ -11,6 +11,7 @@ iso	= application/x-iso9660-image
 m4a	= audio/mp4a-latm
 m4b	= audio/mp4a-latm
 m4v	= video/x-m4v
+mka	= audio/x-matroska
 mkv	= video/x-matroska
 mobi	= application/x-mobipocket-ebook
 mp4	= video/mp4

From dd36176997bfddae92762ce7b3b8b2f78a5a24d2 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 16 Oct 2015 21:38:12 +0000
Subject: [PATCH 221/258] big fat Java 6 warning

---
 .../src/net/i2p/router/web/SummaryBarRenderer.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 29223c7bf..002f7983b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -18,6 +18,7 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.news.NewsEntry;
 import net.i2p.router.news.NewsManager;
 import net.i2p.util.PortMapper;
+import net.i2p.util.SystemVersion;
 
 /**
  *  Refactored from summarynoframe.jsp to save ~100KB
@@ -345,6 +346,13 @@ public class SummaryBarRenderer {
                .append(_t("Warning: ECDSA is not available. Update your Java or OS"))
                .append("\n");
         }
+        if (!SystemVersion.isJava7()) {
+            buf.append("
                                    ")
+               .append(_t("Warning: Java version {0} is no longer supported by I2P.", System.getProperty("java.version")))
+               .append(' ')
+               .append(_t("Update Java to version {0} or higher to receive I2P updates.", "7"))
+               .append("
                                    \n");
+        }
         return buf.toString();
     }
 
@@ -665,6 +673,11 @@ public class SummaryBarRenderer {
         return Messages.getString(s, _context);
     }
 
+    /** @since 0.9.23 */
+    private String _t(String s, Object o) {
+        return Messages.getString(s, o, _context);
+    }
+
     /**
      *  Where the translation is to two words or more,
      *  prevent splitting across lines

From 70921a2b09369e00000d83605010c1b07d4fc555 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 16 Oct 2015 22:17:09 +0000
Subject: [PATCH 222/258] i2psnark: Don't balloon files on ARM (ticket #1684)

---
 apps/i2psnark/java/src/org/klomp/snark/Storage.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 3f1682318..1edf12b5b 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -86,6 +86,7 @@ public class Storage implements Closeable
   private static final Map _filterNameCache = new ConcurrentHashMap();
 
   private static final boolean _isWindows = SystemVersion.isWindows();
+  private static final boolean _isARM = SystemVersion.isARM();
 
   private static final int BUFSIZE = PeerState.PARTSIZE;
   private static final ByteCache _cache = ByteCache.getInstance(16, BUFSIZE);
@@ -1400,7 +1401,9 @@ public class Storage implements Closeable
           // Windows will zero-fill up to the point of the write, which
           // will make the file fairly unfragmented, on average, at least until
           // near the end where it will get exponentially more fragmented.
-          if (!_isWindows)
+          // Also don't ballon on ARM, as a proxy for solid state disk, where fragmentation doesn't matter too much.
+          // Actual detection of SSD is almost impossible.
+          if (!_isWindows && !_isARM)
               isSparse = true;
       }
 

From 3411a7c884e281ef0fa359f08cab2e33d121ac30 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 12:55:39 +0000
Subject: [PATCH 223/258] Crypto: Consolidate duplicate unlimited strength
 crypto check code

---
 .../src/net/i2p/crypto/CryptixAESEngine.java  | 23 +--------
 core/java/src/net/i2p/crypto/CryptoCheck.java | 47 +++++++++++++++++++
 .../net/i2p/router/tasks/CryptoChecker.java   | 25 +---------
 3 files changed, 50 insertions(+), 45 deletions(-)
 create mode 100644 core/java/src/net/i2p/crypto/CryptoCheck.java

diff --git a/core/java/src/net/i2p/crypto/CryptixAESEngine.java b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
index f7429c6d5..60eb63048 100644
--- a/core/java/src/net/i2p/crypto/CryptixAESEngine.java
+++ b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
@@ -44,28 +44,7 @@ public class CryptixAESEngine extends AESEngine {
     
     /** see test results below */
     private static final int MIN_SYSTEM_AES_LENGTH = 704;
-    private static final boolean USE_SYSTEM_AES;
-    static {
-        boolean systemOK = false;
-        if (hasAESNI()) {
-            try {
-                systemOK = Cipher.getMaxAllowedKeyLength("AES") >= 256;
-            } catch (GeneralSecurityException gse) {
-                // a NoSuchAlgorithmException
-            } catch (NoSuchMethodError nsme) {
-                // JamVM, gij
-                try {
-                    Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-                    SecretKeySpec key = new SecretKeySpec(new byte[32], "AES");
-                    cipher.init(Cipher.ENCRYPT_MODE, key);
-                    systemOK = true;
-                } catch (GeneralSecurityException gse) {
-                }
-            }
-        }
-        USE_SYSTEM_AES = systemOK;
-        //System.out.println("Using system AES? " + systemOK);
-    }
+    private static final boolean USE_SYSTEM_AES = hasAESNI() && CryptoCheck.isUnlimited();
 
     /**
      *  Do we have AES-NI support in the processor and JVM?
diff --git a/core/java/src/net/i2p/crypto/CryptoCheck.java b/core/java/src/net/i2p/crypto/CryptoCheck.java
new file mode 100644
index 000000000..31eac62dc
--- /dev/null
+++ b/core/java/src/net/i2p/crypto/CryptoCheck.java
@@ -0,0 +1,47 @@
+package net.i2p.crypto;
+
+import java.security.GeneralSecurityException;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+/** 
+ * Moved from CryptixAESEngine and net.i2p.router.tasks.CryptoChecker
+ *
+ * @since 0.9.23
+ */
+public class CryptoCheck {
+
+    private static final boolean _isUnlimited;
+
+    static {
+        boolean unlimited = false;
+        try {
+            unlimited = Cipher.getMaxAllowedKeyLength("AES") >= 256;
+        } catch (GeneralSecurityException gse) {
+            // a NoSuchAlgorithmException
+        } catch (NoSuchMethodError nsme) {
+            // JamVM, gij
+            try {
+                Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+                SecretKeySpec key = new SecretKeySpec(new byte[32], "AES");
+                cipher.init(Cipher.ENCRYPT_MODE, key);
+                unlimited = true;
+            } catch (GeneralSecurityException gse) {
+            }
+        }
+        _isUnlimited = unlimited;
+    }
+
+    private CryptoCheck() {}
+
+    /**
+     *  Do we have unlimited crypto?
+     */
+    public static boolean isUnlimited() {
+        return _isUnlimited;
+    }
+
+    public static void main(String args[]) {
+        System.out.println("Unlimited? " + isUnlimited());
+    }
+}
diff --git a/router/java/src/net/i2p/router/tasks/CryptoChecker.java b/router/java/src/net/i2p/router/tasks/CryptoChecker.java
index e022931ff..49bd84da5 100644
--- a/router/java/src/net/i2p/router/tasks/CryptoChecker.java
+++ b/router/java/src/net/i2p/router/tasks/CryptoChecker.java
@@ -5,6 +5,7 @@ import java.security.NoSuchAlgorithmException;
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 
+import net.i2p.crypto.CryptoCheck;
 import net.i2p.crypto.SigType;
 import net.i2p.router.RouterContext;
 import net.i2p.util.Log;
@@ -57,7 +58,7 @@ public class CryptoChecker {
                     log.logAlways(Log.WARN, s);
                 System.out.println(s);
             }
-            if (!isUnlimited()) {
+            if (!CryptoCheck.isUnlimited()) {
                 s = "Please consider installing the Java Cryptography Unlimited Strength Jurisdiction Policy Files from ";
                 //if (SystemVersion.isJava8())
                 //    s  += JRE8;
@@ -79,28 +80,6 @@ public class CryptoChecker {
         }
     }
 
-    /**
-     *  Copied from CryptixAESEngine
-     */
-    private static boolean isUnlimited() {
-        try {
-            if (Cipher.getMaxAllowedKeyLength("AES") < 256)
-                return false;
-        } catch (NoSuchAlgorithmException e) {
-            return false;
-        } catch (NoSuchMethodError e) {
-            // JamVM, gij
-            try {
-                Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-                SecretKeySpec key = new SecretKeySpec(new byte[32], "AES");
-                cipher.init(Cipher.ENCRYPT_MODE, key);
-            } catch (GeneralSecurityException gse) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     public static void main(String[] args) {
         warnUnavailableCrypto(null);
     }

From 4e6ddfcea3f3130701baafa5f812157ba8671f3e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 14:01:08 +0000
Subject: [PATCH 224/258] lint core

---
 core/java/src/net/i2p/I2PAppContext.java          |  4 +++-
 core/java/src/net/i2p/client/I2PSession.java      | 13 +++++++------
 .../net/i2p/client/impl/I2CPMessageProducer.java  |  2 +-
 .../src/net/i2p/client/impl/I2PSessionImpl2.java  | 15 ++++++++-------
 .../net/i2p/client/impl/I2PSessionMuxedImpl.java  |  9 +++++----
 .../src/net/i2p/client/naming/NamingService.java  |  2 +-
 core/java/src/net/i2p/data/SDSCache.java          |  3 +--
 core/java/src/net/i2p/util/PortMapper.java        |  2 +-
 core/java/src/net/i2p/util/SimpleTimer2.java      |  4 ++--
 9 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java
index b59a40586..bae357260 100644
--- a/core/java/src/net/i2p/I2PAppContext.java
+++ b/core/java/src/net/i2p/I2PAppContext.java
@@ -84,6 +84,7 @@ public class I2PAppContext {
     private RandomSource _random;
     private KeyGenerator _keyGenerator;
     protected KeyRing _keyRing; // overridden in RouterContext
+    @SuppressWarnings("deprecation")
     private SimpleScheduler _simpleScheduler;
     private SimpleTimer _simpleTimer;
     private SimpleTimer2 _simpleTimer2;
@@ -532,7 +533,7 @@ public class I2PAppContext {
      * @return set of Strings containing the names of defined system properties
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
-	public Set getPropertyNames() { 
+    public Set getPropertyNames() { 
         // clone to avoid ConcurrentModificationException
         Set names = new HashSet((Set) (Set) ((Properties) System.getProperties().clone()).keySet()); // TODO-Java6: s/keySet()/stringPropertyNames()/
         if (_overrideProps != null)
@@ -940,6 +941,7 @@ public class I2PAppContext {
      * @since 0.9 to replace static instance in the class
      * @deprecated in 0.9.20, use simpleTimer2()
      */
+    @SuppressWarnings("deprecation")
     public SimpleScheduler simpleScheduler() {
         if (!_simpleSchedulerInitialized)
             initializeSimpleScheduler();
diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java
index 458b9a892..818cb5983 100644
--- a/core/java/src/net/i2p/client/I2PSession.java
+++ b/core/java/src/net/i2p/client/I2PSession.java
@@ -18,6 +18,7 @@ import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.data.PrivateKey;
 import net.i2p.data.SessionKey;
+import net.i2p.data.SessionTag;
 import net.i2p.data.SigningPrivateKey;
 
 /**
@@ -98,7 +99,7 @@ public interface I2PSession {
      *                 objects that were sent along side the given keyUsed.
      * @return success
      */
-    public boolean sendMessage(Destination dest, byte[] payload, SessionKey keyUsed, Set tagsSent) throws I2PSessionException;
+    public boolean sendMessage(Destination dest, byte[] payload, SessionKey keyUsed, Set tagsSent) throws I2PSessionException;
 
     /**
      * End-to-End Crypto is disabled, tags and keys are ignored.
@@ -106,7 +107,7 @@ public interface I2PSession {
      * @param tagsSent UNUSED, IGNORED.
      * @return success
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent) throws I2PSessionException;
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent) throws I2PSessionException;
 
     /**
      * End-to-End Crypto is disabled, tags and keys are ignored.
@@ -116,7 +117,7 @@ public interface I2PSession {
      * @return success
      * @since 0.7.1
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire) throws I2PSessionException;
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire) throws I2PSessionException;
 
     /**
      * See I2PSessionMuxedImpl for proto/port details.
@@ -133,7 +134,7 @@ public interface I2PSession {
      * @return success
      * @since 0.7.1
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
                                int proto, int fromPort, int toPort) throws I2PSessionException;
 
     /**
@@ -152,7 +153,7 @@ public interface I2PSession {
      * @return success
      * @since 0.7.1
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
                                int proto, int fromPort, int toPort) throws I2PSessionException;
 
     /**
@@ -171,7 +172,7 @@ public interface I2PSession {
      * @return success
      * @since 0.8.4
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
                                int proto, int fromPort, int toPort, int flags) throws I2PSessionException;
 
     /**
diff --git a/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
index f44b897a3..bcdd0b4ea 100644
--- a/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
+++ b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
@@ -132,7 +132,7 @@ class I2CPMessageProducer {
      * @param newKey unused - no end-to-end crypto
      */
     public void sendMessage(I2PSessionImpl session, Destination dest, long nonce, byte[] payload, SessionTag tag,
-                            SessionKey key, Set tags, SessionKey newKey, long expires) throws I2PSessionException {
+                            SessionKey key, Set tags, SessionKey newKey, long expires) throws I2PSessionException {
         sendMessage(session, dest, nonce, payload, expires, 0);
     }
 
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
index 4eddcc30e..e110889be 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
@@ -29,6 +29,7 @@ import net.i2p.client.SendMessageStatusListener;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
+import net.i2p.data.SessionTag;
 import net.i2p.data.i2cp.MessageId;
 import net.i2p.data.i2cp.MessageStatusMessage;
 import net.i2p.util.Log;
@@ -210,17 +211,17 @@ class I2PSessionImpl2 extends I2PSessionImpl {
         throw new UnsupportedOperationException("Use MuxedImpl");
     }
     /** @throws UnsupportedOperationException always, use MuxedImpl */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
                                int proto, int fromport, int toport) throws I2PSessionException {
         throw new UnsupportedOperationException("Use MuxedImpl");
     }
     /** @throws UnsupportedOperationException always, use MuxedImpl */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
                                int proto, int fromport, int toport) throws I2PSessionException {
         throw new UnsupportedOperationException("Use MuxedImpl");
     }
     /** @throws UnsupportedOperationException always, use MuxedImpl */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expire,
                                int proto, int fromport, int toport, int flags) throws I2PSessionException {
         throw new UnsupportedOperationException("Use MuxedImpl");
     }
@@ -253,7 +254,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
      * @param tagsSent unused - no end-to-end crypto
      */
     @Override
-    public boolean sendMessage(Destination dest, byte[] payload, SessionKey keyUsed, Set tagsSent) throws I2PSessionException {
+    public boolean sendMessage(Destination dest, byte[] payload, SessionKey keyUsed, Set tagsSent) throws I2PSessionException {
         return sendMessage(dest, payload, 0, payload.length, keyUsed, tagsSent, 0);
     }
 
@@ -261,7 +262,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
      * @param keyUsed unused - no end-to-end crypto
      * @param tagsSent unused - no end-to-end crypto
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent)
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent)
                    throws I2PSessionException {
         return sendMessage(dest, payload, offset, size, keyUsed, tagsSent, 0);
     }
@@ -272,7 +273,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
      * @param keyUsed unused - no end-to-end crypto
      * @param tagsSent unused - no end-to-end crypto
      */
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expires)
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expires)
                    throws I2PSessionException {
         if (_log.shouldLog(Log.DEBUG)) _log.debug("sending message");
         synchronized (_stateLock) {
@@ -339,7 +340,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
      * @param keyUsed unused - no end-to-end crypto
      * @param tagsSent unused - no end-to-end crypto
      */
-    protected boolean sendBestEffort(Destination dest, byte payload[], SessionKey keyUsed, Set tagsSent, long expires)
+    protected boolean sendBestEffort(Destination dest, byte payload[], SessionKey keyUsed, Set tagsSent, long expires)
                     throws I2PSessionException {
         return sendBestEffort(dest, payload, expires, 0);
     }
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
index 46e551e49..6ee2b1e11 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
@@ -19,6 +19,7 @@ import net.i2p.client.SendMessageStatusListener;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SessionKey;
+import net.i2p.data.SessionTag;
 import net.i2p.data.i2cp.MessagePayloadMessage;
 import net.i2p.util.Log;
 
@@ -163,7 +164,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 {
      */
     @Override
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size,
-                               SessionKey keyUsed, Set tagsSent, long expires)
+                               SessionKey keyUsed, Set tagsSent, long expires)
                    throws I2PSessionException {
         return sendMessage(dest, payload, offset, size, keyUsed, tagsSent, 0, PROTO_UNSPECIFIED, PORT_UNSPECIFIED, PORT_UNSPECIFIED);
     }
@@ -173,7 +174,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 {
      * @param tagsSent unused - no end-to-end crypto
      */
     @Override
-    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
+    public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent,
                                int proto, int fromport, int toport) throws I2PSessionException {
         return sendMessage(dest, payload, offset, size, keyUsed, tagsSent, 0, proto, fromport, toport);
     }
@@ -192,7 +193,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 {
      */
     @Override
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size,
-                               SessionKey keyUsed, Set tagsSent, long expires,
+                               SessionKey keyUsed, Set tagsSent, long expires,
                                int proto, int fromPort, int toPort)
                    throws I2PSessionException {
         return sendMessage(dest, payload, offset, size, keyUsed, tagsSent, 0, proto, fromPort, toPort, 0);
@@ -213,7 +214,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 {
      */
     @Override
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size,
-                               SessionKey keyUsed, Set tagsSent, long expires,
+                               SessionKey keyUsed, Set tagsSent, long expires,
                                int proto, int fromPort, int toPort, int flags)
                    throws I2PSessionException {
         payload = prepPayload(payload, offset, size, proto, fromPort, toPort);
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index 5a38c9e7f..be9e598c2 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -536,7 +536,7 @@ public abstract class NamingService {
         String impl = context.getProperty(PROP_IMPL, DEFAULT_IMPL);
         try {
             Class cls = Class.forName(impl);
-            Constructor con = cls.getConstructor(new Class[] { I2PAppContext.class });
+            Constructor con = cls.getConstructor(I2PAppContext.class);
             instance = (NamingService)con.newInstance(new Object[] { context });
         } catch (Exception ex) {
             Log log = context.logManager().getLog(NamingService.class);
diff --git a/core/java/src/net/i2p/data/SDSCache.java b/core/java/src/net/i2p/data/SDSCache.java
index ab7768014..f38fe6bbf 100644
--- a/core/java/src/net/i2p/data/SDSCache.java
+++ b/core/java/src/net/i2p/data/SDSCache.java
@@ -46,7 +46,6 @@ import net.i2p.util.SystemVersion;
 public class SDSCache {
     //private static final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(SDSCache.class);
 
-    private static final Class[] conArg = new Class[] { byte[].class };
     private static final double MIN_FACTOR = 0.20;
     private static final double MAX_FACTOR = 5.0;
     private static final double FACTOR;
@@ -74,7 +73,7 @@ public class SDSCache {
         _cache = new LHMCache>(size);
         _datalen = len;
         try {
-            _rvCon = rvClass.getConstructor(conArg);
+            _rvCon = rvClass.getConstructor(byte[].class);
         } catch (NoSuchMethodException e) {
             throw new RuntimeException("SDSCache init error", e);
         }
diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java
index d32a4f5a5..e73399b19 100644
--- a/core/java/src/net/i2p/util/PortMapper.java
+++ b/core/java/src/net/i2p/util/PortMapper.java
@@ -111,7 +111,7 @@ public class PortMapper {
      *  @since 0.9.20
      */
     public void renderStatusHTML(Writer out) throws IOException {
-        List services = new ArrayList(_dir.keySet());
+        List services = new ArrayList(_dir.keySet());
         out.write("
                                    Port Mapper
                                    ServiceHostPort\n");
         Collections.sort(services);
         for (String s : services) {
diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index aff0b61f6..f2be24405 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -122,7 +122,7 @@ public class SimpleTimer2 {
         }
     }
 
-    private ScheduledFuture schedule(TimedEvent t, long timeoutMs) {
+    private ScheduledFuture schedule(TimedEvent t, long timeoutMs) {
         return _executor.schedule(t, timeoutMs, TimeUnit.MILLISECONDS);
     }
     
@@ -248,7 +248,7 @@ public class SimpleTimer2 {
         private final SimpleTimer2 _pool;
         private int _fuzz;
         protected static final int DEFAULT_FUZZ = 3;
-        private ScheduledFuture _future; // _executor.remove() doesn't work so we have to use this
+        private ScheduledFuture _future; // _executor.remove() doesn't work so we have to use this
                                          // ... and I expect cancelling this way is more efficient
 
         /** state of the current event.  All access should be under lock. */

From 9bddba56a0aec111b41d00f9380ee0b25e4ba8b9 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 14:38:02 +0000
Subject: [PATCH 225/258] lint router

---
 router/java/src/net/i2p/data/router/RouterInfo.java          | 2 +-
 router/java/src/net/i2p/data/router/SortHelper.java          | 5 ++---
 router/java/src/net/i2p/router/CommSystemFacade.java         | 2 +-
 router/java/src/net/i2p/router/Router.java                   | 2 ++
 .../java/src/net/i2p/router/startup/LoadClientAppsJob.java   | 4 ++--
 .../net/i2p/router/transport/OutboundMessageRegistry.java    | 4 ++++
 .../transport/udp/TimedWeightedPriorityMessageQueue.java     | 1 +
 .../java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java  | 1 +
 8 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java
index 24667108e..0d60c6dc0 100644
--- a/router/java/src/net/i2p/data/router/RouterInfo.java
+++ b/router/java/src/net/i2p/data/router/RouterInfo.java
@@ -339,7 +339,7 @@ public class RouterInfo extends DatabaseEntry {
                     // WARNING this sort algorithm cannot be changed, as it must be consistent
                     // network-wide. The signature is not checked at readin time, but only
                     // later, and the hashes are stored in a Set, not a List.
-                    peers = (Collection) SortHelper.sortStructures(peers);
+                    peers = SortHelper.sortStructures(peers);
                 for (Hash peerHash : peers) {
                     peerHash.writeBytes(out);
                 }
diff --git a/router/java/src/net/i2p/data/router/SortHelper.java b/router/java/src/net/i2p/data/router/SortHelper.java
index 0c40fa3ed..c7cea3c6f 100644
--- a/router/java/src/net/i2p/data/router/SortHelper.java
+++ b/router/java/src/net/i2p/data/router/SortHelper.java
@@ -31,12 +31,11 @@ class SortHelper {
      *  WARNING - this sort order must be consistent network-wide, so while the order is arbitrary,
      *  it cannot be changed.
      *  Why? Just because it has to be consistent so signing will work.
-     *  How to spec as returning the same type as the param?
      *  DEPRECATED - Only used by RouterInfo.
      *
      *  @return a new list
      */
-    public static List sortStructures(Collection dataStructures) {
+    public static  List sortStructures(Collection dataStructures) {
         if (dataStructures == null) return Collections.emptyList();
 
         // This used to use Hash.toString(), which is insane, since a change to toString()
@@ -52,7 +51,7 @@ class SortHelper {
         //for (DataStructure struct : tm.values()) {
         //    rv.add(struct);
         //}
-        ArrayList rv = new ArrayList(dataStructures);
+        ArrayList rv = new ArrayList(dataStructures);
         sortStructureList(rv);
         return rv;
     }
diff --git a/router/java/src/net/i2p/router/CommSystemFacade.java b/router/java/src/net/i2p/router/CommSystemFacade.java
index e9c050762..2b96255b9 100644
--- a/router/java/src/net/i2p/router/CommSystemFacade.java
+++ b/router/java/src/net/i2p/router/CommSystemFacade.java
@@ -48,7 +48,7 @@ public abstract class CommSystemFacade implements Service {
     public boolean haveInboundCapacity(int pct) { return true; }
     public boolean haveOutboundCapacity(int pct) { return true; }
     public boolean haveHighOutboundCapacity() { return true; }
-    public List getMostRecentErrorMessages() { return Collections.emptyList(); }
+    public List getMostRecentErrorMessages() { return Collections.emptyList(); }
     
     /**
      * Median clock skew of connected peers in seconds, or null if we cannot answer.
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 0bad3eced..260115d45 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -611,6 +611,7 @@ public class Router implements RouterClock.ClockShiftListener {
      * This is synchronized with saveConfig().
      * Not for external use.
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public void readConfig() {
         synchronized(_configFileLock) {
             String f = getConfigFilename();
@@ -1391,6 +1392,7 @@ public class Router implements RouterClock.ClockShiftListener {
      * @return success
      * @since 0.8.13
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public boolean saveConfig(Map toAdd, Collection toRemove) {
         synchronized(_configFileLock) {
             if (toAdd != null)
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index 3fbfc381f..05969ec03 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -207,7 +207,7 @@ public class LoadClientAppsJob extends JobImpl {
         if (args == null)
             args = new String[0];
         Class cls = Class.forName(className, true, cl);
-        Method method = cls.getMethod("main", new Class[] { String[].class });
+        Method method = cls.getMethod("main", String[].class);
         method.invoke(cls, new Object[] { args });
     }
 
@@ -287,7 +287,7 @@ public class LoadClientAppsJob extends JobImpl {
                     ClientApp app = (ClientApp) con.newInstance(conArgs);
                     mgr.addAndStart(app, _args);
                 } else {
-                    Method method = cls.getMethod("main", new Class[] { String[].class });
+                    Method method = cls.getMethod("main", String[].class);
                     method.invoke(cls, new Object[] { _args });
                 }
             } catch (Throwable t) {
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index 012107e6c..7c8e1b37d 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -96,6 +96,7 @@ public class OutboundMessageRegistry {
      * @return non-null List of OutNetMessage describing messages that were waiting for 
      *         the payload
      */
+    @SuppressWarnings("unchecked")
     public List getOriginalMessages(I2NPMessage message) {
         List matchedSelectors = null;
         List removedSelectors = null;
@@ -193,6 +194,7 @@ public class OutboundMessageRegistry {
     /**
      *  @param allowEmpty is msg.getMessage() allowed to be null?
      */
+    @SuppressWarnings("unchecked")
     private void registerPending(OutNetMessage msg, boolean allowEmpty) {
         if ( (!allowEmpty) && (msg.getMessage() == null) )
                 throw new IllegalArgumentException("OutNetMessage doesn't contain an I2NPMessage? Impossible?");
@@ -229,6 +231,7 @@ public class OutboundMessageRegistry {
     /**
      *  @param msg may be be null
      */
+    @SuppressWarnings("unchecked")
     public void unregisterPending(OutNetMessage msg) {
         if (msg == null) return;
         MessageSelector sel = msg.getReplySelector();
@@ -262,6 +265,7 @@ public class OutboundMessageRegistry {
             _nextExpire = -1;
         }
 
+        @SuppressWarnings("unchecked")
         public void timeReached() {
             long now = _context.clock().now();
             List removing = new ArrayList(8);
diff --git a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
index 193c1751f..c6dbdb8e2 100644
--- a/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
+++ b/router/java/src/net/i2p/router/transport/udp/TimedWeightedPriorityMessageQueue.java
@@ -57,6 +57,7 @@ class TimedWeightedPriorityMessageQueue implements MessageQueue, OutboundMessage
      *                  specifically, this means how many messages in this queue
      *                  should be pulled off in a row before moving on to the next.
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public TimedWeightedPriorityMessageQueue(RouterContext ctx, int[] priorityLimits, int[] weighting, FailedListener lsnr) {
         _context = ctx;
         _log = ctx.logManager().getLog(TimedWeightedPriorityMessageQueue.class);
diff --git a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
index 614c7faab..4f1f82d87 100644
--- a/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
+++ b/router/java/src/net/i2p/router/tunnel/PumpedTunnelGateway.java
@@ -58,6 +58,7 @@ class PumpedTunnelGateway extends TunnelGateway {
      * @param receiver this receives the encrypted message and forwards it off 
      *                 to the first hop
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public PumpedTunnelGateway(RouterContext context, QueuePreprocessor preprocessor,
                                Sender sender, Receiver receiver, TunnelGatewayPumper pumper) {
         super(context, preprocessor, sender, receiver);

From 5f175455c7dd839b6bb110ac6b4424cedbfb4fd4 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 15:47:49 +0000
Subject: [PATCH 226/258] lint console,streaming

---
 .../i2p/client/streaming/I2PSocketManagerFactory.java    | 6 +++---
 .../java/src/net/i2p/router/news/NewsManager.java        | 2 +-
 .../src/net/i2p/router/web/ConfigLoggingHandler.java     | 4 +++-
 .../java/src/net/i2p/router/web/FormHandler.java         | 2 ++
 .../java/src/net/i2p/router/web/LocaleWebAppHandler.java | 5 +++--
 .../java/src/net/i2p/router/web/PluginStarter.java       | 9 ++++++---
 .../java/src/net/i2p/router/web/TunnelRenderer.java      | 6 ++++--
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
index 863c5d31a..91c18cfe4 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
@@ -256,9 +256,9 @@ public class I2PSocketManagerFactory {
             Class cls = Class.forName(classname);
             if (!I2PSocketManager.class.isAssignableFrom(cls))
                 throw new IllegalArgumentException(classname + " is not an I2PSocketManager");
-            Constructor con = (Constructor)
-                  cls.getConstructor(new Class[] {I2PAppContext.class, I2PSession.class, Properties.class, String.class});
-            I2PSocketManager mgr = con.newInstance(new Object[] {context, session, opts, name});
+            Constructor con =
+                  cls.getConstructor(I2PAppContext.class, I2PSession.class, Properties.class, String.class);
+            I2PSocketManager mgr = (I2PSocketManager) con.newInstance(new Object[] {context, session, opts, name});
             return mgr;
         } catch (Throwable t) {
             getLog().log(Log.CRIT, "Error loading " + classname, t);
diff --git a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java
index 9f21bf93c..d85baadf5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java
@@ -64,7 +64,7 @@ public class NewsManager implements RouterApp {
      */
     public synchronized List getEntries() {
         if (!_currentNews.isEmpty())
-            return new ArrayList(_currentNews);
+            return new ArrayList(_currentNews);
         // load old news.xml
         if (_log.shouldWarn())
             _log.warn("no real XML, falling back to news.xml");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
index e902e9c72..5c65011a0 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHandler.java
@@ -4,6 +4,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import net.i2p.util.LogManager;
+
 /**
  * Handler to deal with form submissions from the logging config form and act
  * upon the values.
@@ -113,7 +115,7 @@ public class ConfigLoggingHandler extends FormHandler {
         }
         
         if (_fileSize != null) {
-            int newBytes = _context.logManager().getFileSize(_fileSize);
+            int newBytes = LogManager.getFileSize(_fileSize);
             int oldBytes = _context.logManager().getFileSize();
             if (newBytes > 0) {
                 if (oldBytes != newBytes) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
index 1b2dabb3a..d4bd1d2ff 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/FormHandler.java
@@ -23,6 +23,7 @@ public abstract class FormHandler {
     protected RouterContext _context;
     protected Log _log;
     /** Not for multipart/form-data, will be null */
+    @SuppressWarnings("rawtypes")
     protected Map _settings;
     /** Only for multipart/form-data. Warning, parameters are NOT XSS filtered */
     protected RequestWrapper _requestWrapper;
@@ -63,6 +64,7 @@ public abstract class FormHandler {
      *
      * @since 0.9.4 consolidated from numerous FormHandlers
      */
+    @SuppressWarnings({"rawtypes", "unchecked"})
     public void setSettings(Map settings) { _settings = new HashMap(settings); }
 
     /**
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
index 74ce11a19..1343a88cd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java
@@ -83,6 +83,7 @@ public class LocaleWebAppHandler extends HandlerWrapper
                 if (lang != null && lang.length() > 0 && !lang.equals("en")) {
                     String testPath = pathInContext.substring(0, len - 4) + '_' + lang + ".jsp";
                     // Do we have a servlet for the new path that isn't the catchall *.jsp?
+                    @SuppressWarnings("rawtypes")
                     Map.Entry servlet = _wac.getServletHandler().getHolderEntry(testPath);
                     if (servlet != null) {
                         String servletPath = (String) servlet.getKey();
@@ -130,7 +131,7 @@ public class LocaleWebAppHandler extends HandlerWrapper
     /**
      *  Mysteriously removed from Jetty 7
      */
-    private void setInitParams(Map params) {
+    private void setInitParams(Map params) {
         setInitParams(_wac, params);
     }
 
@@ -138,7 +139,7 @@ public class LocaleWebAppHandler extends HandlerWrapper
      *  @since Jetty 7
      */
     public static void setInitParams(WebAppContext context, Map params) {
-        for (Map.Entry e : params.entrySet()) {
+        for (Map.Entry e : params.entrySet()) {
             context.setInitParameter((String)e.getKey(), (String)e.getValue());
         }
     }
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
index 608de2aea..386eb664e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
@@ -264,6 +264,7 @@ public class PluginStarter implements Runnable {
      *  @return true on success
      *  @throws just about anything, caller would be wise to catch Throwable
      */
+    @SuppressWarnings("deprecation")
     public static boolean startPlugin(RouterContext ctx, String appName) throws Exception {
         Log log = ctx.logManager().getLog(PluginStarter.class);
         File pluginDir = new File(ctx.getConfigDir(), PLUGIN_DIR + '/' + appName);
@@ -344,9 +345,11 @@ public class PluginStarter implements Runnable {
         if (tfiles != null) {
             for (int i = 0; i < tfiles.length; i++) {
                 String name = tfiles[i].getName();
-                if (tfiles[i].isDirectory() && (!Arrays.asList(STANDARD_THEMES).contains(tfiles[i])))
+                if (tfiles[i].isDirectory() && (!Arrays.asList(STANDARD_THEMES).contains(tfiles[i]))) {
+                    // deprecated
                     ctx.router().setConfigSetting(ConfigUIHelper.PROP_THEME_PFX + name, tfiles[i].getAbsolutePath());
                     // we don't need to save
+                }
             }
         }
 
@@ -543,7 +546,7 @@ public class PluginStarter implements Runnable {
 
         boolean deleted = FileUtil.rmdir(pluginDir, false);
         Properties props = pluginProperties();
-        for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+        for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
             String name = (String)iter.next();
             if (name.startsWith(PREFIX + appName + '.'))
                 iter.remove();
@@ -973,7 +976,7 @@ public class PluginStarter implements Runnable {
     private static void addPath(URL u) throws Exception {
         URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
         Class urlClass = URLClassLoader.class;
-        Method method = urlClass.getDeclaredMethod("addURL", new Class[]{URL.class});
+        Method method = urlClass.getDeclaredMethod("addURL", URL.class);
         method.setAccessible(true);
         method.invoke(urlClassLoader, new Object[]{u});
     }
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 aab84c630..a761a5ac2 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
@@ -212,14 +212,16 @@ public class TunnelRenderer {
         }
         out.write("
                                    \n");
         if (in != null) {
-            List pending = in.listPending();
+            // PooledTunnelCreatorConfig
+            List pending = in.listPending();
             if (!pending.isEmpty()) {
                 out.write("
                                    " + _t("Build in progress") + ": " + pending.size() + " " + _t("inbound") + "
                                    \n");
                 live += pending.size();
             }
         }
         if (outPool != null) {
-            List pending = outPool.listPending();
+            // PooledTunnelCreatorConfig
+            List pending = outPool.listPending();
             if (!pending.isEmpty()) {
                 out.write("
                                    " + _t("Build in progress") + ": " + pending.size() + " " + _t("outbound") + "
                                    \n");
                 live += pending.size();

From 71bc55b470bf66102788c6cb70b29c58da44a1a3 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 16:49:37 +0000
Subject: [PATCH 227/258] lint core, i2psnark, jetty, susimail

---
 .../java/src/org/klomp/snark/I2PSnarkUtil.java      |  1 +
 .../java/src/org/klomp/snark/SnarkManager.java      |  2 +-
 .../java/src/org/klomp/snark/dht/DHTTracker.java    |  1 +
 .../i2psnark/java/src/org/klomp/snark/dht/KRPC.java |  4 ++++
 apps/jetty/java/src/net/i2p/jetty/JettyStart.java   |  1 +
 .../net/i2p/servlet/filters/XSSRequestWrapper.java  |  1 +
 .../src/org/mortbay/servlet/MultiPartRequest.java   |  1 +
 .../java/src/org/mortbay/util/ByteArrayPool.java    | 13 +++++++------
 .../src/src/i2p/susi/webmail/MailCache.java         |  2 ++
 apps/susimail/src/src/i2p/susi/webmail/WebMail.java |  6 +++---
 .../net/i2p/client/naming/MetaNamingService.java    |  4 ++--
 .../src/net/i2p/client/naming/NamingService.java    |  2 +-
 core/java/src/net/i2p/crypto/CryptoConstants.java   |  4 ++--
 core/java/src/net/i2p/crypto/ECConstants.java       |  4 ++--
 core/java/src/net/i2p/data/ByteArray.java           |  7 +++----
 core/java/src/net/i2p/util/FileUtil.java            | 10 +++++-----
 16 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
index e75ef301e..96f380435 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
@@ -136,6 +136,7 @@ public class I2PSnarkUtil {
     
     public boolean configured() { return _configured; }
     
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void setI2CPConfig(String i2cpHost, int i2cpPort, Map opts) {
         if (i2cpHost != null)
             _i2cpHost = i2cpHost;
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index bb1684e5f..03d4b8dc0 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -2191,7 +2191,7 @@ public class SnarkManager implements CompleteListener {
      */
     private void addMagnets() {
         boolean changed = false;
-        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
+        for (Iterator iter = _config.keySet().iterator(); iter.hasNext(); ) {
             String k = (String) iter.next();
             if (k.startsWith(PROP_META_MAGNET_PREFIX)) {
                 String b64 = k.substring(PROP_META_MAGNET_PREFIX.length());
diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java
index 3b7b1d99c..784d8e6bf 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/DHTTracker.java
@@ -106,6 +106,7 @@ class DHTTracker {
      *  @param noSeeds true if we do not want seeds in the result
      *  @return list or empty list (never null)
      */
+    @SuppressWarnings({"unchecked", "rawtypes"})
     List getPeers(InfoHash ih, int max, boolean noSeeds) {
         Peers peers = _torrents.get(ih);
         if (peers == null || max <= 0)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
index 58e0f39fc..0e6da1c22 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/dht/KRPC.java
@@ -243,6 +243,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
      *  @param maxWait how long to wait for each to reply (not total) must be > 0
      *  @param parallel how many outstanding at once (unimplemented, always 1)
      */
+    @SuppressWarnings("unchecked")
     private void explore(NID target, int maxNodes, long maxWait, int parallel) {
         List nodes = _knownNodes.findClosest(target, maxNodes);
         if (nodes.isEmpty()) {
@@ -327,6 +328,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
      *  @param noSeeds true if we do not want seeds in the result
      *  @return possibly empty (never null)
      */
+    @SuppressWarnings("unchecked")
     public Collection getPeersAndAnnounce(byte[] ih, int max, long maxWait,
                                                 int annMax, long annMaxWait,
                                                 boolean isSeed, boolean noSeeds) {
@@ -858,6 +860,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
      *  @param repliable true for all but announce
      *  @return null on error
      */
+    @SuppressWarnings("unchecked")
     private ReplyWaiter sendQuery(NodeInfo nInfo, Map map, boolean repliable) {
         if (nInfo.equals(_myNodeInfo))
             throw new IllegalArgumentException("wtf don't send to ourselves");
@@ -907,6 +910,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
      * @param toPort the query port, we will increment here
      *  @return success
      */
+    @SuppressWarnings("unchecked")
     private boolean sendResponse(NodeInfo nInfo, MsgID msgID, Map map) {
         if (nInfo.equals(_myNodeInfo))
             throw new IllegalArgumentException("wtf don't send to ourselves");
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index 6cac1cbae..c5f9e2aaf 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -72,6 +72,7 @@ public class JettyStart implements ClientApp {
     /**
      *  Modified from XmlConfiguration.main()
      */
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public void parseArgs(String[] args) throws Exception {
         Properties properties=new Properties();
         XmlConfiguration last=null;
diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
index b8b8d3991..54975964b 100644
--- a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
+++ b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
@@ -84,6 +84,7 @@ public class XSSRequestWrapper extends HttpServletRequestWrapper {
      *  Parameter names starting with "nofilter_" will not be filtered.
      */
     @Override
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public Map getParameterMap() {
         Map rv = new HashMap();
         for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) {
diff --git a/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
index 1c964b8f1..1cc3973fd 100644
--- a/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
+++ b/apps/jetty/java/src/org/mortbay/servlet/MultiPartRequest.java
@@ -219,6 +219,7 @@ public class MultiPartRequest
     }
 
     /* ------------------------------------------------------------ */
+    @SuppressWarnings("rawtypes")
     public Hashtable[] getMultipleParams(String name) 
     {
         List parts = _partMap.getValues(name);
diff --git a/apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java b/apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java
index 9a3f088fb..0c98dded1 100644
--- a/apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java
+++ b/apps/jetty/java/src/org/mortbay/util/ByteArrayPool.java
@@ -29,7 +29,7 @@ public class ByteArrayPool
     public static final int __POOL_SIZE=
         Integer.getInteger("org.mortbay.util.ByteArrayPool.pool_size",8).intValue();
     
-    public static final ThreadLocal __pools=new BAThreadLocal();
+    public static final ThreadLocal __pools = new BAThreadLocal();
     public static final AtomicInteger __slot = new AtomicInteger();
     
     /* ------------------------------------------------------------ */
@@ -39,7 +39,7 @@ public class ByteArrayPool
      */
     public static byte[] getByteArray(int size)
     {
-        byte[][] pool = (byte[][])__pools.get();
+        byte[][] pool = __pools.get();
         boolean full=true;
         for (int i=pool.length;i-->0;)
         {
@@ -63,7 +63,7 @@ public class ByteArrayPool
     /* ------------------------------------------------------------ */
     public static byte[] getByteArrayAtLeast(int minSize)
     {
-        byte[][] pool = (byte[][])__pools.get();
+        byte[][] pool = __pools.get();
         for (int i=pool.length;i-->0;)
         {
             if (pool[i]!=null && pool[i].length>=minSize)
@@ -84,7 +84,7 @@ public class ByteArrayPool
         if (b==null)
             return;
         
-        byte[][] pool = (byte[][])__pools.get();
+        byte[][] pool = __pools.get();
         for (int i=pool.length;i-->0;)
         {
             if (pool[i]==null)
@@ -103,9 +103,10 @@ public class ByteArrayPool
     
     /* ------------------------------------------------------------ */
     /* ------------------------------------------------------------ */
-    private static final class BAThreadLocal extends ThreadLocal
+    private static final class BAThreadLocal extends ThreadLocal
     {
-        protected Object initialValue()
+        @Override
+        protected byte[][] initialValue()
             {
                 return new byte[__POOL_SIZE][];
             }
diff --git a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
index 45aa601b8..278a4e120 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/MailCache.java
@@ -109,6 +109,7 @@ class MailCache {
 	 * @param mode CACHE_ONLY to not pull from pop server
 	 * @return An e-mail or null
 	 */
+        @SuppressWarnings({"unchecked", "rawtypes"})
 	public Mail getMail(String uidl, FetchMode mode) {
 		
 		Mail mail = null, newMail = null;
@@ -163,6 +164,7 @@ class MailCache {
 	 * @return true if any were fetched
 	 * @since 0.9.13
 	 */
+        @SuppressWarnings({"unchecked", "rawtypes"})
 	public boolean getMail(FetchMode mode) {
 		if (mode == FetchMode.CACHE_ONLY)
 			throw new IllegalArgumentException();
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index 5f6975bc5..9ff4b933b 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -288,7 +288,7 @@ public class WebMail extends HttpServlet
 	 */
 	private static class SenderSorter extends SorterBase {
 
-		private final Comparator collator = Collator.getInstance();
+		private final Comparator collator = Collator.getInstance();
 
 		public SenderSorter( MailCache mailCache )
 		{
@@ -307,7 +307,7 @@ public class WebMail extends HttpServlet
 	 * @author susi
 	 */
 	private static class SubjectSorter extends SorterBase {
-		private final Comparator collator = Collator.getInstance();
+		private final Comparator collator = Collator.getInstance();
 
 		public SubjectSorter( MailCache mailCache )
 		{
@@ -2299,7 +2299,7 @@ public class WebMail extends HttpServlet
 	/**
 	 *  first prev next last
 	 */
-	private static void showPageButtons(PrintWriter out, Folder folder) {
+	private static void showPageButtons(PrintWriter out, Folder folder) {
 		out.println(
 			"
                                    " +
 			( folder.isFirstPage() ?
diff --git a/core/java/src/net/i2p/client/naming/MetaNamingService.java b/core/java/src/net/i2p/client/naming/MetaNamingService.java
index ffae355a5..5a4ebd275 100644
--- a/core/java/src/net/i2p/client/naming/MetaNamingService.java
+++ b/core/java/src/net/i2p/client/naming/MetaNamingService.java
@@ -41,8 +41,8 @@ public class MetaNamingService extends DummyNamingService {
         while (tok.hasMoreTokens()) {
             try {
                 Class cls = Class.forName(tok.nextToken());
-                Constructor con = cls.getConstructor(new Class[] { I2PAppContext.class });
-                addNamingService((NamingService)con.newInstance(new Object[] { context }), false);
+                Constructor con = cls.getConstructor(I2PAppContext.class);
+                addNamingService((NamingService)con.newInstance(), false);
             } catch (Exception ex) {
             }
         }
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index be9e598c2..78e04232d 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -537,7 +537,7 @@ public abstract class NamingService {
         try {
             Class cls = Class.forName(impl);
             Constructor con = cls.getConstructor(I2PAppContext.class);
-            instance = (NamingService)con.newInstance(new Object[] { context });
+            instance = (NamingService)con.newInstance(context);
         } catch (Exception ex) {
             Log log = context.logManager().getLog(NamingService.class);
             // Blockfile may throw RuntimeException but HostsTxt won't
diff --git a/core/java/src/net/i2p/crypto/CryptoConstants.java b/core/java/src/net/i2p/crypto/CryptoConstants.java
index 94facd366..b9e0327dd 100644
--- a/core/java/src/net/i2p/crypto/CryptoConstants.java
+++ b/core/java/src/net/i2p/crypto/CryptoConstants.java
@@ -92,8 +92,8 @@ public class CryptoConstants {
         if (ECConstants.isBCAvailable()) {
             try {
                 Class cls = Class.forName("org.bouncycastle.jce.spec.ElGamalParameterSpec");
-                Constructor con = cls.getConstructor(new Class[] {BigInteger.class, BigInteger.class});
-                spec = (AlgorithmParameterSpec)con.newInstance(new Object[] {elgp, elgg});
+                Constructor con = cls.getConstructor(BigInteger.class, BigInteger.class);
+                spec = (AlgorithmParameterSpec)con.newInstance(elgp, elgg);
                 //System.out.println("BC ElG spec loaded");
             } catch (Exception e) {
                 //System.out.println("BC ElG spec failed");
diff --git a/core/java/src/net/i2p/crypto/ECConstants.java b/core/java/src/net/i2p/crypto/ECConstants.java
index affe6e4e8..d9b111e23 100644
--- a/core/java/src/net/i2p/crypto/ECConstants.java
+++ b/core/java/src/net/i2p/crypto/ECConstants.java
@@ -42,8 +42,8 @@ class ECConstants {
         if (Security.getProvider("BC") == null) {
             try {
                 Class cls = Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider");
-                Constructor con = cls.getConstructor(new Class[0]);
-                Provider bc = (Provider)con.newInstance(new Object[0]);
+                Constructor con = cls.getConstructor();
+                Provider bc = (Provider)con.newInstance();
                 Security.addProvider(bc);
                 log("Added BC provider");
                 loaded = true;
diff --git a/core/java/src/net/i2p/data/ByteArray.java b/core/java/src/net/i2p/data/ByteArray.java
index 1801b122e..50670c760 100644
--- a/core/java/src/net/i2p/data/ByteArray.java
+++ b/core/java/src/net/i2p/data/ByteArray.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
  * maps, and the like.
  *
  */
-public class ByteArray implements Serializable, Comparable {
+public class ByteArray implements Serializable, Comparable {
     private byte[] _data;
     private int _valid;
     private int _offset;
@@ -85,9 +85,8 @@ public class ByteArray implements Serializable, Comparable {
         return (llen == rlen) && DataHelper.eq(lhs, loff, rhs, roff, llen);
     }
     
-    public final int compareTo(Object obj) {
-        if (obj.getClass() != getClass()) throw new ClassCastException("invalid object: " + obj);
-        return DataHelper.compareTo(_data, ((ByteArray)obj).getData());
+    public final int compareTo(ByteArray ba) {
+        return DataHelper.compareTo(_data, ba.getData());
     }
     
     @Override
diff --git a/core/java/src/net/i2p/util/FileUtil.java b/core/java/src/net/i2p/util/FileUtil.java
index eeca4416f..296030818 100644
--- a/core/java/src/net/i2p/util/FileUtil.java
+++ b/core/java/src/net/i2p/util/FileUtil.java
@@ -300,9 +300,9 @@ public class FileUtil {
         if (!_failedOracle) {
             try {
                 Class p200 = Class.forName("java.util.jar.Pack200", true, ClassLoader.getSystemClassLoader());
-                Method newUnpacker = p200.getMethod("newUnpacker", (Class[]) null);
+                Method newUnpacker = p200.getMethod("newUnpacker");
                 Object unpacker = newUnpacker.invoke(null,(Object[])  null);
-                Method unpack = unpacker.getClass().getMethod("unpack", new Class[] {InputStream.class, JarOutputStream.class});
+                Method unpack = unpacker.getClass().getMethod("unpack", InputStream.class, JarOutputStream.class);
                 // throws IOException
                 unpack.invoke(unpacker, new Object[] {in, out});
                 return;
@@ -321,9 +321,9 @@ public class FileUtil {
         if (!_failedApache) {
             try {
                 Class p200 = Class.forName("org.apache.harmony.unpack200.Archive", true, ClassLoader.getSystemClassLoader());
-                Constructor newUnpacker = p200.getConstructor(new Class[] {InputStream.class, JarOutputStream.class});
-                Object unpacker = newUnpacker.newInstance(new Object[] {in, out});
-                Method unpack = unpacker.getClass().getMethod("unpack", (Class[]) null);
+                Constructor newUnpacker = p200.getConstructor(InputStream.class, JarOutputStream.class);
+                Object unpacker = newUnpacker.newInstance(in, out);
+                Method unpack = unpacker.getClass().getMethod("unpack");
                 // throws IOException or Pack200Exception
                 unpack.invoke(unpacker, (Object[]) null);
                 return;

From abc0f4c720278294b3d95998c726d6b61db1a713 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 17:38:57 +0000
Subject: [PATCH 228/258] lint core, console, i2ptunnel, jetty

---
 apps/i2ptunnel/jsp/editClient.jsp             |  2 +-
 apps/i2ptunnel/jsp/editServer.jsp             |  2 +-
 apps/i2ptunnel/jsp/index.jsp                  | 23 ++++++++++---------
 apps/i2ptunnel/jsp/wizard.jsp                 |  2 +-
 .../servlet/filters/XSSRequestWrapper.java    |  9 ++++----
 apps/routerconsole/jsp/configui.jsp           |  2 +-
 apps/routerconsole/jsp/console.jsp            |  2 +-
 apps/routerconsole/jsp/css.jsi                |  2 +-
 apps/routerconsole/jsp/home.jsp               |  2 +-
 apps/routerconsole/jsp/summaryframe.jsp       |  2 +-
 .../java/src/net/i2p/kademlia/KBucketSet.java |  1 +
 11 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 5fbc62dd4..3ac7d5454 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -56,7 +56,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                   %>
                                    <%=intl._t("New proxy settings")%>
                                    <% 
                 } %>
                 
-                
+                
                 
                 <%
                 // these are four keys that are generated automatically on first save,
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 4a0a7eabf..ac3eb48e3 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -56,7 +56,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                   %>
                                    <%=intl._t("New server settings")%>
                                    <% 
                 } %>
                 
-                
+                
                 
                 <%
                 // these are four keys that are generated automatically on first save,
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index da05b233a..9e2c06492 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -60,6 +60,7 @@
 <%
 
   if (indexBean.isInitialized()) {
+      String nextNonce = net.i2p.i2ptunnel.web.IndexBean.getNextNonce();
 
 %>
     
                                    
@@ -67,12 +68,12 @@
         
                                    
             
                                    
                 <%=intl._t("Tunnel Wizard")%>
-                <%=intl._t("Stop All")%>
-                <%=intl._t("Start All")%>
-                <%=intl._t("Restart All")%>
+                <%=intl._t("Stop All")%>
+                <%=intl._t("Start All")%>
+                <%=intl._t("Restart All")%>
 <%--
                 //this is really bad because it stops and restarts all tunnels, which is probably not what you want
-                <%=intl._t("Reload Config")%>
+                <%=intl._t("Reload Config")%>
 --%>
             
                                    
         
                                     
@@ -152,17 +153,17 @@
             switch (indexBean.getTunnelStatus(curServer)) {
                 case IndexBean.STARTING:
           %>
                                    <%=intl._t("Starting...")%>
                                        
-            <%=intl._t("Stop")%>
+            <%=intl._t("Stop")%>
         <%
                 break;
                 case IndexBean.RUNNING:
           %>
                                    <%=intl._t("Running")%>
                                        
-            <%=intl._t("Stop")%>
+            <%=intl._t("Stop")%>
         <%
                 break;
                 case IndexBean.NOT_RUNNING:
           %>
                                    <%=intl._t("Stopped")%>
                                        
-            <%=intl._t("Start")%>
+            <%=intl._t("Start")%>
         <%
                 break;
             }
@@ -275,22 +276,22 @@
             switch (indexBean.getTunnelStatus(curClient)) {
                 case IndexBean.STARTING:
           %>
                                    <%=intl._t("Starting...")%>
                                    
-            <%=intl._t("Stop")%>
+            <%=intl._t("Stop")%>
         <%
                 break;
                 case IndexBean.STANDBY:
           %>
                                    <%=intl._t("Standby")%>
                                    
-            <%=intl._t("Stop")%>
+            <%=intl._t("Stop")%>
         <%
                 break;
                 case IndexBean.RUNNING:
           %>
                                    <%=intl._t("Running")%>
                                    
-            <%=intl._t("Stop")%>
+            <%=intl._t("Stop")%>
         <%
                 break;
                 case IndexBean.NOT_RUNNING:
           %>
                                    <%=intl._t("Stopped")%>
                                    
-            <%=intl._t("Start")%>
+            <%=intl._t("Start")%>
         <%
                 break;
             }
diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
index 6541ffc17..fefd8a877 100644
--- a/apps/i2ptunnel/jsp/wizard.jsp
+++ b/apps/i2ptunnel/jsp/wizard.jsp
@@ -92,7 +92,7 @@
                 } %>
                 
                 
-                
+                
             
                                    
 
             
                                    
diff --git a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
index 54975964b..8d16e5953 100644
--- a/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
+++ b/apps/jetty/java/src/net/i2p/servlet/filters/XSSRequestWrapper.java
@@ -84,11 +84,10 @@ public class XSSRequestWrapper extends HttpServletRequestWrapper {
      *  Parameter names starting with "nofilter_" will not be filtered.
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public Map getParameterMap() {
-        Map rv = new HashMap();
-        for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) {
-             String k = (String) keys.nextElement();
+    public Map getParameterMap() {
+        Map rv = new HashMap();
+        for (Enumeration keys = getParameterNames(); keys.hasMoreElements(); ) {
+             String k = keys.nextElement();
              String[] v = getParameterValues(k);
              if (v != null)
                  rv.put(k, v);
diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp
index 73d0ec565..96f7bf84c 100644
--- a/apps/routerconsole/jsp/configui.jsp
+++ b/apps/routerconsole/jsp/configui.jsp
@@ -31,7 +31,7 @@ input.default {
 <%@include file="formhandler.jsi" %>
 
                                    <%=uihelper._t("Router Console Theme")%>
                                    
  
                                    
- 
+ 
  
  
 <%
diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp
index 1cff1e369..c61025795 100644
--- a/apps/routerconsole/jsp/console.jsp
+++ b/apps/routerconsole/jsp/console.jsp
@@ -10,7 +10,7 @@
 <%@include file="summaryajax.jsi" %>
 
 <%
-    String consoleNonce = intl.getNonce();
+    String consoleNonce = net.i2p.router.web.CSSHelper.getNonce();
 %>
 
 <%@include file="summary.jsi" %>
diff --git a/apps/routerconsole/jsp/css.jsi b/apps/routerconsole/jsp/css.jsi
index 50c70d875..edae86240 100644
--- a/apps/routerconsole/jsp/css.jsi
+++ b/apps/routerconsole/jsp/css.jsi
@@ -37,7 +37,7 @@
    }
 
    String conNonceParam = request.getParameter("consoleNonce");
-   if (intl.getNonce().equals(conNonceParam)) {
+   if (net.i2p.router.web.CSSHelper.getNonce().equals(conNonceParam)) {
        intl.setLang(request.getParameter("lang"));
        intl.setNews(request.getParameter("news"));
    }
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index ec00c6b08..eb9887e97 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -8,7 +8,7 @@
 <%@include file="summaryajax.jsi" %>
 
 <%
-    String consoleNonce = intl.getNonce();
+    String consoleNonce = net.i2p.router.web.CSSHelper.getNonce();
 %>
 
 " />
diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp
index 3107bb96a..290e37043 100644
--- a/apps/routerconsole/jsp/summaryframe.jsp
+++ b/apps/routerconsole/jsp/summaryframe.jsp
@@ -23,7 +23,7 @@
     if (!shutdownSoon) {
         if (d == null || "".equals(d)) {
             // set below
-        } else if (intl.getNonce().equals(conNonceParam)) {
+        } else if (net.i2p.router.web.CSSHelper.getNonce().equals(conNonceParam)) {
             d = net.i2p.data.DataHelper.stripHTML(d);  // XSS
             intl.setRefresh(d);
             intl.setDisableRefresh(d);
diff --git a/core/java/src/net/i2p/kademlia/KBucketSet.java b/core/java/src/net/i2p/kademlia/KBucketSet.java
index a2d0610a6..0d5daa223 100644
--- a/core/java/src/net/i2p/kademlia/KBucketSet.java
+++ b/core/java/src/net/i2p/kademlia/KBucketSet.java
@@ -628,6 +628,7 @@ public class KBucketSet {
      *  @param data size <= SDS length, else throws IAE
      *              Can be 1 bigger if top byte is zero
      */
+    @SuppressWarnings("unchecked")
     private T makeKey(byte[] data) {
         int len = _us.length();
         int dlen = data.length;

From f713a1978547b57110b758474406ed93030b7da8 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 17 Oct 2015 20:13:03 +0000
Subject: [PATCH 229/258] Disable TLS_DHE_DSS_WITH_AES_128_CBC_SHA

---
 core/java/src/net/i2p/util/I2PSSLSocketFactory.java | 10 +++++++++-
 installer/resources/eepsite/jetty-ssl.xml           |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
index 4761ac710..774415f4d 100644
--- a/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
+++ b/core/java/src/net/i2p/util/I2PSSLSocketFactory.java
@@ -204,7 +204,15 @@ public class I2PSSLSocketFactory {
         "TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA",
         "TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
         "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
-        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
+        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
+        // following is disabled because it is weak
+        // see e.g. https://bugzilla.mozilla.org/show_bug.cgi?id=1107787
+        "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
+        // ??? "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
+        //
+        //  NOTE:
+        //  If you add anything here, please also add to installer/resources/eepsite/jetty-ssl.xml
+        //
     }));
 
     /**
diff --git a/installer/resources/eepsite/jetty-ssl.xml b/installer/resources/eepsite/jetty-ssl.xml
index 7562828cc..b14ca0976 100644
--- a/installer/resources/eepsite/jetty-ssl.xml
+++ b/installer/resources/eepsite/jetty-ssl.xml
@@ -248,6 +248,8 @@
             TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA
             TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
             TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
+            TLS_DHE_DSS_WITH_AES_128_CBC_SHA
+            
           
         
       

From 6efce31eed46774d247b17786ab110bd25daa48b Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 21 Oct 2015 13:11:35 +0000
Subject: [PATCH 230/258] Increase timer thread priority

---
 core/java/src/net/i2p/util/SimpleTimer2.java       | 1 +
 router/java/src/net/i2p/router/JobQueue.java       | 2 +-
 router/java/src/net/i2p/router/JobQueueRunner.java | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index f2be24405..4cfab3a0a 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -118,6 +118,7 @@ public class SimpleTimer2 {
 //                (new Exception("OWCH! DAMN! Wrong ThreadGroup `" + name +"', `" + rv.getName() + "'")).printStackTrace();
 //           }
             rv.setDaemon(true);
+            rv.setPriority(Thread.NORM_PRIORITY + 1);
             return rv;
         }
     }
diff --git a/router/java/src/net/i2p/router/JobQueue.java b/router/java/src/net/i2p/router/JobQueue.java
index 2641707be..141f348bf 100644
--- a/router/java/src/net/i2p/router/JobQueue.java
+++ b/router/java/src/net/i2p/router/JobQueue.java
@@ -341,7 +341,7 @@ public class JobQueue {
     public void startup() {
         _alive = true;
         I2PThread pumperThread = new I2PThread(_pumper, "Job Queue Pumper", true);
-        //pumperThread.setPriority(I2PThread.NORM_PRIORITY+1);
+        pumperThread.setPriority(Thread.NORM_PRIORITY + 1);
         pumperThread.start();
     }
 
diff --git a/router/java/src/net/i2p/router/JobQueueRunner.java b/router/java/src/net/i2p/router/JobQueueRunner.java
index 9cf23f998..ecc4cd954 100644
--- a/router/java/src/net/i2p/router/JobQueueRunner.java
+++ b/router/java/src/net/i2p/router/JobQueueRunner.java
@@ -21,6 +21,7 @@ class JobQueueRunner extends I2PThread {
         _id = id;
         _keepRunning = true;
         _log = _context.logManager().getLog(JobQueueRunner.class);
+        setPriority(NORM_PRIORITY + 1);
         // all createRateStat in JobQueue
         //_state = 1;
     }

From c595895877c18e88abd8354f967a0117a520fcf1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 21 Oct 2015 13:22:32 +0000
Subject: [PATCH 231/258] i2psnark: More consistency and torrent links in
 messages

---
 .../src/org/klomp/snark/SnarkManager.java     | 47 +++++++++++++------
 history.txt                                   | 11 +++++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index 03d4b8dc0..688cf7e95 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -1315,11 +1315,12 @@ public class SnarkManager implements CompleteListener {
             running = false;
         }
         // Were we running last time?
+        String link = linkify(torrent);
         if (!dontAutoStart && shouldAutoStart() && running) {
             torrent.startTorrent();
-            addMessage(_t("Torrent added and started: \"{0}\"", torrent.getBaseName()));
+            addMessageNoEscape(_t("Torrent added and started: {0}", link));
         } else {
-            addMessage(_t("Torrent added: \"{0}\"", torrent.getBaseName()));
+            addMessageNoEscape(_t("Torrent added: {0}", link));
         }
     }
     
@@ -1982,7 +1983,7 @@ public class SnarkManager implements CompleteListener {
             if (shouldRemove)
                 removeTorrentStatus(torrent);
             if (!wasStopped)
-                addMessage(_t("Torrent stopped: \"{0}\"", torrent.getBaseName()));
+                addMessageNoEscape(_t("Torrent stopped: {0}", linkify(torrent)));
         }
         return torrent;
     }
@@ -2001,7 +2002,7 @@ public class SnarkManager implements CompleteListener {
         boolean wasStopped = torrent.isStopped();
         torrent.stopTorrent();
         if (!wasStopped)
-            addMessage(_t("Torrent stopped: \"{0}\"", torrent.getBaseName()));
+            addMessageNoEscape(_t("Torrent stopped: {0}", linkify(torrent)));
         if (shouldRemove)
             removeTorrentStatus(torrent);
     }
@@ -2087,14 +2088,8 @@ public class SnarkManager implements CompleteListener {
         Storage storage = snark.getStorage();
         if (meta == null || storage == null)
             return;
-        StringBuilder buf = new StringBuilder(256);
-        String base = DataHelper.escapeHTML(storage.getBaseName());
-        buf.append("").append(base).append("");
         if (snark.getDownloaded() > 0)
-            addMessageNoEscape(_t("Download finished: {0}", buf.toString())); //  + " (" + _t("size: {0}B", DataHelper.formatSize2(len)) + ')');
+            addMessageNoEscape(_t("Download finished: {0}", linkify(snark)));
         updateStatus(snark);
     }
     
@@ -2150,7 +2145,7 @@ public class SnarkManager implements CompleteListener {
                 _magnets.remove(snark.getName());
                 removeMagnetStatus(snark.getInfoHash());
                 addMessage(_t("Metainfo received for {0}", snark.getName()));
-                addMessage(_t("Starting up torrent {0}", storage.getBaseName()));
+                addMessageNoEscape(_t("Starting up torrent {0}", linkify(snark)));
                 return name;
             } catch (IOException ioe) {
                 addMessage(_t("Failed to copy torrent file to {0}", name));
@@ -2184,6 +2179,27 @@ public class SnarkManager implements CompleteListener {
 
     // End Snark.CompleteListeners
 
+    /**
+     * An HTML link to the file if complete and a single file,
+     * to the directory if not complete or not a single file,
+     * or simply the unlinkified name of the snark if a magnet
+     *
+     * @since 0.9.23
+     */
+    private String linkify(Snark snark) {
+        MetaInfo meta = snark.getMetaInfo();
+        Storage storage = snark.getStorage();
+        if (meta == null || storage == null)
+            return DataHelper.escapeHTML(snark.getBaseName());
+        StringBuilder buf = new StringBuilder(256);
+        String base = DataHelper.escapeHTML(storage.getBaseName());
+        buf.append("").append(base).append("");
+        return buf.toString();
+    }
+
     /**
      * Add all magnets from the config file
      *
@@ -2412,7 +2428,7 @@ public class SnarkManager implements CompleteListener {
         boolean connected = _util.connected();
         if ((!connected) && !_util.isConnecting())
             addMessage(_t("Opening the I2P tunnel"));
-        addMessage(_t("Starting up torrent {0}", snark.getBaseName()));
+        addMessageNoEscape(_t("Starting up torrent {0}", linkify(snark)));
         if (connected) {
             snark.startTorrent();
         } else {
@@ -2570,13 +2586,14 @@ public class SnarkManager implements CompleteListener {
                     updateStatus(snark);
                 if (_log.shouldWarn())
                     _log.warn("Finished recheck of " + snark.getBaseName() + " changed? " + changed);
+                String link = linkify(snark);
                 if (changed) {
                     int pieces = snark.getPieces();
                     double completion = (pieces - snark.getNeeded()) / (double) pieces;
                     String complete = (new DecimalFormat("0.00%")).format(completion);
-                    addMessage(_t("Finished recheck of torrent {0}, now {1} complete", snark.getBaseName(), complete));
+                    addMessageNoEscape(_t("Finished recheck of torrent {0}, now {1} complete", link, complete));
                 } else {
-                    addMessage(_t("Finished recheck of torrent {0}, unchanged", snark.getBaseName()));
+                    addMessageNoEscape(_t("Finished recheck of torrent {0}, unchanged", link));
                 }
             } catch (Exception e) {
                 _log.error("Error rechecking " + snark.getBaseName(), e);
diff --git a/history.txt b/history.txt
index f04c70cac..08fdabe18 100644
--- a/history.txt
+++ b/history.txt
@@ -1,7 +1,18 @@
+2015-10-21 zzz
+ * i2psnark: More consistency and torrent links in messages
+ * Router: Increase timer thread priority
+
+2015-10-17 zzz
+ * Crypto:
+   - Consolidate duplicate unlimited strength crypto check code
+   - Disable TLS_DHE_DSS_WITH_AES_128_CBC_SHA
+
 2015-10-16 zzz
+ * Console: Add Java 6 warning to summary bar
  * i2psnark:
    - Fix deadlock (ticket #1432)
    - Add "smart sort" option, set sort based on language (tickets #637, #1303)
+   - Don't balloon files on ARM (ticket #1684)
 
 2015-10-14 zzz
  * Update:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 80cfb9c84..5b1ba79e3 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 = 18;
+    public final static long BUILD = 19;
 
     /** for example "-test" */
     public final static String EXTRA = "";

From 627d0d29dbdf02aa44266b803b9d1e840814d804 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 30 Oct 2015 16:53:45 +0000
Subject: [PATCH 232/258] Router: Fix cascading I2CP error (ticket #1692)
 caused by not setting message ID. only happens when serialized (external
 I2CP)

---
 history.txt                                                   | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java             | 2 +-
 .../src/net/i2p/router/client/ClientMessageEventListener.java | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/history.txt b/history.txt
index 08fdabe18..229e72fdc 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2015-10-30 zzz
+ * Router: Fix cascading I2CP error (ticket #1692)
+
 2015-10-21 zzz
  * i2psnark: More consistency and torrent links in messages
  * Router: Increase timer thread priority
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b1ba79e3..f5c926454 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 = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
index 8db9da336..d5697571e 100644
--- a/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
+++ b/router/java/src/net/i2p/router/client/ClientMessageEventListener.java
@@ -196,7 +196,6 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
     private void handleSetDate(SetDateMessage message) {
         //_context.clock().setNow(message.getDate().getTime());
     }
-	
     
     /** 
      * Handle a CreateSessionMessage.
@@ -378,6 +377,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
             // do this instead:
             if (sid != null && message.getNonce() > 0) {
                 MessageStatusMessage status = new MessageStatusMessage();
+                status.setMessageId(_runner.getNextMessageId());
                 status.setSessionId(sid.getSessionId());
                 status.setSize(0);
                 status.setNonce(message.getNonce()); 
@@ -461,7 +461,7 @@ class ClientMessageEventListener implements I2CPMessageReader.I2CPMessageEventLi
     }
     
     /** override for testing */
-    protected void handleCreateLeaseSet(CreateLeaseSetMessage message) {	
+    protected void handleCreateLeaseSet(CreateLeaseSetMessage message) {
         if ( (message.getLeaseSet() == null) || (message.getPrivateKey() == null) || (message.getSigningPrivateKey() == null) ) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Null lease set granted: " + message);

From 02c1417cc52f3f9aca799a1916d3cb0937c110d1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 31 Oct 2015 14:20:10 +0000
Subject: [PATCH 233/258] update ancient snark docs

---
 apps/i2psnark/COPYING                         | 341 +-----------------
 apps/i2psnark/TODO                            |  24 --
 .../{authors.snark => authors-snark.txt}      |   0
 .../{changelog.snark => changelog-snark.txt}  |   0
 .../{readme.txt.snark => readme-snark.txt}    |   0
 apps/i2psnark/readme-standalone.txt           |  10 +-
 apps/i2psnark/readme.txt                      |  16 +-
 7 files changed, 12 insertions(+), 379 deletions(-)
 delete mode 100644 apps/i2psnark/TODO
 rename apps/i2psnark/{authors.snark => authors-snark.txt} (100%)
 rename apps/i2psnark/{changelog.snark => changelog-snark.txt} (100%)
 rename apps/i2psnark/{readme.txt.snark => readme-snark.txt} (100%)

diff --git a/apps/i2psnark/COPYING b/apps/i2psnark/COPYING
index d60c31a97..a0d98f2a6 100644
--- a/apps/i2psnark/COPYING
+++ b/apps/i2psnark/COPYING
@@ -1,340 +1 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    
-    Copyright (C)   
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  , 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+See ../../licenses/LICENSE-GPLv2.txt
diff --git a/apps/i2psnark/TODO b/apps/i2psnark/TODO
deleted file mode 100644
index 6f89c0f50..000000000
--- a/apps/i2psnark/TODO
+++ /dev/null
@@ -1,24 +0,0 @@
-- I2PSnark:
-  - add multitorrent support by checking the metainfo hash in the
-    PeerAcceptor and feeding it off to the appropriate coordinator
-  - add a web interface
-
-- BEncode
-  - Byte array length indicator can overflow.
-  - Support really big BigNums (only 256 chars allowed now)
-  - Better BEValue toString(). Uses stupid heuristic now for debugging.
-  - Implemented bencoding.
-  - Remove application level hack to calculate sha1 hash for metainfo
-    (But can it be done as efficiently?)
-
-- Storage
-  - Check file name filter.
-
-- TrackerClient
-  - Support undocumented &numwant= request.
-
-- PeerCoordinator
-  - Disconnect from other seeds as soon as you are a seed yourself.
-
-- Text UI
-  - Make it completely silent.
diff --git a/apps/i2psnark/authors.snark b/apps/i2psnark/authors-snark.txt
similarity index 100%
rename from apps/i2psnark/authors.snark
rename to apps/i2psnark/authors-snark.txt
diff --git a/apps/i2psnark/changelog.snark b/apps/i2psnark/changelog-snark.txt
similarity index 100%
rename from apps/i2psnark/changelog.snark
rename to apps/i2psnark/changelog-snark.txt
diff --git a/apps/i2psnark/readme.txt.snark b/apps/i2psnark/readme-snark.txt
similarity index 100%
rename from apps/i2psnark/readme.txt.snark
rename to apps/i2psnark/readme-snark.txt
diff --git a/apps/i2psnark/readme-standalone.txt b/apps/i2psnark/readme-standalone.txt
index 9bc1ddf66..ced04e941 100644
--- a/apps/i2psnark/readme-standalone.txt
+++ b/apps/i2psnark/readme-standalone.txt
@@ -1,6 +1,4 @@
-To run I2PSnark from the command line, run "java -jar lib/i2psnark.jar", but
-to run it with the web UI, run "launch-i2psnark".  I2PSnark is
-GPL'ed software, based on Snark (http://www.klomp.org/) to run on top of I2P
-(http://www.i2p2.de/) within a webserver (such as the bundled Jetty from
-http://jetty.mortbay.org/).  For more information about I2PSnark, get in touch
-with the folks at http://forum.i2p2.de/
+i2psnark is packaged as a webapp running in the router console.
+Command line and standalone operation of i2psnark are not currently supported.
+See http://trac.i2p2.i2p/ticket/1191 or http://trac.i2p2.de/ticket/1191
+for the status of restoring standalone support.
diff --git a/apps/i2psnark/readme.txt b/apps/i2psnark/readme.txt
index 3970e3cba..2680442fa 100644
--- a/apps/i2psnark/readme.txt
+++ b/apps/i2psnark/readme.txt
@@ -1,11 +1,9 @@
-This is an I2P port of snark [http://klomp.org/snark], a GPL'ed bittorrent client
+This is i2psnark, an I2P port of snark http://klomp.org/snark/ , a GPLv2 bittorrent client.
+It contains significant enhancements including a web UI and support for
+multitorrent, magnet, PEX and DHT.
 
-The build in tracker has been removed for simplicity.
+i2psnark is packaged as a webapp running in the router console.
 
-Example usage:
-  java -jar lib/i2psnark.jar myFile.torrent
-
-or, a more verbose setting:
-  java -jar lib/i2psnark.jar --eepproxy 127.0.0.1 4444 \
-       --i2cp 127.0.0.1 7654 "inbound.length=2 outbound.length=2" \
-       --debug 6 myFile.torrent
+See http://i2p-projekt.i2p/en/docs/applications/bittorrent
+or https://geti2p.net/en/docs/applications/bittorrent
+for the specification of the protocols for bittorrent over I2P.

From c37cc7ad52c3da330249013e8687ea7bd6702a00 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 31 Oct 2015 19:13:57 +0000
Subject: [PATCH 234/258] Convert remaining Threads to I2PThread or
 I2PAppThread

---
 apps/BOB/src/net/i2p/BOB/BOB.java                      |  2 +-
 apps/BOB/src/net/i2p/BOB/DoCMDS.java                   |  7 ++++---
 apps/BOB/src/net/i2p/BOB/I2Plistener.java              |  4 +++-
 apps/BOB/src/net/i2p/BOB/I2PtoTCP.java                 |  6 ++++--
 apps/BOB/src/net/i2p/BOB/MUXlisten.java                |  6 ++++--
 apps/BOB/src/net/i2p/BOB/TCPlistener.java              |  4 +++-
 apps/BOB/src/net/i2p/BOB/TCPtoI2P.java                 |  9 +++++----
 apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java  | 10 +++++-----
 core/java/src/net/i2p/util/I2PAppThread.java           |  8 ++++++++
 core/java/src/net/i2p/util/I2PThread.java              |  8 ++++++++
 router/java/src/net/i2p/router/Router.java             |  4 ++--
 .../src/net/i2p/router/peermanager/PeerManager.java    |  2 +-
 router/java/src/net/i2p/router/transport/UPnP.java     |  5 +++--
 13 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java
index c4ef3b23a..e1106c9bb 100644
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@@ -338,7 +338,7 @@ public class BOB implements Runnable, ClientApp {
 
 				if (g) {
 					DoCMDS conn_c = new DoCMDS(spin, lock, server, props, database, _log);
-					Thread t = new Thread(conn_c);
+					Thread t = new I2PAppThread(conn_c);
 					t.setName("BOB.DoCMDS " + i);
 					t.start();
 					i++;
diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
index 957f0ea3f..7e5bd1014 100644
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
@@ -25,12 +25,13 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.I2PClientFactory;
-//import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-//import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.util.I2PAppThread;
+
 // needed only for debugging.
 // import java.util.logging.Level;
 // import java.util.logging.Logger;
@@ -1307,7 +1308,7 @@ public class DoCMDS implements Runnable {
 														// wait
 													}
 													tunnel = new MUXlisten(lock, database, nickinfo, _log);
-													Thread t = new Thread(tunnel);
+													Thread t = new I2PAppThread(tunnel);
 													t.start();
 													// try {
 													//	Thread.sleep(1000 * 10); // Slow down the startup.
diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
index f862c7cae..ebe488860 100644
--- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java
+++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
@@ -18,10 +18,12 @@ package net.i2p.BOB;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.util.I2PAppThread;
 
 /**
  * Listen on I2P and connect to TCP
@@ -77,7 +79,7 @@ public class I2Plistener implements Runnable {
 						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);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " I2PtoTCP " + conn);
 						t.start();
 					}
 
diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
index bf699db60..8e1cebb73 100644
--- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
+++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
@@ -19,7 +19,9 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.client.streaming.I2PSocket;
+import net.i2p.util.I2PAppThread;
 
 /**
  * Process I2P->TCP
@@ -111,8 +113,8 @@ public class I2PtoTCP implements Runnable {
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();
diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
index f330be971..81dbe0845 100644
--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -21,11 +21,13 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.I2PException;
 import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketManagerFactory;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
 
 /**
@@ -201,14 +203,14 @@ public class MUXlisten implements Runnable {
 							// I2P -> TCP
 							SS = socketManager.getServerSocket();
 							I2Plistener conn = new I2Plistener(SS, socketManager, info, database, _log, lives);
-							t = new Thread(tg, conn, "BOBI2Plistener " + N);
+							t = new I2PAppThread(tg, conn, "BOBI2Plistener " + N);
 							t.start();
 						}
 
 						if (come_in) {
 							// TCP -> I2P
 							TCPlistener conn = new TCPlistener(listener, socketManager, info, database, _log, lives);
-							q = new Thread(tg, conn, "BOBTCPlistener " + N);
+							q = new I2PAppThread(tg, conn, "BOBTCPlistener " + N);
 							q.start();
 						}
 
diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
index 70ff52b14..2ad1b5af6 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
@@ -20,8 +20,10 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.util.I2PAppThread;
 
 /**
  * Listen on TCP port and connect to I2P
@@ -75,7 +77,7 @@ public class TCPlistener implements Runnable {
 						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);
+						Thread t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPtoI2P " + conn);
 						t.start();
 						g = false;
 					}
diff --git a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
index 0ce587257..3f196af28 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -24,13 +24,14 @@ import java.net.NoRouteToHostException;
 import java.net.Socket;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import net.i2p.I2PAppContext;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
-//import net.i2p.i2ptunnel.I2PTunnel;
-import net.i2p.I2PAppContext;
+import net.i2p.util.I2PAppThread;
 
 /**
  *
@@ -158,8 +159,8 @@ public class TCPtoI2P implements Runnable {
 					// setup to cross the streams
 					TCPio conn_c = new TCPio(in, Iout, lives); // app -> I2P
 					TCPio conn_a = new TCPio(Iin, out, lives); // I2P -> app
-					t = new Thread(conn_c, Thread.currentThread().getName() + " TCPioA");
-					q = new Thread(conn_a, Thread.currentThread().getName() + " TCPioB");
+					t = new I2PAppThread(conn_c, Thread.currentThread().getName() + " TCPioA");
+					q = new I2PAppThread(conn_a, Thread.currentThread().getName() + " TCPioB");
 					// Fire!
 					t.start();
 					q.start();
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
index fe9561ced..7770d4075 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
@@ -119,10 +119,10 @@ class SAMv3StreamSession  extends SAMStreamSession implements SAMv3Handler.Sessi
 	        WritableByteChannel toI2P      = Channels.newChannel(i2ps.getOutputStream());
 	        
 		SAMBridge bridge = handler.getBridge();
-		(new Thread(rec.getThreadGroup(),
+		(new I2PAppThread(rec.getThreadGroup(),
 		            new Pipe(fromClient, toI2P, bridge),
 		            "ConnectV3 SAMPipeClientToI2P")).start();
-		(new Thread(rec.getThreadGroup(),
+		(new I2PAppThread(rec.getThreadGroup(),
 		            new Pipe(fromI2P, toClient, bridge),
 		            "ConnectV3 SAMPipeI2PToClient")).start();
 	    }
@@ -176,10 +176,10 @@ class SAMv3StreamSession  extends SAMStreamSession implements SAMv3Handler.Sessi
 	        WritableByteChannel toI2P      = Channels.newChannel(i2ps.getOutputStream());
 	        
 		SAMBridge bridge = handler.getBridge();
-		(new Thread(rec.getThreadGroup(),
+		(new I2PAppThread(rec.getThreadGroup(),
 		            new Pipe(fromClient, toI2P, bridge),
 		            "AcceptV3 SAMPipeClientToI2P")).start();
-		(new Thread(rec.getThreadGroup(),
+		(new I2PAppThread(rec.getThreadGroup(),
 		            new Pipe(fromI2P, toClient, bridge),
 		            "AcceptV3 SAMPipeI2PToClient")).start();
 	    }
@@ -219,7 +219,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements SAMv3Handler.Sessi
 	    	}
 	    	
 	    	SocketForwarder forwarder = new SocketForwarder(host, port, this, verbose);
-	    	(new Thread(rec.getThreadGroup(), forwarder, "SAMV3StreamForwarder")).start();
+	    	(new I2PAppThread(rec.getThreadGroup(), forwarder, "SAMV3StreamForwarder")).start();
 	    }
 	    
 	    private static class SocketForwarder implements Runnable
diff --git a/core/java/src/net/i2p/util/I2PAppThread.java b/core/java/src/net/i2p/util/I2PAppThread.java
index da291d210..c3de5c87a 100644
--- a/core/java/src/net/i2p/util/I2PAppThread.java
+++ b/core/java/src/net/i2p/util/I2PAppThread.java
@@ -38,9 +38,17 @@ public class I2PAppThread extends I2PThread {
     public I2PAppThread(Runnable r, String name) {
         super(r, name);
     }
+
     public I2PAppThread(Runnable r, String name, boolean isDaemon) {
         super(r, name, isDaemon);
     }
+
+    /**
+     *  @since 0.9.23
+     */
+    public I2PAppThread(ThreadGroup group, Runnable r, String name) {
+        super(group, r, name);
+    }
     
     @Override
     protected void fireOOM(OutOfMemoryError oom) {
diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 22611ee3f..97041f4ee 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -73,6 +73,14 @@ public class I2PThread extends Thread {
         //    _createdBy = new Exception("Created by");
     }
 
+    /**
+     *  @since 0.9.23
+     */
+    public I2PThread(ThreadGroup group, Runnable r, String name) {
+        super(group, r, name);
+        setPriority(NORM_PRIORITY);
+    }
+
 /****
     private void log(int level, String msg) { log(level, msg, null); }
 
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 260115d45..426da4a75 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -1141,7 +1141,7 @@ public class Router implements RouterClock.ClockShiftListener {
                 _log.warn("Running shutdown task " + task.getClass());
             try {
                 //task.run();
-                Thread t = new Thread(task, "Shutdown task " + task.getClass().getName());
+                Thread t = new I2PAppThread(task, "Shutdown task " + task.getClass().getName());
                 t.setDaemon(true);
                 t.start();
                 try {
@@ -1454,7 +1454,7 @@ public class Router implements RouterClock.ClockShiftListener {
         ((RouterClock) _context.clock()).removeShiftListener(this);
         // Let's not stop accepting tunnels, etc
         //_started = _context.clock().now();
-        Thread t = new Thread(new Restarter(_context), "Router Restart");
+        Thread t = new I2PThread(new Restarter(_context), "Router Restart");
         t.setPriority(Thread.NORM_PRIORITY + 1);
         t.start();
     }    
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index 8061a2517..b3cc3643b 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -165,7 +165,7 @@ class PeerManager {
      *  @since 0.8.8
      */
     private void loadProfilesInBackground() {
-        (new Thread(new ProfileLoader())).start();
+        (new I2PThread(new ProfileLoader())).start();
     }
 
     /**
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index baec7ab62..26c7610b5 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -19,6 +19,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.util.Addresses;
+import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
 import net.i2p.util.Translate;
 
@@ -994,7 +995,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 		}
 		if (_log.shouldLog(Log.INFO))
 			_log.info("Starting thread to forward " + portsToForwardNow.size() + " ports");
-	        Thread t = new Thread(new RegisterPortsThread(portsToForwardNow));
+	        Thread t = new I2PThread(new RegisterPortsThread(portsToForwardNow));
 		t.setName("UPnP Port Opener " + __id.incrementAndGet());
 		t.setDaemon(true);
 		t.start();
@@ -1034,7 +1035,7 @@ class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	private void unregisterPorts(Set portsToForwardNow) {
 		if (_log.shouldLog(Log.INFO))
 			_log.info("Starting thread to un-forward " + portsToForwardNow.size() + " ports");
-	        Thread t = new Thread(new UnregisterPortsThread(portsToForwardNow));
+	        Thread t = new I2PThread(new UnregisterPortsThread(portsToForwardNow));
 		t.setName("UPnP Port Closer " + __id.incrementAndGet());
 		t.setDaemon(true);
 		t.start();

From 805979b987f3e530320e02e09ede14c80b19c61e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 31 Oct 2015 22:58:51 +0000
Subject: [PATCH 235/258] UPnP: Fix deadlock in callbacks (ticket #1699)
 possibly more to do

---
 history.txt                                          |  4 ++++
 router/java/src/net/i2p/router/RouterVersion.java    |  2 +-
 .../src/net/i2p/router/transport/UPnPManager.java    | 12 ++++++++++++
 .../net/i2p/router/transport/udp/UDPTransport.java   |  2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/history.txt b/history.txt
index 229e72fdc..7ec5b7bcc 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2015-10-31 zzz
+ * Convert remaining Threads to I2PThread or I2PAppThread
+ * UPnP: Fix deadlock in callbacks (ticket #1699)
+
 2015-10-30 zzz
  * Router: Fix cascading I2CP error (ticket #1692)
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f5c926454..43dca9240 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 = "";
diff --git a/router/java/src/net/i2p/router/transport/UPnPManager.java b/router/java/src/net/i2p/router/transport/UPnPManager.java
index 370ba813e..9d7a6918a 100644
--- a/router/java/src/net/i2p/router/transport/UPnPManager.java
+++ b/router/java/src/net/i2p/router/transport/UPnPManager.java
@@ -233,7 +233,17 @@ class UPnPManager {
         public void portForwardStatus(Map statuses) {
             if (_log.shouldLog(Log.DEBUG))
                  _log.debug("UPnP Callback:");
+            // Let's not have two of these running at once.
+            // Deadlock reported in ticket #1699
+            // and the locking isn't foolproof in UDPTransport.
+            // UPnP runs the callbacks in a thread, so we can block.
+            // There is only one UPnPCallback, so lock on this
+            synchronized(this) {
+                locked_PFS(statuses);
+            }
+        }
 
+        private void locked_PFS(Map statuses) {
             byte[] ipaddr = null;
             DetectedIP[] ips = _upnp.getAddress();
             if (ips != null) {
@@ -244,6 +254,7 @@ class UPnPManager {
                             _log.debug("External address: " + ip.publicAddress + " type: " + ip.natType);
                         if (!ip.publicAddress.equals(_detectedAddress)) {
                             _detectedAddress = ip.publicAddress;
+                            // deadlock path 1
                             _manager.externalAddressReceived(SOURCE_UPNP, _detectedAddress.getAddress(), 0);
                         }
                         ipaddr = ip.publicAddress.getAddress();
@@ -269,6 +280,7 @@ class UPnPManager {
                 else
                     continue;
                 boolean success = fps.status >= ForwardPortStatus.MAYBE_SUCCESS;
+                // deadlock path 2
                 _manager.forwardPortStatus(style, ipaddr, fp.portNumber, fps.externalPort, success, fps.reasonString);
             }
         }
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 223f655f5..edcfef26b 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -993,6 +993,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 // save PROP_EXTERNAL_PORT
                 _context.router().saveConfig(changes, null);
             }
+            // deadlock thru here ticket #1699
             _context.router().rebuildRouterInfo();
         }
         _testEvent.forceRunImmediately();
@@ -2115,6 +2116,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
      *  @since 0.9.18
      */
     private RouterAddress getCurrentExternalAddress(boolean isIPv6) {
+        // deadlock thru here ticket #1699
         synchronized (_rebuildLock) {
             return isIPv6 ? _currentOurV6Address : _currentOurV4Address;
         }

From b7dc55e326af0771405ed93fd566151f8c515b04 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 1 Nov 2015 00:45:30 +0000
Subject: [PATCH 236/258] checklist update

---
 installer/resources/checklist.txt | 49 +++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/installer/resources/checklist.txt b/installer/resources/checklist.txt
index 4533e363b..b12e50e97 100644
--- a/installer/resources/checklist.txt
+++ b/installer/resources/checklist.txt
@@ -17,9 +17,20 @@ Write the release announcement and push to Transifex:
 
 Ensure all translation updates are imported from Transifex
 Sync with mtn.i2p2.i2p
-Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p
-Copy over override.properties to set build.built-by
-Double-check trust list
+Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p /path/to/releasedir
+You may build with Java 7 or higher, but ensure you have the Java 6 JRE installed for the bootclasspath
+
+Create override.properties with (adjust as necessary):
+-----------
+release.privkey=/path/to/private-signing.key
+release.privkey.su3=/path/to/su3keystore.ks
+release.gpg.keyid=0xnnnnnnnn
+release.signer.su3=xxx@mail.i2p
+build.built-by=xxx
+javac.compilerargs=-bootclasspath /usr/lib/jvm/java-6-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-6-openjdk-amd64/jre/lib/jce.jar
+-----------
+
+Copy latest trust list _MTN/monotonerc from website or some other workspace
 
 Change revision in:
 	history.txt
@@ -28,6 +39,8 @@ Change revision in:
 	router/java/src/net/i2p/router/RouterVersion.java
 		(change to BUILD = 0 and EXTRA = "")
 
+mtn ci
+
 Review the complete diff from the last release:
         mtn diff -r t:i2p-0.9.(xx-1) > out.diff
         vi out.diff
@@ -41,10 +54,6 @@ NOTE: These tasks are now automated by 'ant release'
 
 Build and tag:
 	ant pkg
-	mtn ci
-	mtn tag h: i2p-0.x.xx
-	mtn cert t:i2p-0.x.xx branch i2p.i2p.release
-	Sync with mtn.i2p2.i2p
 
 Create signed update files with:
 	export I2P=~/i2p
@@ -80,17 +89,30 @@ Generate PGP signatures:
 (end of tasks automated by 'ant release')
 =========================================
 
+Now test.
+If all goes well:
+	mtn tag h: i2p-0.x.xx
+	mtn cert t:i2p-0.x.xx branch i2p.i2p.release
+	mtn sync (with e.g. mtn.killyourtv.i2p)
+
 Add magnet links, change release dates and release number in to old-format news.xml,
 and distribute to news hosts
 In the i2p.newsxml branch, edit magnet links, release dates and release number in data/releases.json, and check in
 
-Seed update torrents (su2 and su3)
+Add update torrents to tracker2.postman.i2p and start seeding (su2 and su3)
 
 Notify the following people:
 	All in-network update hosts
 	PPA maintainer
 	news.xml maintainer
 	backup news.xml maintainer
+	website files maintainer
+
+Update Trac:
+	Add milestone and version dates
+	Increment milestone and version defaults
+
+Wait for website files to be updated
 
 Website files to change:
 	Sync with mtn.i2p-projekt.i2p
@@ -101,14 +123,11 @@ Website files to change:
 	New release announcement - see i2p2www/blog/README for instructions
 	Sync with mtn.i2p-projekt.i2p
 
+Wait for a few update hosts to be ready
+Tell news hosts to flip the switch
+Wait for debian packages to be ready
+
 Announce on:
          #i2p, #i2p-dev (also on freenode side)
          forum.i2p
          twitter
-         freshmeat.net
-         launchpad.net
-         alt.privacy.anon-server
-
-Update Trac:
-	Add milestone and version dates
-	Increment milestone and version defaults

From bbb6da2ac66f9d68538d6975cd5d5f2af50527d6 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 1 Nov 2015 16:47:59 +0000
Subject: [PATCH 237/258] cleanups, javadoc

---
 core/java/src/net/i2p/util/I2PAppThread.java |  5 +-
 core/java/src/net/i2p/util/I2PThread.java    | 71 +++++---------------
 2 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/core/java/src/net/i2p/util/I2PAppThread.java b/core/java/src/net/i2p/util/I2PAppThread.java
index c3de5c87a..ebbe6c06e 100644
--- a/core/java/src/net/i2p/util/I2PAppThread.java
+++ b/core/java/src/net/i2p/util/I2PAppThread.java
@@ -14,10 +14,13 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
- * Like I2PThread but with per-thread OOM listeners,
+ * Like {@link I2PThread} but with per-thread OOM listeners,
  * rather than a static router-wide listener list,
  * so that an OOM in an app won't call the router listener
  * to shutdown the whole router.
+ *
+ * This is preferred for application use.
+ * See {@link I2PThread} for features.
  */
 public class I2PAppThread extends I2PThread {
 
diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 97041f4ee..2b4c2a81e 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -14,63 +14,53 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
- * In case its useful later...
- * (e.g. w/ native programatic thread dumping, etc)
- *
- * As of 0.9.21, I2PThreads are initialized to NORM_PRIORITY
- * (not the priority of the creating thread).
+ * Preferred over {@link Thread} for all router uses.
+ * For applications, {@link I2PAppThread} is preferred.
+ * 
                                    
+ * Provides the following features:
+ * 
                                      
+ * 
                                    • Logging to wrapper log on unexpected termination in {@link #run()}.
+ * 
                                    • Notification of OOM to registered listener (the router),
+ *     which will cause logging to the wrapper log and a router restart
+ * 
                                    • Catching and logging "OOM" caused by thread limit in {@link #start()}
+ *     with distint message, and does not call the OOM listener.
+ * 
                                    • As of 0.9.21, initialization to NORM_PRIORITY
+ *     (not the priority of the creating thread).
+ * 
                                    
  */
 public class I2PThread extends Thread {
-    /**
-     *  Non-static to avoid refs to old context in Android.
-     *  Probably should just remove all the logging though.
-     *  Logging removed, too much trouble with extra contexts
-     */
-    //private volatile Log _log;
+
     private static final Set _listeners = new CopyOnWriteArraySet();
-    //private String _name;
-    //private Exception _createdBy;
 
     public I2PThread() {
         super();
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
 
     public I2PThread(String name) {
         super(name);
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
 
     public I2PThread(Runnable r) {
         super(r);
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
 
     public I2PThread(Runnable r, String name) {
         super(r, name);
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
+
     public I2PThread(Runnable r, String name, boolean isDaemon) {
         super(r, name);
 	setDaemon(isDaemon);
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
     
     public I2PThread(ThreadGroup g, Runnable r) {
         super(g, r);
         setPriority(NORM_PRIORITY);
-        //if ( (_log == null) || (_log.shouldLog(Log.DEBUG)) )
-        //    _createdBy = new Exception("Created by");
     }
 
     /**
@@ -81,17 +71,6 @@ public class I2PThread extends Thread {
         setPriority(NORM_PRIORITY);
     }
 
-/****
-    private void log(int level, String msg) { log(level, msg, null); }
-
-    private void log(int level, String msg, Throwable t) {
-        // we cant assume log is created
-        if (_log == null) _log = new Log(I2PThread.class);
-        if (_log.shouldLog(level))
-            _log.log(level, msg, t);
-    }
-****/
-    
     /**
      *  Overridden to provide useful info to users on OOM, and to prevent
      *  shutting down the whole JVM for what is most likely not a heap issue.
@@ -117,19 +96,9 @@ public class I2PThread extends Thread {
     
     @Override
     public void run() {
-        //_name = Thread.currentThread().getName();
-        //log(Log.INFO, "New thread started" + (isDaemon() ? " (daemon): " : ": ") + _name, _createdBy);
         try {
             super.run();
         } catch (Throwable t) {
-          /****
-            try {
-                log(Log.CRIT, "Thread terminated unexpectedly: " + getName(), t);
-            } catch (Throwable woof) {
-                System.err.println("Died within the OOM itself");
-                t.printStackTrace();
-            }
-          ****/
             if (t instanceof OutOfMemoryError) {
                 fireOOM((OutOfMemoryError)t);
             } else {
@@ -137,18 +106,8 @@ public class I2PThread extends Thread {
                 t.printStackTrace();
             }
         }
-        // This creates a new I2PAppContext after it was deleted
-        // in Router.finalShutdown() via RouterContext.killGlobalContext()
-        //log(Log.INFO, "Thread finished normally: " + _name);
     }
     
-/****
-    protected void finalize() throws Throwable {
-        //log(Log.DEBUG, "Thread finalized: " + _name);
-        super.finalize();
-    }
-****/
-    
     protected void fireOOM(OutOfMemoryError oom) {
         for (OOMEventListener listener : _listeners)
             listener.outOfMemory(oom);

From 787921aa897fb79f69939f21c164947c247811f5 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 1 Nov 2015 17:29:20 +0000
Subject: [PATCH 238/258] spelling

---
 core/java/src/net/i2p/util/I2PThread.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 2b4c2a81e..3c08e3639 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -23,7 +23,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * 
                                  • Notification of OOM to registered listener (the router),
  *     which will cause logging to the wrapper log and a router restart
  * 
                                  • Catching and logging "OOM" caused by thread limit in {@link #start()}
- *     with distint message, and does not call the OOM listener.
+ *     with distinct message, and does not call the OOM listener.
  * 
                                  • As of 0.9.21, initialization to NORM_PRIORITY
  *     (not the priority of the creating thread).
  * 

From a3a092a4543359fe4c35f2cdd4c266afa3d2ad84 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sun, 1 Nov 2015 19:31:22 +0000
Subject: [PATCH 239/258] Utils: Double IP lookup cache size (ticket #1700)

---
 core/java/src/net/i2p/util/Addresses.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/src/net/i2p/util/Addresses.java b/core/java/src/net/i2p/util/Addresses.java
index b33839b48..e4a78cc37 100644
--- a/core/java/src/net/i2p/util/Addresses.java
+++ b/core/java/src/net/i2p/util/Addresses.java
@@ -231,10 +231,10 @@ public abstract class Addresses {
         I2PAppContext ctx = I2PAppContext.getCurrentContext();
         if (ctx != null && ctx.isRouterContext()) {
             long maxMemory = SystemVersion.getMaxMemory();
-            long min = 128;
+            long min = 256;
             long max = 4096;
-            // 512 nominal for 128 MB
-            size = (int) Math.max(min, Math.min(max, 1 + (maxMemory / (256*1024))));
+            // 1024 nominal for 128 MB
+            size = (int) Math.max(min, Math.min(max, 1 + (maxMemory / (128*1024))));
         } else {
             size = 32;
         }

From 39d749ba16109a1f4435877c894f6d8c123e1636 Mon Sep 17 00:00:00 2001
From: z3r0fox 
Date: Mon, 2 Nov 2015 17:27:04 +0000
Subject: [PATCH 240/258] Fixed generation of eepget target filenames for basic
 page URLs, URLs with query parameters, certain edge cases.

---
 core/java/src/net/i2p/util/EepGet.java | 60 ++++++++++++++++++++------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/core/java/src/net/i2p/util/EepGet.java b/core/java/src/net/i2p/util/EepGet.java
index c31184dbd..8c7561a12 100644
--- a/core/java/src/net/i2p/util/EepGet.java
+++ b/core/java/src/net/i2p/util/EepGet.java
@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import gnu.getopt.Getopt;
 
@@ -312,22 +314,52 @@ public class EepGet {
             System.exit(1);
     }
 
+    /**
+     * Parse URL for a viable filename.
+     * 
+     * @param   url  a URL giving the location of an online resource
+     * @return       a filename to save the resource as on local filesystem
+     */
     public static String suggestName(String url) {
-        int last = url.lastIndexOf('/');
-        if ((last < 0) || (url.lastIndexOf('#') > last))
-            last = url.lastIndexOf('#');
-        if ((last < 0) || (url.lastIndexOf('?') > last))
-            last = url.lastIndexOf('?');
-        if ((last < 0) || (url.lastIndexOf('=') > last))
-            last = url.lastIndexOf('=');
+        URL nameURL = null;  // URL object
+        String name;         // suggested name
 
-        String name = null;
-        if (last >= 0)
-            name = sanitize(url.substring(last+1));
-        if ( (name != null) && (name.length() > 0) )
-            return name;
-        else
-            return sanitize(url);
+        try {
+            nameURL = new URL(url);
+        } catch (MalformedURLException e) {
+            System.err.println("Please enter a properly formed URL.");
+            System.exit(1);
+        }
+
+        String path = nameURL.getPath();  // discard any URI queries
+
+        // if no file specified, eepget scrapes webpage - use domain as name
+        Pattern slashes = Pattern.compile("/+");
+        Matcher matcher = slashes.matcher(path);
+        // if empty path or just /'s - nameURL lets multiple /'s through
+        if (path.equals("") || matcher.matches()) {
+            name = sanitize(nameURL.getAuthority());
+        // if path specified
+        } else {
+            int last = path.lastIndexOf('/');
+            // if last / not at end of string, use following string as filename
+            if (last != path.length() - 1) {
+                name = sanitize(path.substring(last + 1));
+            // if there's a trailing / group look for previous / as trim point
+            } else {
+                int i = 1;
+                int slash;
+                while (true) {
+                    slash = path.lastIndexOf('/', last - i);
+                    if (slash != last - i) {
+                        break;
+                    }
+                    i += 1;
+                }
+                name = sanitize(path.substring(slash + 1, path.length() - i));
+            }
+        }
+        return name;
     }
 
 

From b15ea8ba2facabc27606c78a3c6df43fc7990e49 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 4 Nov 2015 14:57:07 +0000
Subject: [PATCH 241/258] Timers: Improve OutboundMessageRegistry locking
 SimpleTimer2 cleanups possible fix for ticket #1694

---
 core/java/src/net/i2p/util/SimpleTimer2.java   | 18 +++++++++++-------
 .../transport/OutboundMessageRegistry.java     | 10 ++++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/core/java/src/net/i2p/util/SimpleTimer2.java b/core/java/src/net/i2p/util/SimpleTimer2.java
index 4cfab3a0a..e8dcc2fcb 100644
--- a/core/java/src/net/i2p/util/SimpleTimer2.java
+++ b/core/java/src/net/i2p/util/SimpleTimer2.java
@@ -416,13 +416,15 @@ public class SimpleTimer2 {
                   case IDLE:  // fall through
                   case RUNNING:
                     throw new IllegalStateException(this + " not possible to be in " + _state);
-                  case SCHEDULED: // proceed, switch to IDLE in case I need to reschedule
-                    _state = TimedEventState.IDLE;
+                  case SCHEDULED:
+                    // proceed, will switch to IDLE to reschedule
                 }
                                                
                 // if I was rescheduled by the user, re-submit myself to the executor.
-                int difference = (int)(_nextRun - before); // careful with long uptimes
+                long difference = _nextRun - before; // careful with long uptimes
                 if (difference > _fuzz) {
+                    // proceed, switch to IDLE to reschedule
+                    _state = TimedEventState.IDLE;
                     schedule(difference); 
                     return;
                 }
@@ -437,10 +439,12 @@ public class SimpleTimer2 {
             else if (_log.shouldLog(Log.WARN))
                 _log.warn(_pool + " no _future " + this);
             // This can be an incorrect warning especially after a schedule(0)
-            if (_log.shouldLog(Log.WARN) && delay > 100)
-                _log.warn(_pool + " early execution " + delay + ": " + this);
-            else if (_log.shouldLog(Log.WARN) && delay < -1000)
-                _log.warn(" late execution " + (0 - delay) + ": " + this + _pool.debug());
+            if (_log.shouldWarn()) {
+                if (delay > 100)
+                    _log.warn(_pool + " early execution " + delay + ": " + this);
+                else if (delay < -1000)
+                    _log.warn(" late execution " + (0 - delay) + ": " + this + _pool.debug());
+            }
             try {
                 timeReached();
             } catch (Throwable t) {
diff --git a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
index 7c8e1b37d..9c04f52b6 100644
--- a/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
+++ b/router/java/src/net/i2p/router/transport/OutboundMessageRegistry.java
@@ -330,12 +330,14 @@ public class OutboundMessageRegistry {
                 if (r > 0 || e > 0 || a > 0)
                     _log.debug("Expired: " + e + " remaining: " + r + " active: " + a);
             }
-            if (_nextExpire <= now)
-                _nextExpire = now + 10*1000;
-            schedule(_nextExpire - now);
+            synchronized(this) {
+                if (_nextExpire <= now)
+                    _nextExpire = now + 10*1000;
+                schedule(_nextExpire - now);
+            }
         }
 
-        public void scheduleExpiration(MessageSelector sel) {
+        public synchronized void scheduleExpiration(MessageSelector sel) {
             long now = _context.clock().now();
             if ( (_nextExpire <= now) || (sel.getExpiration() < _nextExpire) ) {
                 _nextExpire = sel.getExpiration();

From f8830a759effec16a6cfe12513e405da3b2ad3da Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 4 Nov 2015 15:01:56 +0000
Subject: [PATCH 242/258] Threads: More conversions to I2PAppThread

---
 .../java/src/net/i2p/addressbook/DaemonThread.java        | 3 ++-
 apps/jetty/java/src/net/i2p/jetty/JettyStart.java         | 5 +++--
 core/java/src/net/i2p/util/LogManager.java                | 2 +-
 core/java/src/net/i2p/util/ShellCommand.java              | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
index fe74c7a83..b0689a208 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -25,6 +25,7 @@ import java.util.Properties;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.naming.NamingServiceUpdater;
+import net.i2p.util.I2PAppThread;
 
 /**
  * A thread that waits five minutes, then runs the addressbook daemon.  
@@ -32,7 +33,7 @@ import net.i2p.client.naming.NamingServiceUpdater;
  * @author Ragnarok
  *
  */
-public class DaemonThread extends Thread implements NamingServiceUpdater {
+public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
 
     private String[] args;
 
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index c5f9e2aaf..79fec449c 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -26,6 +26,7 @@ import java.util.Properties;
 import net.i2p.I2PAppContext;
 import net.i2p.app.*;
 import static net.i2p.app.ClientAppState.*;
+import net.i2p.util.I2PAppThread;
 import net.i2p.util.PortMapper;
 
 import org.eclipse.jetty.server.Connector;
@@ -109,7 +110,7 @@ public class JettyStart implements ClientApp {
         }
     }
 
-    private class Starter extends Thread {
+    private class Starter extends I2PAppThread {
         public Starter() {
             super("JettyStarter");
             changeState(STARTING);
@@ -161,7 +162,7 @@ public class JettyStart implements ClientApp {
         }
     }
 
-    private class Stopper extends Thread {
+    private class Stopper extends I2PAppThread {
         public Stopper() {
             super("JettyStopper");
             changeState(STOPPING);
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index f2df0a881..ca2476de8 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -763,7 +763,7 @@ public class LogManager implements Flushable {
 
     private static final AtomicInteger __id = new AtomicInteger();
 
-    private class ShutdownHook extends Thread {
+    private class ShutdownHook extends I2PAppThread {
         private final int _id;
         public ShutdownHook() {
             _id = __id.incrementAndGet();
diff --git a/core/java/src/net/i2p/util/ShellCommand.java b/core/java/src/net/i2p/util/ShellCommand.java
index 70de62ea8..955830fe1 100644
--- a/core/java/src/net/i2p/util/ShellCommand.java
+++ b/core/java/src/net/i2p/util/ShellCommand.java
@@ -51,7 +51,7 @@ public class ShellCommand {
      * 
      * @author hypercubus
      */
-    private class CommandThread extends Thread {
+    private class CommandThread extends I2PAppThread {
         private final boolean consumeOutput;
         private final Object shellCommand;
         private final Result result;
@@ -84,7 +84,7 @@ public class ShellCommand {
      * 
      * @author hypercubus
      */
-    private static class StreamConsumer extends Thread {
+    private static class StreamConsumer extends I2PAppThread {
         private final BufferedReader bufferedReader;
 
         public StreamConsumer(InputStream inputStream) {
@@ -115,7 +115,7 @@ public class ShellCommand {
      * 
      * @author hypercubus
      */
-    private static class StreamReader extends Thread {
+    private static class StreamReader extends I2PAppThread {
         private final BufferedReader bufferedReader;
 
         public StreamReader(InputStream inputStream) {
@@ -149,7 +149,7 @@ public class ShellCommand {
      * 
      * @author hypercubus
      */
-    private static class StreamWriter extends Thread {
+    private static class StreamWriter extends I2PAppThread {
         private final BufferedWriter bufferedWriter;
 
         public StreamWriter(OutputStream outputStream) {

From 3e25ff251bde77fad346f17054a722ae98802551 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Wed, 4 Nov 2015 15:08:44 +0000
Subject: [PATCH 243/258] Console: Add new home page links as approved at
 meeting exchanged.i2p icon license: WTFPL i2pwiki.i2p and lenta.i2p: Awaiting
 icons that meet our requirements

---
 .../java/src/net/i2p/router/web/HomeHelper.java  |   9 ++++++++-
 history.txt                                      |  10 ++++++++++
 installer/resources/hosts.txt                    |   3 +++
 .../themes/console/images/exchanged.png          | Bin 0 -> 4761 bytes
 .../java/src/net/i2p/router/RouterVersion.java   |   2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 installer/resources/themes/console/images/exchanged.png

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index d9a8de301..104c84be5 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -25,6 +25,7 @@ public class HomeHelper extends HelperBase {
     static final String PROP_OLDHOME = "routerconsole.oldHomePage";
     private static final String PROP_SEARCH = "routerconsole.showSearch";
 
+    // No commas allowed in text strings!
     static final String DEFAULT_SERVICES =
         _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S +
         _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "action_log.png" + S +
@@ -37,6 +38,7 @@ public class HomeHelper extends HelperBase {
         _x("Website") + S + _x("Local web server") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S +
         "";
 
+    // No commas allowed in text strings!
     static final String DEFAULT_FAVORITES =
         "anoncoin.i2p" + S + _x("The Anoncoin project") + S + "http://anoncoin.i2p/" + S + I + "anoncoin_32.png" + S +
         _x("Bug Reports") + S + _x("Bug tracker") + S + "http://trac.i2p2.i2p/report/1" + S + I + "bug.png" + S +
@@ -44,10 +46,13 @@ public class HomeHelper extends HelperBase {
         _x("Dev Forum") + S + _x("Development forum") + S + "http://zzz.i2p/" + S + I + "group_gear.png" + S +
         _x("diftracker") + S + _x("Bittorrent tracker") + S + "http://diftracker.i2p/" + S + I + "magnet.png" + S +
         "echelon.i2p" + S + _x("I2P Applications") + S + "http://echelon.i2p/" + S + I + "box_open.png" + S +
+        "exchanged.i2p" + S + _x("Anonymous cryptocurrency exchange") + S + "http://exchanged.i2p/" + S + I + "exchanged.png" + S +
         _x("FAQ") + S + _x("Frequently Asked Questions") + S + "http://i2p-projekt.i2p/faq" + S + I + "question.png" + S +
         _x("Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "group.png" + S +
         _x("Anonymous Git Hosting") + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S +
         "hiddengate.i2p" + S + _x("HiddenGate") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S +
+                                                                                                              // FIXME **********
+        _x("I2P Wiki") + S + _x("Anonymous wiki - share the knowledge") + S + "http://i2pwiki.i2p/" + S + I + "errortriangle.png" + S +
         "Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S +
         _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S +
         //"jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S +
@@ -55,10 +60,12 @@ public class HomeHelper extends HelperBase {
         "killyourtv.i2p" + S + _x("Debian and Tahoe-LAFS repositories") + S + "http://killyourtv.i2p/" + S + I + "television_delete.png" + S +
         _x("Free Web Hosting") + S + _x("Free eepsite hosting with PHP and MySQL") + S + "http://open4you.i2p/" + S + I + "open4you-logo.png" + S +
         _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "paste_plain.png" + S +
-        "Planet I2P" + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "world.png" + S +
+        _x("Planet I2P") + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "world.png" + S +
         _x("Plugins") + S + _x("Add-on directory") + S + "http://plugins.i2p/" + S + I + "plugin.png" + S +
         _x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S +
         _x("Project Website") + S + _x("I2P home page") + S + "http://i2p-projekt.i2p/" + S + I + "info_rhombus.png" + S +
+                                                                                      // FIXME **********
+        _x("Russian News Feed") + S + "lenta.i2p" + S + "http://lenta.i2p/" + S + I + "errortriangle.png" + S +
         //"Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S +
         "stats.i2p" + S + _x("I2P Network Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "chart_line.png" + S +
         _x("Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S +
diff --git a/history.txt b/history.txt
index 7ec5b7bcc..9d421fc45 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,13 @@
+2015-11-04 zzz
+ * Threads: More conversions to I2PAppThread
+ * Timers: Improve OutboundMessageRegistry locking (ticket #1694)
+
+2015-11-02 z3r0fox
+ * EepGet: Fix command line filename selection (ticket #1616)
+
+2015-11-01 zzz
+ * Utils: Double IP lookup cache size (ticket #1700)
+
 2015-10-31 zzz
  * Convert remaining Threads to I2PThread or I2PAppThread
  * UPnP: Fix deadlock in callbacks (ticket #1699)
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index bc698afe9..34987b08f 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -361,3 +361,6 @@ mtn.i2p-projekt.i2p=I6Ha4I7rgR0JyExQnN~4sZz5CfRqdN7o-2t1i2YOExd2CxC4MHHz3nJ5KgBI
 tracker.thebland.i2p=gzBtMSRcMD6b36PmPCQWZhh30fYm2Ww2r4tRSref4N2T4~cnXK3DjJOuJwao2jRK4bZwX2Rkyjw849xrFMqaR3SdPe3-K61B~Kr9Uo1KLdm3~oahOWFmCaIlipPs-i3jdTT~721YUcYB09n4PGrDq5KZSOOBlLZKulJficO58QRUlDpva4OCCRrX9EUCoAavOciKpvKtnGwl6AiPFu8WnmEeGQ861vjdirjfkHWNp3gj9IjGuxJNcgyHi51BWYZM6il~LJTcbA4zuZn~qudHIx9uzUtO-t08yzSRrmfVwVVVru6-~BBX0ipADi9UGZjyB-PJEKKjizUPxSp2OCmiOlQ2iXpKs2j8yfjHJbn-eWKpIh4jfpNigy6AbDfzFivkvm8lt8CleYf-p3~SHdqIL0iEaacxi5BAU4Baj5yS818kPQP4hEEMMtq4WnKjl4IW64swXSg1wlVBTiKDJzzQGK20jySBuPxhEbd6sfAeirzn585g5EqeV8DLqsMfe5pZBQAEAAEAAA==
 opentracker.dg2.i2p=WSUjGXhqHr7TsBizCO0qV~Kk7G1-suPPSSyMs4AnLQ8wRlWWZ~9rl7AzS0tFG4Dbbl8Te0wtZmQeMhcartbJ3TY-TBnviFqA8zP-sEQf5UK0BA5zzrtpB7NnUo-65B61cVbqG51-p9cJZ~Crre0LEZm5bJs8P3J~oH3b3BJ0YXtuv0ccBgj~OAf1g8ZrHr431XLq8WPRkzAVEIDhFdiSCYAz8XTArNN7OnPUUCjZcw92Oqf9wajg0eXqnThDFbrCx54h0UKM7sVDqRnoXbuGVLTPVvmIOnwuwZrn4X60GMLW38Dg-38qSfJL61FIbn5HfK-VTjCOuC16PtvJAPS1qUBWa-Y3j3aGK3BpHQnlOl-XNB~tJU0GBzRvEnOPFbtqXw38LyTCsvXcY31C~sNC~jedATUfPSZK-UBeN6RkR5BQiXBV-YkzUvTM4s~oXXgw9WFe9DdEWP-XR9~2G1Qe-GkcRAKUXmTAzVnRjlHEDR0lLMfxDwe3OfZuBzM9Gda9AAAA
 i2pnews.i2p=XHS99uhrvijk3KxU438LjNf-SMXXiNXsbV8uwHFXdqsDsHPZRdc6LH-hEMGWDR5g2b65KLlSm8plFrTusR-yxBfGHtZLa9vhXCwWXXbUlBe7Ty6NlwY7GmJItBKPO09BbUa0oJ5jITjLM1mVxeHShAZs8IMlLJjYaeYycDdaUInuPrng51~ySeiiKKxHa3qJkFOuPgQQiCXqy-9Qhi7t9j16iXzWWZ5yN7XcE9i1J7UQix66ntwILTnTAYBelNbONPiSJzKq-BiXj13bI3~liBgckJGf1a1dU8lOuAemtB-XM36cUcg~LQ6iHMuxK-AE8UDQHTNma6E0TxlK5DizV34UgiJ2CxRB5n8BBrZQEvIjYOExXyt6gbopL-aer1qrL1zoIKoMbGon5P4GV~f8NyClJKHXSS2NW7FV-kZbmA0WSLAxecyBfSLStIlw01gtnb2OAQt6OkMQ693N2-L~IJMg4f1lWK4Pv0bIqJUrHZS8YyeWbb4Y~pto6hkd0kgRBQAEAAEAAA==
+exchanged.i2p=rLFzsOqsfSmJZvg6xvl~ctUulYWwGaM8K~rGs-e4WXkKePTCMOpU8l6LIU-wwDOiUZ7Ve8Y-zWPBVYQjH8~~lgT-BJ81zjP5I6H051KOVaXDChdx5F99mZu0sEjnYoFX484QHsUkFc5GUypqhpv1iwWwdPL7bVNzr1fS6sIZvq7tYWEOymbnifxk2jC0BnjultNPCq1wiI2Y-G66iOHDvuLu5f7RvNGJYlpw0UYNv6g8jUu3gXYjDRMBD5OIxFUJaksfmml2CiaGjrPfXKEXBR4q1CogVruq3r~447VHb32f52aeYszcslNzQjYyFCdipnAi5JiNTFpzTZPMEglt2J3KZYB3SMCmxSLktFI7376c7mT7EbMIFFv1GrmcUy9oIyYasbb82Sec9y0nJ9ahZt0x3iGokAYekXKXq-rGPzgFeBwfuCHzQnLzm1akVyJHoGDdaG0QHJfqfW1sY3F2n1xaWrnKcqIz2ypemxVnTMFKQqm2pdG-dMsXNYiGmZtaBQAEAAcAAA==
+i2pwiki.i2p=Zr1YUKIKooxymZRqLvtfSYuZggqv5txkLE8Ks~FTh3A8JDmhOV8C82dUBKJhzst~Pcbqz7rXc~TPyrqasaQ~LioAji~WLSs8PpmCLVF83edhYpx75Fp23ELboEszHduhKWuibVchPLNa-6nP4F0Ttcr4krTlphe3KveNfZDAbm511zFFlNzPcY4PqOdCRBrp7INiWkVwQxwGWO7jiNYTYa5x4QXJmxIN1YOiNRYQST7THz1aV6219ThsfT9FE5JtiX-epli6PF5ZX9TcVSjHUKZnr8uJLXfh5T4RMVNe1n~KXutMUZwxpFE0scOIez9vhDFd7t0HPIsQUsv7MUBzrz4FM9qol7UUPueSGDRgTOOfXMfj4BDsouiWQC4GcSmH3SflR0Ith9QWKC4u3XYvB7Tw-70QWBEV53hUo6I8YKidV13WgeN9JI3KWTYkMyX-TYjmY9y2q6Xd-Maszv4Tb~NzxQs9CNdu0W-JRSUFOqzgt3l4cx0K1pmx4p0tM5dLBQAEAAEAAA==
+lenta.i2p=DnW8NqbKilYLcIx5g5CG4mWVHkzrCkl0MbV4a5rGJku4BSs7HjvzjZpCoXWFky9JCUlHzjFotMETxQBhaKl0Q46vu-plKQ4BLnYyo45p7j2lTiejWvV4SDuXU4IAdmug27i~Jl4N44zwe9KYy~gMfY1Vsgv4bH9ov7X7l2iS-bycfcd9nE7JfycwFc4e0XU-dx7xf~tHw7I5--25dp-SsRX3-UYz4ygb58aD8UsKfQaFZtMy4x~Z1ufNEftuekb1HH9g2Rhhq8Bl62ad8PWSDa9Ne-SkCQsqTYjrCsvMY2DMvWgmZxI1hJYqzjRdFV6JEprrr~CJgHGJXr~KdnZhX12Vm4bKisZK847wBm42CoBQBT5HRzDkeflkbsliirRuKSUxVYMoZ1vic~avPZZl~pvIKZsz-YtiKha4vjCNE1zD-tHIS~2qq4uEO546Ol9pNokPaNttV6r7D2-zurEDx~9grJ8LhBozTxtdTdfZv2OqN4bVhrE7xUrxe0flIFKEAAAA
diff --git a/installer/resources/themes/console/images/exchanged.png b/installer/resources/themes/console/images/exchanged.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e72a2c8eb4c029882416035b86e87b0b3cc17eb
GIT binary patch
literal 4761
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
Date: Wed, 4 Nov 2015 21:41:33 +0000
Subject: [PATCH 244/258] Add serialization methods to StatManager,
 FrequencyStat and Frequency for easier collection

---
 core/java/src/net/i2p/stat/Frequency.java     | 12 +++++++
 core/java/src/net/i2p/stat/FrequencyStat.java | 34 +++++++++++++++++++
 core/java/src/net/i2p/stat/StatManager.java   | 16 +++++++++
 3 files changed, 62 insertions(+)

diff --git a/core/java/src/net/i2p/stat/Frequency.java b/core/java/src/net/i2p/stat/Frequency.java
index 50536fa4f..721578ce6 100644
--- a/core/java/src/net/i2p/stat/Frequency.java
+++ b/core/java/src/net/i2p/stat/Frequency.java
@@ -150,4 +150,16 @@ public class Frequency {
     private final static long now() {
         return System.currentTimeMillis();
     }
+    
+    /**
+     * Appends the data of this frequency to the specified StringBuilder
+     * @param dest to append data to
+     * @since 0.9.23
+     */
+    synchronized void store(StringBuilder dest) {
+        dest.append("avgInterval:").append(_avgInterval).append(',');
+        dest.append("minAverageInterval").append(_minAverageInterval).append(',');
+        dest.append("lastEvent").append(_lastEvent).append(",");
+        dest.append("count").append(_count);
+    }
 }
diff --git a/core/java/src/net/i2p/stat/FrequencyStat.java b/core/java/src/net/i2p/stat/FrequencyStat.java
index d18a469db..c2c49d6fb 100644
--- a/core/java/src/net/i2p/stat/FrequencyStat.java
+++ b/core/java/src/net/i2p/stat/FrequencyStat.java
@@ -1,5 +1,10 @@
 package net.i2p.stat;
 
+import java.io.IOException;
+import java.io.OutputStream;
+
+import net.i2p.data.DataHelper;
+
 /** coordinate an event frequency over various periods */
 public class FrequencyStat {
     /** unique name of the statistic */
@@ -92,5 +97,34 @@ public class FrequencyStat {
         if ((obj == null) || !(obj instanceof FrequencyStat)) return false;
         return _statName.equals(((FrequencyStat)obj)._statName);
     }
+    
+    private final static String NL = System.getProperty("line.separator");
+    
+    /**
+     * Serializes this FrequencyStat to the provided OutputStream
+     * @param out to write to
+     * @param prefix to prepend to the stat
+     * @throws IOException if something goes wrong
+     * @since 0.9.23
+     */
+    public void store(OutputStream out, String prefix) throws IOException {
+        StringBuilder buf = new StringBuilder(1024);
+        buf.append(NL);
+        buf.append("################################################################################").append(NL);
+        buf.append("# Frequency: ").append(_groupName).append(": ").append(_statName).append(NL);
+        buf.append("# ").append(_description).append(NL);
+        buf.append("# ").append(NL).append(NL);
+        out.write(buf.toString().getBytes("UTF-8"));
+        buf.setLength(0);
+        for (Frequency r: _frequencies){
+            buf.append("#######").append(NL);
+            buf.append("# Period : ").append(DataHelper.formatDuration(r.getPeriod())).append(" for rate ")
+                .append(_groupName).append(" - ").append(_statName).append(NL);
+            buf.append(NL);
+            r.store(buf);
+            out.write(buf.toString().getBytes("UTF-8"));
+            buf.setLength(0);
+        }
+    }
 
 }
diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java
index f0f59a1b9..7f6d9859b 100644
--- a/core/java/src/net/i2p/stat/StatManager.java
+++ b/core/java/src/net/i2p/stat/StatManager.java
@@ -1,5 +1,7 @@
 package net.i2p.stat;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.text.Collator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -247,4 +249,18 @@ public class StatManager {
     public boolean ignoreStat(String statName) {
         return _context.isRouterContext() && !_context.getBooleanProperty(PROP_STAT_FULL);
     }
+    
+    /**
+     * Serializes all Frequencies and Rates to the provided OutputStream
+     * @param out to write to
+     * @param prefix to use when serializing
+     * @throws IOException if something goes wrong
+     * @since 0.9.23
+     */
+    public void store(OutputStream out, String prefix) throws IOException {
+        for (FrequencyStat fs : _frequencyStats.values())
+            fs.store(out, prefix);
+        for (RateStat rs : _rateStats.values())
+            rs.store(out,prefix);
+    }
 }

From 1a6074a62b0a72063c80f9b8e7f5ce4f2157b977 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 5 Nov 2015 17:09:52 +0000
Subject: [PATCH 245/258] Add lenta.i2p icon, public domain

---
 .../java/src/net/i2p/router/web/HomeHelper.java  |   3 +--
 .../themes/console/images/lenta_main_logo.png    | Bin 0 -> 1514 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 installer/resources/themes/console/images/lenta_main_logo.png

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index 104c84be5..e4cc9a4fd 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -64,8 +64,7 @@ public class HomeHelper extends HelperBase {
         _x("Plugins") + S + _x("Add-on directory") + S + "http://plugins.i2p/" + S + I + "plugin.png" + S +
         _x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "magnet.png" + S +
         _x("Project Website") + S + _x("I2P home page") + S + "http://i2p-projekt.i2p/" + S + I + "info_rhombus.png" + S +
-                                                                                      // FIXME **********
-        _x("Russian News Feed") + S + "lenta.i2p" + S + "http://lenta.i2p/" + S + I + "errortriangle.png" + S +
+        _x("Russian News Feed") + S + "lenta.i2p" + S + "http://lenta.i2p/" + S + I + "lenta_main_logo.png" + S +
         //"Salt" + S + "salt.i2p" + S + "http://salt.i2p/" + S + I + "salt_console.png" + S +
         "stats.i2p" + S + _x("I2P Network Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "chart_line.png" + S +
         _x("Technical Docs") + S + _x("Technical documentation") + S + "http://i2p-projekt.i2p/how" + S + I + "education.png" + S +
diff --git a/installer/resources/themes/console/images/lenta_main_logo.png b/installer/resources/themes/console/images/lenta_main_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c43be5f4ae9f3ab2d7aa9590d6ca475ae7bf648d
GIT binary patch
literal 1514
zcmVkdg00004XF*Lt006O%
z3;baP00002VoOIv0RM-N%)bBt010qNS#tmY3labT3lag+-G2N400kULL_t(Y$92`+
zk6mRI$MMgz_da`{bLO?LmQD*TFfA!f35C`I3d)O#Bx+(}H0rg9|A2`%T=)-gt%>o*
zM3M$ysu+VoR2m8eLIom~X$Lzq?aZ{y>zOlW&dc797l0`!zx(yg%33Sy8>-T?@pKq*
zD86jjWK5DDm4_0QEvc?%nLSet!mq-JZhXmV=95X{PvW0K8N1$0Vlt7eCe3)cv})e0
zOWGFGxn{T!c8BlATOAHQolySO>COFH4{Qy0M`nJr^uhL1N59cZ*DYJsGbyuF?T-gT
zycVCTyTU-No6)u3UDe+6>3ij0lEtv>AG!&$h6CEJ=-TTc>lWQ`
zQs27AEtxlK#x}VTi#C(asolM?B78^B>FR~DN`EgPVQwvqM@#@Z?_;zWmfF7(~7p5$~K8biA?5(84EtJrek1-nnGerM_b)q
zWXY>LKfh>QVO?8YS7zKcD_(crw3aoSQUi%7G0?NACpGC#u}ac&&HhNWCAVN%sS*sk
z?)RSaFE?DbCW>;oo}ko~8(y8Xt#rN`w9HZ(|i5X{Hv}{#JP?yLhQazO@
z2y(&x`Py&eY!)xo=Y|gUzC}-^CsEiiWnE8Z$QDwmDAP6&G(~;8-0`Bf<4j^-H8gf6
zoy{zxkVq`)3Yr>fni}XL+ES>0G>h>#ITBO1B(aK9d28&<&aF`^3Z*qG5}BG@O|)Ut
z;G;_!sC1S326N4~s~D#;r!~WS&D!>3cYblimcEWrlV)|$(a{wQX)2XcT?3g3UwD7`
z=|NSkXIZ<~?j^~wWB0AuFsf$D-3q_c)zQ+|RFi8+1(n1O_xqYVKM3o!L68w`#l~~_
zmrtE&*NUVsH|CNJ%Qj?&L7}0qZ`dJUEsx)5u2f|iAfwQWaUuSA=xFgs`1ZAs>pO2<
zP)Kc|hEg=?F%L|C?uF{ypcOu>mqE@IS9)i&bq_XfZEMO538Jo#*So``s}JS-{vOVi
z^Whiyf8Y8|qN#~zt22!sbn;cp8XtN`rDoj8-tnJ4@=kq^)v6X>zgaIg0b;Nxc_Z5#
z&Rgng`siyo8lRYcXujSrXR0b}g+|i+3;=F(dwqPMW89K~)PeOA|NMGu=j-v$85B)N~zZz71uZ4lnNVvHJnMcB_ajf^)>d!}4nm;R_54Tv2gD@J-yPEu8z<&V6
zl0kA<<6E@=001R)MObuXVRU6WV{&C-bY%cCFflbPF)=MLG*mJ$Iy5*sH90FVF*-0X
zaNvZW0000bbVXQnWMOn=I&E)cX=Zr#$Fgi3iIyE^fFflqXFafQR=@c;k-

literal 0
HcmV?d00001


From eca234c187608e9f51fec0525c2fae3ae6ea731c Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 5 Nov 2015 20:24:12 +0000
Subject: [PATCH 246/258] i2ptunnel: Add longer tunnel options in advanced mode

---
 apps/i2ptunnel/jsp/editClient.jsp | 7 ++++++-
 apps/i2ptunnel/jsp/editServer.jsp | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
index 3ac7d5454..b09b2ed54 100644
--- a/apps/i2ptunnel/jsp/editClient.jsp
+++ b/apps/i2ptunnel/jsp/editClient.jsp
@@ -268,7 +268,12 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     
                     
                     
-                <% if (tunnelDepth > 3) { 
+                <% if (editBean.isAdvanced()) {
+                  %>
+                    
+                    
+                    
+                <% } else if (tunnelDepth > 3) { 
                 %>    
                 <% }
               %>
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index ac3eb48e3..22810a2ee 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -272,7 +272,12 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                     
                     
                     
-                <% if (tunnelDepth > 3) { 
+                <% if (editBean.isAdvanced()) {
+                  %>
+                    
+                    
+                    
+                <% } else if (tunnelDepth > 3) { 
                 %>    
                 <% }
               %>

From c1d77dfe5c5e75eb56ed58eaad83b33f1b105994 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 5 Nov 2015 21:18:01 +0000
Subject: [PATCH 247/258] I2CP: Fix additional connections getting rejected
 during tunnel open (ticket #1650) State change cleanups State checking
 consolidation

---
 .../i2p/client/impl/I2CPMessageProducer.java  |  6 +-
 .../net/i2p/client/impl/I2PSessionImpl.java   | 84 +++++++++++++------
 .../net/i2p/client/impl/I2PSessionImpl2.java  |  9 +-
 .../i2p/client/impl/I2PSessionMuxedImpl.java  |  9 +-
 .../net/i2p/client/impl/I2PSimpleSession.java |  4 +-
 .../src/net/i2p/client/impl/SubSession.java   | 19 ++++-
 6 files changed, 82 insertions(+), 49 deletions(-)

diff --git a/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
index bcdd0b4ea..dd6783f43 100644
--- a/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
+++ b/core/java/src/net/i2p/client/impl/I2CPMessageProducer.java
@@ -102,7 +102,7 @@ class I2CPMessageProducer {
         if (_log.shouldLog(Log.DEBUG)) _log.debug("config signed");
         msg.setSessionConfig(cfg);
         if (_log.shouldLog(Log.DEBUG)) _log.debug("config loaded into message");
-        session.sendMessage(msg);
+        session.sendMessage_unchecked(msg);
         if (_log.shouldLog(Log.DEBUG)) _log.debug("config message sent");
     }
 
@@ -114,7 +114,7 @@ class I2CPMessageProducer {
         if (session.isClosed()) return;
         DestroySessionMessage dmsg = new DestroySessionMessage();
         dmsg.setSessionId(session.getSessionId());
-        session.sendMessage(dmsg);
+        session.sendMessage_unchecked(dmsg);
         // use DisconnectMessage only if we fail and drop connection... 
         // todo: update the code to fire off DisconnectMessage on socket error
         //DisconnectMessage msg = new DisconnectMessage();
@@ -371,7 +371,7 @@ class I2CPMessageProducer {
             return;
         }
         msg.setSessionId(sid);
-        session.sendMessage(msg);
+        session.sendMessage_unchecked(msg);
     }
 
     /**
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
index 4307924de..046683ea4 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
@@ -209,8 +209,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
                                       VersionComparator.comp(routerVersion, MIN_SUBSESSION_VERSION) >= 0);
         synchronized (_stateLock) {
             if (_state == State.OPENING) {
-                _state = State.GOTDATE;
-                _stateLock.notifyAll();
+                changeState(State.GOTDATE);
             }
         }
     }
@@ -635,7 +634,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
                 auth.setProperty(PROP_USER, _options.getProperty(PROP_USER));
                 auth.setProperty(PROP_PW, _options.getProperty(PROP_PW));
             }
-            sendMessage(new GetDateMessage(CoreVersion.VERSION, auth));
+            sendMessage_unchecked(new GetDateMessage(CoreVersion.VERSION, auth));
             waitForDate();
 
             if (_log.shouldLog(Log.DEBUG)) _log.debug(getPrefix() + "Before producer.connect()");
@@ -737,14 +736,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
      * Report abuse with regards to the given messageId
      */
     public void reportAbuse(int msgId, int severity) throws I2PSessionException {
-        synchronized (_stateLock) {
-            if (_state == State.CLOSED)
-                throw new I2PSessionException("Already closed");
-            if (_state == State.INIT)
-                throw new I2PSessionException("Not open, must call connect() first");
-            if (_state == State.OPENING) // not before GOTDATE
-                throw new I2PSessionException("Session not open yet");
-        }
+        verifyOpen();
         _producer.reportAbuse(this, msgId, severity);
     }
 
@@ -1034,6 +1026,39 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
         }
     }
 
+    /**
+     *  Throws I2PSessionException if uninitialized, closed or closing.
+     *  Blocks if opening.
+     *
+     *  @since 0.9.23
+     */
+    protected void verifyOpen() throws I2PSessionException {
+        synchronized (_stateLock) {
+            while (true) {
+                switch (_state) {
+                    case INIT:
+                        throw new I2PSessionException("Not open, must call connect() first");
+
+                    case OPENING:  // fall thru
+                    case GOTDATE:
+                        try {
+                            _stateLock.wait(5*1000);
+                            continue;
+                        } catch (InterruptedException ie) {
+                            throw new I2PSessionException("Interrupted", ie);
+                        }
+
+                    case OPEN:
+                        return;
+
+                    case CLOSING:  // fall thru
+                    case CLOSED:
+                        throw new I2PSessionException("Already closed");
+                }
+            }
+        }
+    }
+
     /**
      * Deliver an I2CP message to the router
      * As of 0.9.3, may block for several seconds if the write queue to the router is full
@@ -1041,12 +1066,19 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
      * @throws I2PSessionException if the message is malformed or there is an error writing it out
      */
     void sendMessage(I2CPMessage message) throws I2PSessionException {
-        synchronized (_stateLock) {
-            if (_state == State.CLOSED)
-                throw new I2PSessionException("Already closed");
-            if (_state == State.INIT)
-                throw new I2PSessionException("Not open, must call connect() first");
-        }
+        verifyOpen();
+        sendMessage_unchecked(message);
+    }
+
+    /**
+     * Deliver an I2CP message to the router.
+     * Does NOT check state. Call only from connect() or other methods that need to
+     * send messages when not in OPEN state.
+     *
+     * @throws I2PSessionException if the message is malformed or there is an error writing it out
+     * @since 0.9.23
+     */
+    void sendMessage_unchecked(I2CPMessage message) throws I2PSessionException {
         if (_queue != null) {
             // internal
             try {
@@ -1055,11 +1087,13 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
             } catch (InterruptedException ie) {
                 throw new I2PSessionException("Interrupted", ie);
             }
-        } else if (_writer == null) {
-            // race here
-            throw new I2PSessionException("Already closed or not open");
         } else {
-            _writer.addMessage(message);
+            ClientWriterRunner writer = _writer;
+            if (writer == null) {
+                throw new I2PSessionException("Already closed or not open");
+            } else {
+                writer.addMessage(message);
+            }
         }
     }
 
@@ -1441,11 +1475,11 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
                 SessionId id = _sessionId;
                 if (id == null)
                     id = new SessionId(65535);
-                sendMessage(new HostLookupMessage(id, h, nonce, maxWait));
+                sendMessage_unchecked(new HostLookupMessage(id, h, nonce, maxWait));
             } else {
                 if (_log.shouldLog(Log.INFO))
                     _log.info("Sending DestLookup for " + h);
-                sendMessage(new DestLookupMessage(h));
+                sendMessage_unchecked(new DestLookupMessage(h));
             }
             try {
                 synchronized (waiter) {
@@ -1533,7 +1567,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
             SessionId id = _sessionId;
             if (id == null)
                 id = new SessionId(65535);
-            sendMessage(new HostLookupMessage(id, name, nonce, maxWait));
+            sendMessage_unchecked(new HostLookupMessage(id, name, nonce, maxWait));
             try {
                 synchronized (waiter) {
                     waiter.wait(maxWait);
@@ -1567,7 +1601,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
                 return null;
             }
         }
-        sendMessage(new GetBandwidthLimitsMessage());
+        sendMessage_unchecked(new GetBandwidthLimitsMessage());
         try {
             synchronized (_bwReceivedLock) {
                 _bwReceivedLock.wait(5*1000);
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
index e110889be..0cf397d79 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl2.java
@@ -276,14 +276,7 @@ class I2PSessionImpl2 extends I2PSessionImpl {
     public boolean sendMessage(Destination dest, byte[] payload, int offset, int size, SessionKey keyUsed, Set tagsSent, long expires)
                    throws I2PSessionException {
         if (_log.shouldLog(Log.DEBUG)) _log.debug("sending message");
-        synchronized (_stateLock) {
-            if (_state == State.CLOSED)
-                throw new I2PSessionException("Already closed");
-            if (_state == State.INIT)
-                throw new I2PSessionException("Not open, must call connect() first");
-            if (_state == State.OPENING || _state == State.GOTDATE) // not before GOTDATE or session
-                throw new I2PSessionException("Session not open yet");
-        }
+        verifyOpen();
         updateActivity();
 
         // Sadly there is no way to send something completely uncompressed in a backward-compatible way,
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
index 6ee2b1e11..07003ae2d 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionMuxedImpl.java
@@ -280,14 +280,7 @@ class I2PSessionMuxedImpl extends I2PSessionImpl2 {
      * @since 0.9.14
      */
     private byte[] prepPayload(byte[] payload, int offset, int size, int proto, int fromPort, int toPort) throws I2PSessionException {
-        synchronized (_stateLock) {
-            if (_state == State.CLOSED)
-                throw new I2PSessionException("Already closed");
-            if (_state == State.INIT)
-                throw new I2PSessionException("Not open, must call connect() first");
-            if (_state == State.OPENING || _state == State.GOTDATE) // not before GOTDATE or session
-                throw new I2PSessionException("Session not open yet");
-        }
+        verifyOpen();
         updateActivity();
 
         if (shouldCompress(size))
diff --git a/core/java/src/net/i2p/client/impl/I2PSimpleSession.java b/core/java/src/net/i2p/client/impl/I2PSimpleSession.java
index dd59ea463..010121b1c 100644
--- a/core/java/src/net/i2p/client/impl/I2PSimpleSession.java
+++ b/core/java/src/net/i2p/client/impl/I2PSimpleSession.java
@@ -122,11 +122,11 @@ public class I2PSimpleSession extends I2PSessionImpl2 {
                     Properties auth = new OrderedProperties();
                     auth.setProperty(PROP_USER, opts.getProperty(PROP_USER));
                     auth.setProperty(PROP_PW, opts.getProperty(PROP_PW));
-                    sendMessage(new GetDateMessage(CoreVersion.VERSION, auth));
+                    sendMessage_unchecked(new GetDateMessage(CoreVersion.VERSION, auth));
                 } else {
                     // we must now send a GetDate even in SimpleSession, or we won't know
                     // what version we are talking with and cannot use HostLookup
-                    sendMessage(new GetDateMessage(CoreVersion.VERSION));
+                    sendMessage_unchecked(new GetDateMessage(CoreVersion.VERSION));
                 }
                 waitForDate();
             }
diff --git a/core/java/src/net/i2p/client/impl/SubSession.java b/core/java/src/net/i2p/client/impl/SubSession.java
index 51c5f0b16..93a115bff 100644
--- a/core/java/src/net/i2p/client/impl/SubSession.java
+++ b/core/java/src/net/i2p/client/impl/SubSession.java
@@ -100,7 +100,7 @@ class SubSession extends I2PSessionMuxedImpl {
     public void connect() throws I2PSessionException {
         synchronized(_stateLock) {
             if (_state != State.OPEN) {
-                _state = State.OPENING;
+                changeState(State.OPENING);
             }
         }
         boolean success = false;
@@ -121,7 +121,7 @@ class SubSession extends I2PSessionMuxedImpl {
                 if (_state != State.OPEN) {
                     Thread notifier = new I2PAppThread(_availabilityNotifier, "ClientNotifier " + getPrefix(), true);
                     notifier.start();
-                    _state = State.OPEN;
+                    changeState(State.OPEN);
                 }
             }
             success = true;
@@ -161,7 +161,20 @@ class SubSession extends I2PSessionMuxedImpl {
             message.getType() != CreateSessionMessage.MESSAGE_TYPE &&
             message.getType() != CreateLeaseSetMessage.MESSAGE_TYPE)
             throw new I2PSessionException("Already closed");
-        _primary.sendMessage(message);
+        _primary.sendMessage_unchecked(message);
+    }
+
+    /**
+     * Deliver an I2CP message to the router.
+     * Does NOT check state. Call only from connect() or other methods that need to
+     * send messages when not in OPEN state.
+     *
+     * @throws I2PSessionException if the message is malformed or there is an error writing it out
+     * @since 0.9.23
+     */
+    @Override
+    void sendMessage_unchecked(I2CPMessage message) throws I2PSessionException {
+        _primary.sendMessage_unchecked(message);
     }
 
     /**

From d5e2defb5f4a283080155255ba6599752a56eba9 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 5 Nov 2015 21:34:47 +0000
Subject: [PATCH 248/258] synch fix

---
 core/java/src/net/i2p/util/InternalSocket.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/src/net/i2p/util/InternalSocket.java b/core/java/src/net/i2p/util/InternalSocket.java
index d2b4cb458..6e7d3c8d0 100644
--- a/core/java/src/net/i2p/util/InternalSocket.java
+++ b/core/java/src/net/i2p/util/InternalSocket.java
@@ -68,7 +68,7 @@ public class InternalSocket extends Socket {
     }
 
     @Override
-    public void close() {
+    public synchronized void close() {
         try {
             if (_is != null) {
                 _is.close();
@@ -84,7 +84,7 @@ public class InternalSocket extends Socket {
     }
 
     @Override
-    public boolean isClosed() {
+    public synchronized boolean isClosed() {
         return _is == null || _os == null;
     }
 

From 5f50f23fe1dccc8906d3db189e78d95ab33cbb7d Mon Sep 17 00:00:00 2001
From: zzz 
Date: Thu, 5 Nov 2015 21:37:21 +0000
Subject: [PATCH 249/258] Streaming: Split blacklist into one for EC and one
 for Ed

---
 .../streaming/impl/I2PSocketManagerFull.java  | 66 ++++++++++++++++---
 history.txt                                   |  4 ++
 .../src/net/i2p/router/RouterVersion.java     |  2 +-
 3 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 280c1549d..89310ebda 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -27,6 +27,7 @@ import net.i2p.client.streaming.I2PServerSocket;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
 import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.crypto.SigAlgo;
 import net.i2p.crypto.SigType;
 import net.i2p.data.Certificate;
 import net.i2p.data.Destination;
@@ -62,9 +63,12 @@ public class I2PSocketManagerFull implements I2PSocketManager {
     private final ConnectionManager _connectionManager;
     private final AtomicBoolean _isDestroyed = new AtomicBoolean();
 
-    /** @since 0.9.21 */
-    private static final Set _dsaOnly = new HashSet(16);
-    private static final String[] DSA_ONLY_HASHES = {
+    /**
+     *  Does not support EC
+     *  @since 0.9.21
+     */
+    private static final Set _ecUnsupported = new HashSet(16);
+    private static final String[] EC_UNSUPPORTED_HASHES = {
         // list from http://zzz.i2p/topics/1682?page=1#p8414
         // bzr.welterde.i2p
         "Cvs1gCZTTkgD2Z2byh2J9atPmh5~I8~L7BNQnQl0hUE=",
@@ -86,7 +90,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         "VXwmNIwMy1BcUVmut0oZ72jbWoqFzvxJukmS-G8kAAE=",
         // paste.i2p2.i2p
         "DoyMyUUgOSTddvRpqYfKHFPPjkkX~iQmResyfjjBYWs=",
-        // syndie.wetlerde.i2p
+        // syndie.welterde.i2p
         "xMxC54BFgyp-~zzrQI3F8m2CK--9XMcNmSAep6RH4Kk=",
         // ugha.i2p
         "zsu3WF~QLBxZXH-gHq9MuZE6y8ROZmMF7dA2MbMMKkY=",
@@ -95,13 +99,54 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         // www.i2p2.i2p
         "im9gytzKT15mT1sB5LC9bHXCcwytQ4EPcrGQhoam-4w="
     };
+
+    /**
+     *  Does not support Ed
+     *  @since 0.9.23
+     */
+    private static final Set _edUnsupported = new HashSet(16);
+    private static final String[] ED_UNSUPPORTED_HASHES = {
+        // list from http://zzz.i2p/topics/1682?page=1#p8414
+        // minus those tested to support Ed
+        // last tested 2015-11-04
+        // bzr.welterde.i2p
+        "Cvs1gCZTTkgD2Z2byh2J9atPmh5~I8~L7BNQnQl0hUE=",
+        // docs.i2p2.i2p
+        "WCXV87RdrF6j-mnn6qt7kVSBifHTlPL0PmVMFWwaolo=",
+        // i2jump.i2p
+        "9vaoGZbOaeqdRK2qEunlwRM9mUSW-I9R4OON35TDKK4=",
+        // irc.welterde.i2p
+        "5rjezx4McFk3bNhoJV-NTLlQW1AR~jiUcN6DOWMCCVc=",
+        // lists.i2p2.i2p
+        "qwtgoFoMSK0TOtbT4ovBX1jHUzCoZCPzrJVxjKD7RCg=",
+        // mtn.i2p2.i2p
+        "X5VDzYaoX9-P6bAWnrVSR5seGLkOeORP2l3Mh4drXPo=",
+        // nntp.welterde.i2p
+        "VXwmNIwMy1BcUVmut0oZ72jbWoqFzvxJukmS-G8kAAE=",
+        // paste.i2p2.i2p
+        "DoyMyUUgOSTddvRpqYfKHFPPjkkX~iQmResyfjjBYWs=",
+        // syndie.welterde.i2p
+        "xMxC54BFgyp-~zzrQI3F8m2CK--9XMcNmSAep6RH4Kk=",
+        // tracker.welterde.i2p
+        "EVkFgKkrDKyGfI7TIuDmlHoAmvHC~FbnY946DfujR0A=",
+        // www.i2p2.i2p
+        "im9gytzKT15mT1sB5LC9bHXCcwytQ4EPcrGQhoam-4w="
+    };
     
     static {
-        for (int i = 0; i < DSA_ONLY_HASHES.length; i++) {
-            String s = DSA_ONLY_HASHES[i];
+        for (int i = 0; i < EC_UNSUPPORTED_HASHES.length; i++) {
+            String s = EC_UNSUPPORTED_HASHES[i];
             Hash h = ConvertToHash.getHash(s);
             if (h != null)
-                _dsaOnly.add(h);
+                _ecUnsupported.add(h);
+            else
+                System.out.println("Bad hash " + s);
+        }
+        for (int i = 0; i < ED_UNSUPPORTED_HASHES.length; i++) {
+            String s = ED_UNSUPPORTED_HASHES[i];
+            Hash h = ConvertToHash.getHash(s);
+            if (h != null)
+                _edUnsupported.add(h);
             else
                 System.out.println("Bad hash " + s);
         }
@@ -486,7 +531,10 @@ public class I2PSocketManagerFull implements I2PSocketManager {
         if (!_subsessions.isEmpty()) {
             updateUserDsaList();
             Hash h = peer.calculateHash();
-            if (_dsaOnly.contains(h) || (!_userDsaOnly.isEmpty() && _userDsaOnly.contains(h))) {
+            SigAlgo myAlgo = session.getMyDestination().getSigType().getBaseAlgorithm();
+            if ((myAlgo == SigAlgo.EC && _ecUnsupported.contains(h)) ||
+                (myAlgo == SigAlgo.EdDSA && _edUnsupported.contains(h)) ||
+                (!_userDsaOnly.isEmpty() && _userDsaOnly.contains(h))) {
                 // FIXME just taking the first one for now
                 for (I2PSession sess : _subsessions) {
                     if (sess.getMyDestination().getSigType() == SigType.DSA_SHA1) {
@@ -512,7 +560,7 @@ public class I2PSocketManagerFull implements I2PSocketManager {
 
     /**
      * Update the global user DSA-only list.
-     * This does not affect the hardcoded DSA_ONLY_HASHES list above,
+     * This does not affect the hardcoded Ex_UNSUPPORTED_HASHES lists above,
      * the user can only add, not remove.
      *
      * @since 0.9.21
diff --git a/history.txt b/history.txt
index 9d421fc45..82a4b9917 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2015-11-05 zzz
+ * I2CP: Fix additional connections getting rejected during tunnel open (ticket #1650)
+ * Streaming: Split blacklist into one for EC and one for Ed
+
 2015-11-04 zzz
  * Threads: More conversions to I2PAppThread
  * Timers: Improve OutboundMessageRegistry locking (ticket #1694)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9319fc01c..0bd65feeb 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 = "";

From b15138dd678f1f99ab3a030dd20eba6b2e2a9a4e Mon Sep 17 00:00:00 2001
From: zzz 
Date: Fri, 6 Nov 2015 01:42:43 +0000
Subject: [PATCH 250/258] i2pwiki.i2p icon license: creative commons

---
 .../java/src/net/i2p/router/web/HomeHelper.java  |   3 +--
 .../themes/console/images/i2pwiki_logo.png       | Bin 0 -> 2696 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 installer/resources/themes/console/images/i2pwiki_logo.png

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
index e4cc9a4fd..b6afcf5ca 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -51,8 +51,7 @@ public class HomeHelper extends HelperBase {
         _x("Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "group.png" + S +
         _x("Anonymous Git Hosting") + S + _x("A public anonymous Git hosting site - supports pulling via Git and HTTP and pushing via SSH") + S + "http://git.repo.i2p/" + S + I + "git-logo.png" + S +
         "hiddengate.i2p" + S + _x("HiddenGate") + S + "http://hiddengate.i2p/" + S + I + "hglogo32.png" + S +
-                                                                                                              // FIXME **********
-        _x("I2P Wiki") + S + _x("Anonymous wiki - share the knowledge") + S + "http://i2pwiki.i2p/" + S + I + "errortriangle.png" + S +
+        _x("I2P Wiki") + S + _x("Anonymous wiki - share the knowledge") + S + "http://i2pwiki.i2p/" + S + I + "i2pwiki_logo.png" + S +
         "Ident " + _x("Microblog") + S + _x("Your premier microblogging service on I2P") + S + "http://id3nt.i2p/" + S + I + "ident_icon_blue.png" + S +
         _x("Javadocs") + S + _x("Technical documentation") + S + "http://i2p-javadocs.i2p/" + S + I + "education.png" + S +
         //"jisko.i2p" + S + _x("Simple and fast microblogging website") + S + "http://jisko.i2p/" + S + I + "jisko_console_icon.png" + S +
diff --git a/installer/resources/themes/console/images/i2pwiki_logo.png b/installer/resources/themes/console/images/i2pwiki_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c08805eada7af7796a740385b4587d6618daecca
GIT binary patch
literal 2696
zcmV;33U~F1P)p!>oQMQ4h6YR$+i{}cKsc=M9L3NFTE*tgJ4RPEJY1nDuwk9az(7A89}cm&c7i>78t{6{(RD#Q
zuJQ8AC;0WRO}5>A7k6&l#7qA&#O$nbiy$&|b^i01QoU%^f%$>e{K;mOt_z*S;uU5cB8fXlZ#5r&9t@R0MnWSU?njXf#GJ
z_zi}Kud{xA5}Qqu&1Mj!5JI5o210mHRVRWlPN$7{!iEq~R2avyARKmr5U6X{uB5-e
zABQu5rorG~3P|I0{x9rU7HFEq;9x!#3lw5;8?ji7ni>ZmeRPGtedY@k78VdsL^*u;
zIErHM!1hhV6B(}b^>L;>&5j+-^z}`!u*%6dAITyc8|oPzp1|$)lS*ZF=15XR~BqR1#NSCA*4Izc2d$(}!di)gHd%e~`#@B5c{
z{`pfZS`k)eR2a*0Ar&2`!-1k$m}ZW`;yW;nKAw7d8{hrj
zTND@1qol}9WBqS%*vp6~byU+d@%wyS>Pc|)jlbr_bSV`^C1VW{p5E?b>6KD!QgWBW
z$ImPerc>hw<}z;UdW*%i>rhomES5kBfuaZ!$pmh90YWGg_=mXXOY3-Q?{Uh?mtnWZ
z7`Z;qiIY9Fcc?gQDl!(!vaq_0zAI<>YFrSP7B6_lsi?5CW~hR{@Ky3HUnO-eKbBJk
zr=1C##k{g=q>#AWl1xUT>uHjSJ{%4Y-n;?gv8&vDcLQy0$62(zKy
zee2iNGk;z&daj1|L+yN_eglX8W1PqARVWVo4FC#h3GH{4vtaoGa`qK$SYOTg^JhrS
zF30ICq<_F-DwNN3*o$f_0?LRde56tZk_NCW7Hy`0HLLx6@WC1GyLTP$
zpUx2u-j
zQ$sg=xIK+Hotr5u7hLTA7$L^#>XNjzwE1MJ~;<&DOp(tfxuma!y!VU5VNzhq|<3qsT7))
zC6zex$pBcumA>N$A%Ev1EGB+)86p2?E*_uc>eW+#ARN9kbYKl}Ug|26bgkNTQ`WjLyB$E*mi7<&om~<+Jt{Zc9TvF_&t!*DW|8zfJY#2M
z_yYUB{Z%|3FC`@kLP$cPK_1-sS&skeG}-JD_U?U&npzhvU)jd9`wyZjCU<knzMRCA3!R80AlfSa@wa6!hw_$+RqNs*tmvhbdVJ*O2}rjbatL+
zetA9!mHK)=mo8nzFcx50b5E!!0x`!%EX%yfm5m!W^6azE^2j5PFfuYiI-MqwNMM?2
zgw;PsJRyO(J<>D{#>VGrxFQGHx^*3|zWO@d-GeM$wvbER@9^M*+j;%<_b4r^y`cb;
zygVnFZ1!fr)b%V*r-RbcQVtzD%)9Tt$IQ&kO?4y^30y800ES`wz6^^BYdLrBEPwON
zV^mdDbL!n|3|1lTF
zew2Ie{W6hAlT=t_xbEK#_#i^+HCydKN|qpvh@iBb=YhwLnDPe-nx$;9Nfo!_ub3RojdsX&yV2ocmT<(
zuj~il(MSIhv3c{3(Uq$ns))y~vvkQU7rQg~3zlN&2EP1Gyj~~6BemFU4iJK9q?ekS
zJQDE?hM{0#5sRg
Date: Fri, 6 Nov 2015 14:16:25 +0000
Subject: [PATCH 251/258] add more links in README

---
 README.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.txt b/README.txt
index d115a6dbf..0a99e21a4 100644
--- a/README.txt
+++ b/README.txt
@@ -19,7 +19,8 @@ To build:
 
 Documentation:
 	https://geti2p.net/how
-	API: run 'ant javadoc' then start at build/javadoc/index.html
+	API: http://docs.i2p-projekt.de/javadoc/
+	     or run 'ant javadoc' then start at build/javadoc/index.html
 
 Latest release:
 	https://geti2p.net/download
@@ -34,6 +35,15 @@ Need help?
 	IRC irc.freenode.net #i2p
 	http://forum.i2p/
 
+Bug reports:
+	https://trac.i2p2.de/report/1
+
+Contact information, security issues, press inquiries:
+	https://geti2p.net/en/contact
+
+Twitter:
+	@i2p, @geti2p
+
 Licenses:
 	See LICENSE.txt
 

From 6bb156a43612fc80c0cb08dcb7a0d88ecf58842c Mon Sep 17 00:00:00 2001
From: zab2 
Date: Fri, 6 Nov 2015 19:01:44 +0000
Subject: [PATCH 252/258] Do not expose ISJ lock

---
 .../kademlia/IterativeSearchJob.java          | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index 55464735e..3bd24f667 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -187,11 +187,15 @@ class IterativeSearchJob extends FloodSearchJob {
                 floodfillPeers.add(iter.next());
             }
         }
-        _toTry.addAll(floodfillPeers);
-        // don't ask ourselves or the target
-        _toTry.remove(getContext().routerHash());
-        _toTry.remove(_key);
-        if (_toTry.isEmpty()) {
+        final boolean empty;
+        synchronized(this) {
+            _toTry.addAll(floodfillPeers);
+            // don't ask ourselves or the target
+            _toTry.remove(getContext().routerHash());
+            _toTry.remove(_key);
+            empty = _toTry.isEmpty();
+        }
+        if (empty) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn(getJobId() + ": ISJ for " + _key + " had no peers to send to");
             // no floodfill peers, fail
@@ -227,23 +231,26 @@ class IterativeSearchJob extends FloodSearchJob {
         }
         while (true) {
             Hash peer;
+            final int done, pend;
             synchronized (this) {
                 if (_dead) return;
-                int pend = _unheardFrom.size();
+                pend = _unheardFrom.size();
                 if (pend >= MAX_CONCURRENT)
                     return;
-                int done = _failedPeers.size();
-                if (done >= _totalSearchLimit) {
-                    failed();
-                    return;
-                }
-                // even if pend and todo are empty, we don't fail, as there may be more peers
-                // coming via newPeerToTry()
-                if (done + pend >= _totalSearchLimit)
-                    return;
+                done = _failedPeers.size();
+            }
+            if (done >= _totalSearchLimit) {
+                failed();
+                return;
+            }
+            // even if pend and todo are empty, we don't fail, as there may be more peers
+            // coming via newPeerToTry()
+            if (done + pend >= _totalSearchLimit)
+                return;
+            synchronized(this) {
                 if (_alwaysQueryHash != null &&
-                    !_unheardFrom.contains(_alwaysQueryHash) &&
-                    !_failedPeers.contains(_alwaysQueryHash)) {
+                        !_unheardFrom.contains(_alwaysQueryHash) &&
+                        !_failedPeers.contains(_alwaysQueryHash)) {
                     // For testing or local networks... we will
                     // pretend that the specified router is floodfill, and always closest-to-the-key.
                     // May be set after startup but can't be changed or unset later.
@@ -513,12 +520,14 @@ class IterativeSearchJob extends FloodSearchJob {
             _facade.lookupFailed(_key);
         getContext().messageRegistry().unregisterPending(_out);
         int tries;
+        final List unheard;
         synchronized(this) {
             tries = _unheardFrom.size() + _failedPeers.size();
-            // blame the unheard-from (others already blamed in failed() above)
-            for (Hash h : _unheardFrom)
-                getContext().profileManager().dbLookupFailed(h);
+            unheard = new ArrayList(_unheardFrom);
         }
+        // blame the unheard-from (others already blamed in failed() above)
+        for (Hash h : unheard)
+            getContext().profileManager().dbLookupFailed(h);
         long time = System.currentTimeMillis() - _created;
         if (_log.shouldLog(Log.INFO)) {
             long timeRemaining = _expiration - getContext().clock().now();

From ca4642e0f0dc60c84e838cd4e39636d50b460e48 Mon Sep 17 00:00:00 2001
From: zab2 
Date: Fri, 6 Nov 2015 20:19:43 +0000
Subject: [PATCH 253/258] Reduce the memory footprint of Rate objects by
 changing longs to ints and doubles to floats

---
 core/java/src/net/i2p/stat/Rate.java | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/java/src/net/i2p/stat/Rate.java b/core/java/src/net/i2p/stat/Rate.java
index e37f9db9f..edac7d96b 100644
--- a/core/java/src/net/i2p/stat/Rate.java
+++ b/core/java/src/net/i2p/stat/Rate.java
@@ -14,19 +14,19 @@ import net.i2p.data.DataHelper;
  */
 public class Rate {
     //private final static Log _log = new Log(Rate.class);
-    private double _currentTotalValue;
+    private float _currentTotalValue;
     // was long, save space
     private int _currentEventCount;
-    private long _currentTotalEventTime;
-    private double _lastTotalValue;
+    private int _currentTotalEventTime;
+    private float _lastTotalValue;
     // was long, save space
     private int _lastEventCount;
-    private long _lastTotalEventTime;
-    private double _extremeTotalValue;
+    private int _lastTotalEventTime;
+    private float _extremeTotalValue;
     // was long, save space
     private int _extremeEventCount;
-    private long _extremeTotalEventTime;
-    private double _lifetimeTotalValue;
+    private int _extremeTotalEventTime;
+    private float _lifetimeTotalValue;
     private long _lifetimeEventCount;
     private long _lifetimeTotalEventTime;
     private RateSummaryListener _summaryListener;
@@ -227,10 +227,10 @@ public class Rate {
             // ok ok, lets coalesce
 
             // how much were we off by?  (so that we can sample down the measured values)
-            double periodFactor = measuredPeriod / (double)_period;
+            float periodFactor = measuredPeriod / (float)_period;
             _lastTotalValue = _currentTotalValue / periodFactor;
             _lastEventCount = (int) (0.499999 + (_currentEventCount / periodFactor));
-            _lastTotalEventTime = (long) (_currentTotalEventTime / periodFactor);
+            _lastTotalEventTime = (int) (_currentTotalEventTime / periodFactor);
             _lastCoalesceDate = now;
             if (_currentEventCount == 0)
                 correctedTotalValue = 0;
@@ -244,7 +244,7 @@ public class Rate {
                 _extremeTotalEventTime = _lastTotalEventTime;
             }
 
-            _currentTotalValue = 0.0D;
+            _currentTotalValue = 0.0f;
             _currentEventCount = 0;
             _currentTotalEventTime = 0;
         }
@@ -505,16 +505,16 @@ public class Rate {
         _period = PersistenceHelper.getInt(props, prefix, ".period");
         _creationDate = PersistenceHelper.getLong(props, prefix, ".creationDate");
         _lastCoalesceDate = PersistenceHelper.getLong(props, prefix, ".lastCoalesceDate");
-        _currentTotalValue = PersistenceHelper.getDouble(props, prefix, ".currentTotalValue");
+        _currentTotalValue = (float)PersistenceHelper.getDouble(props, prefix, ".currentTotalValue");
         _currentEventCount = PersistenceHelper.getInt(props, prefix, ".currentEventCount");
-        _currentTotalEventTime = PersistenceHelper.getLong(props, prefix, ".currentTotalEventTime");
-        _lastTotalValue = PersistenceHelper.getDouble(props, prefix, ".lastTotalValue");
+        _currentTotalEventTime = (int)PersistenceHelper.getLong(props, prefix, ".currentTotalEventTime");
+        _lastTotalValue = (float)PersistenceHelper.getDouble(props, prefix, ".lastTotalValue");
         _lastEventCount = PersistenceHelper.getInt(props, prefix, ".lastEventCount");
-        _lastTotalEventTime = PersistenceHelper.getLong(props, prefix, ".lastTotalEventTime");
-        _extremeTotalValue = PersistenceHelper.getDouble(props, prefix, ".extremeTotalValue");
+        _lastTotalEventTime = (int)PersistenceHelper.getLong(props, prefix, ".lastTotalEventTime");
+        _extremeTotalValue = (float)PersistenceHelper.getDouble(props, prefix, ".extremeTotalValue");
         _extremeEventCount = PersistenceHelper.getInt(props, prefix, ".extremeEventCount");
-        _extremeTotalEventTime = PersistenceHelper.getLong(props, prefix, ".extremeTotalEventTime");
-        _lifetimeTotalValue = PersistenceHelper.getDouble(props, prefix, ".lifetimeTotalValue");
+        _extremeTotalEventTime = (int)PersistenceHelper.getLong(props, prefix, ".extremeTotalEventTime");
+        _lifetimeTotalValue = (float)PersistenceHelper.getDouble(props, prefix, ".lifetimeTotalValue");
         _lifetimeEventCount = PersistenceHelper.getLong(props, prefix, ".lifetimeEventCount");
         _lifetimeTotalEventTime = PersistenceHelper.getLong(props, prefix, ".lifetimeTotalEventTime");
 

From 7175b1cdb97d2fe436c9402e8560d13c977ffba4 Mon Sep 17 00:00:00 2001
From: zab2 
Date: Sat, 7 Nov 2015 02:22:17 +0000
Subject: [PATCH 254/258] Make the search limit configurable

---
 .../net/i2p/router/networkdb/kademlia/IterativeSearchJob.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index 3bd24f667..d9bbf2889 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -125,8 +125,9 @@ class IterativeSearchJob extends FloodSearchJob {
         _expiration = _timeoutMs + ctx.clock().now();
         _rkey = ctx.routingKeyGenerator().getRoutingKey(key);
         _toTry = new TreeSet(new XORComparator(_rkey));
-        _totalSearchLimit = (facade.floodfillEnabled() && ctx.router().getUptime() > 30*60*1000) ?
+        int totalSearchLimit = (facade.floodfillEnabled() && ctx.router().getUptime() > 30*60*1000) ?
                             TOTAL_SEARCH_LIMIT_WHEN_FF : TOTAL_SEARCH_LIMIT;
+        _totalSearchLimit = ctx.getProperty("netdb.searchLimit", totalSearchLimit);
         _unheardFrom = new HashSet(CONCURRENT_SEARCHES);
         _failedPeers = new HashSet(_totalSearchLimit);
         _sentTime = new ConcurrentHashMap(_totalSearchLimit);

From 9f0f1f5ec8932eaf0dd1b9c68654716b69173ef7 Mon Sep 17 00:00:00 2001
From: zab2 
Date: Sat, 7 Nov 2015 02:46:33 +0000
Subject: [PATCH 255/258] Make more ISJ parameters configurable

---
 .../networkdb/kademlia/IterativeSearchJob.java   | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
index d9bbf2889..251bd7363 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
@@ -71,7 +71,7 @@ class IterativeSearchJob extends FloodSearchJob {
     private static Hash _alwaysQueryHash;
     /** Max number of peers to query */
     private final int _totalSearchLimit;
-
+    
     private static final int MAX_NON_FF = 3;
     /** Max number of peers to query */
     private static final int TOTAL_SEARCH_LIMIT = 6;
@@ -84,6 +84,10 @@ class IterativeSearchJob extends FloodSearchJob {
      *  Longer than the typ. response time of 1.0 - 1.5 sec, but short enough that we move
      *  on to another peer quickly.
      */
+    private final long _singleSearchTime;
+    /** 
+     * The default single search time
+     */
     private static final long SINGLE_SEARCH_TIME = 3*1000;
     /** the actual expire time for a search message */
     private static final long SINGLE_SEARCH_MSG_TIME = 10*1000;
@@ -92,6 +96,10 @@ class IterativeSearchJob extends FloodSearchJob {
      *  For now, we don't do concurrent, but we keep SINGLE_SEARCH_TIME very short,
      *  so we have effective concurrency in that we fail a search quickly.
      */
+    private final int _maxConcurrent;
+    /**
+     * The default _maxConcurrent
+     */
     private static final int MAX_CONCURRENT = 1;
 
     public static final String PROP_ENCRYPT_RI = "router.encryptRouterLookups";
@@ -128,6 +136,8 @@ class IterativeSearchJob extends FloodSearchJob {
         int totalSearchLimit = (facade.floodfillEnabled() && ctx.router().getUptime() > 30*60*1000) ?
                             TOTAL_SEARCH_LIMIT_WHEN_FF : TOTAL_SEARCH_LIMIT;
         _totalSearchLimit = ctx.getProperty("netdb.searchLimit", totalSearchLimit);
+        _singleSearchTime = ctx.getProperty("netdb.singleSearchTime", SINGLE_SEARCH_TIME);
+        _maxConcurrent = ctx.getProperty("netdb.maxConcurrent", MAX_CONCURRENT);
         _unheardFrom = new HashSet(CONCURRENT_SEARCHES);
         _failedPeers = new HashSet(_totalSearchLimit);
         _sentTime = new ConcurrentHashMap(_totalSearchLimit);
@@ -236,7 +246,7 @@ class IterativeSearchJob extends FloodSearchJob {
             synchronized (this) {
                 if (_dead) return;
                 pend = _unheardFrom.size();
-                if (pend >= MAX_CONCURRENT)
+                if (pend >= _maxConcurrent)
                     return;
                 done = _failedPeers.size();
             }
@@ -412,7 +422,7 @@ class IterativeSearchJob extends FloodSearchJob {
             // The timeout job is always run (never cancelled)
             // Note that the timeout is much shorter than the message expiration (see above)
             Job j = new IterativeTimeoutJob(getContext(), peer, this);
-            long expire = Math.min(_expiration, now + SINGLE_SEARCH_TIME);
+            long expire = Math.min(_expiration, now + _singleSearchTime);
             j.getTiming().setStartAfter(expire);
             getContext().jobQueue().addJob(j);
 

From c901010d96df0312ecdb293a596ecd745454d5bb Mon Sep 17 00:00:00 2001
From: zab2 
Date: Sat, 7 Nov 2015 02:56:59 +0000
Subject: [PATCH 256/258] Make parameters of NegativeLookupCache configurable

---
 .../kademlia/KademliaNetworkDatabaseFacade.java      |  2 +-
 .../networkdb/kademlia/NegativeLookupCache.java      | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 35864c554..794638708 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -274,7 +274,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
         //_ds = new TransientDataStore();
 //        _exploreKeys = new HashSet(64);
         _dbDir = dbDir;
-        _negativeCache = new NegativeLookupCache();
+        _negativeCache = new NegativeLookupCache(_context);
         
         createHandlers();
         
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/NegativeLookupCache.java b/router/java/src/net/i2p/router/networkdb/kademlia/NegativeLookupCache.java
index 1915caf4e..d9164225d 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/NegativeLookupCache.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/NegativeLookupCache.java
@@ -4,6 +4,7 @@ import java.util.Map;
 
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
+import net.i2p.router.RouterContext;
 import net.i2p.util.LHMCache;
 import net.i2p.util.ObjectCounter;
 import net.i2p.util.SimpleTimer;
@@ -17,15 +18,18 @@ import net.i2p.util.SimpleTimer2;
 class NegativeLookupCache {
     private final ObjectCounter counter;
     private final Map badDests;
-
+    private final int _maxFails;
+    
     private static final int MAX_FAILS = 3;
     private static final int MAX_BAD_DESTS = 128;
     private static final long CLEAN_TIME = 2*60*1000;
 
-    public NegativeLookupCache() {
+    public NegativeLookupCache(RouterContext context) {
         this.counter = new ObjectCounter();
         this.badDests = new LHMCache(MAX_BAD_DESTS);
-        SimpleTimer2.getInstance().addPeriodicEvent(new Cleaner(), CLEAN_TIME);
+        this._maxFails = context.getProperty("netdb.negativeCache.maxFails",MAX_FAILS);
+        final long cleanTime = context.getProperty("netdb.negativeCache.cleanupInterval", CLEAN_TIME);
+        SimpleTimer2.getInstance().addPeriodicEvent(new Cleaner(), cleanTime);
     }
 
     public void lookupFailed(Hash h) {
@@ -33,7 +37,7 @@ class NegativeLookupCache {
     }
 
     public boolean isCached(Hash h) {
-        if (counter.count(h) >= MAX_FAILS)
+        if (counter.count(h) >= _maxFails)
             return true;
         synchronized(badDests) {
             return badDests.get(h) != null;

From f5bf4ec8eac37cdfc7f320d8f0e8164b2dfd2cc1 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 7 Nov 2015 12:06:56 +0000
Subject: [PATCH 257/258] escape referer

---
 .../src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java    | 4 +++-
 router/java/src/net/i2p/router/RouterVersion.java             | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
index 15e67de74..bd84ac9ee 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -14,6 +14,7 @@ import java.util.StringTokenizer;
 import net.i2p.I2PAppContext;
 import net.i2p.client.naming.NamingService;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
 import net.i2p.util.FileUtil;
@@ -165,7 +166,8 @@ public abstract class LocalHTTPServer {
                 Properties nsOptions = new Properties();
                 nsOptions.setProperty("list", book);
                 if (referer != null && referer.startsWith("http")) {
-                    String from = "" + referer + "";
+                    String ref = DataHelper.escapeHTML(referer);
+                    String from = "" + ref + "";
                     nsOptions.setProperty("s", _t("Added via address helper from {0}", from));
                 } else {
                     nsOptions.setProperty("s", _t("Added via address helper"));
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0bd65feeb..f7d70ed0a 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ 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 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 077c4a073fed1713aa533d3f2f7b8512cd10db38 Mon Sep 17 00:00:00 2001
From: zzz 
Date: Sat, 7 Nov 2015 12:47:31 +0000
Subject: [PATCH 258/258] replaceAll -> replace

---
 core/java/src/net/i2p/data/DataHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 352529a6e..85bc2dee8 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1693,7 +1693,7 @@ public class DataHelper {
         if (unescaped == null) return null;
         String escaped = unescaped;
         for (int i = 0; i < escapeChars.length; i++) {
-            escaped = escaped.replaceAll(escapeChars[i], escapeCodes[i]);
+            escaped = escaped.replace(escapeChars[i], escapeCodes[i]);
         }
         return escaped;
     }
@@ -1708,7 +1708,7 @@ public class DataHelper {
         if (escaped == null) return null;
         String unescaped = escaped;
         for (int i = 0; i < escapeChars.length; i++) {
-            unescaped = unescaped.replaceAll(escapeCodes[i], escapeChars[i]);
+            unescaped = unescaped.replace(escapeCodes[i], escapeChars[i]);
         }
         return unescaped;
     }